Bug 516687 - [SysML 1.1] Move SysML 1.1 to an independent repository

 - remove sysml 1.1 plugins and feature from master branch
 - note: some weak reference are still in the code a simple sysml grep
will show all remaining typos

Change-Id: I00173658659cfb5f3cec47391c6a3b1216bafcff
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

1410 files changed, 0 insertions, 133053 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml
index e473ef17b06..08222d4a80a 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml
+++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml
@@ -292,39 +292,6 @@
 		<plugin name="org.eclipse.papyrus.sdk" version="2.0.0"/>
 		<plugin name="org.eclipse.papyrus.eclipse.project.editors" version="2.0.0"/>
 	</feature>
-	<feature name="org.eclipse.papyrus.sysml.architecture.feature" version="1.0.0">
-		<plugin name="org.eclipse.papyrus.sysml.architecture" version="1.0.0"/>
-	</feature>
-	<feature name="org.eclipse.papyrus.sysml.diagram.feature" version="3.0.0">
-		<plugin name="org.eclipse.papyrus.sysml.diagram.blockdefinition" version="3.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.diagram.common" version="2.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.diagram.requirement" version="3.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.diagram.ui" version="2.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.diagram.internalblock" version="3.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.diagram.parametric" version="2.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.diagram.css" version="1.2.0"/>
-	</feature>
-	<feature name="org.eclipse.papyrus.sysml.feature" version="2.0.0">
-		<plugin name="org.eclipse.papyrus.sysml" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.architecture" version="1.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.service.types" version="2.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.edit" version="1.2.0"/>
-	</feature>
-	<feature name="org.eclipse.papyrus.sysml.modelexplorer.feature" version="1.2.0">
-		<plugin name="org.eclipse.papyrus.sysml.modelexplorer" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.architecture" version="1.0.0"/>
-	</feature>
-	<feature name="org.eclipse.papyrus.sysml.nattable.feature" version="2.0.0">
-		<plugin name="org.eclipse.papyrus.sysml.nattable" version="2.0.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.nattable.requirement" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.nattable.requirement.config" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.nattable.allocation" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.nattable.allocation.config" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.sysml.nattable.menu" version="1.2.0"/>
-	</feature>
-	<feature name="org.eclipse.papyrus.sysml.properties.feature" version="1.2.0">
-		<plugin name="org.eclipse.papyrus.sysml.properties" version="1.2.0"/>
-	</feature>
 	<feature name="org.eclipse.papyrus.uml.alf.feature" version="3.0.0">
 		<plugin name="org.eclipse.papyrus.uml.alf.common" version="2.0.0"/>
 		<plugin name="org.eclipse.papyrus.uml.alf.common.ui" version="2.0.0"/>
@@ -710,25 +677,6 @@
 	<plugin name="org.eclipse.papyrus.releng.main.release" version="2.0.0"/>
 	<plugin name="org.eclipse.papyrus.req.reqif.doc" version="1.2.0"/>
 	<plugin name="org.eclipse.papyrus.sdk" version="2.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.architecture" version="1.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.diagram.blockdefinition" version="3.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.diagram.common" version="2.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.diagram.css" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.diagram.internalblock" version="3.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.diagram.parametric" version="2.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.diagram.requirement" version="3.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.diagram.ui" version="2.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.edit" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.modelexplorer" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.nattable" version="2.0.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.nattable.allocation" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.nattable.allocation.config" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.nattable.menu" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.nattable.requirement" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.nattable.requirement.config" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.properties" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.sysml.service.types" version="2.0.0"/>
 	<plugin name="org.eclipse.papyrus.toolsmiths.palette" version="3.0.0"/>
 	<plugin name="org.eclipse.papyrus.uml.alf" version="3.0.0"/>
 	<plugin name="org.eclipse.papyrus.uml.alf.common" version="2.0.0"/>
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.classpath b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.classpath
deleted file mode 100644
index eca7bdba8f0..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.project b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.project
deleted file mode 100644
index 58a640e2fd6..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.architecture</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dca8..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/META-INF/MANIFEST.MF b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/META-INF/MANIFEST.MF
deleted file mode 100644
index f13753a701c..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

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

-Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

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

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

- org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",

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

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

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

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

- org.eclipse.papyrus.sysml.diagram.parametric;bundle-version="[2.0.0,3.0.0)",

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

- org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="[1.2.0,2.0.0)"

-Export-Package: org.eclipse.papyrus.sysml.architecture

-Bundle-Vendor: %providerName

diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/about.html b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/about.html
deleted file mode 100644
index bbf2bd6aac7..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>January 30, 2017</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/sysml/architecture/org.eclipse.papyrus.sysml.architecture/build.properties b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/build.properties
deleted file mode 100644
index ae2a4cf4fa0..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               model/,\
-               about.html,\
-               icons/
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif
deleted file mode 100644
index 08760707586..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif
+++ /dev/null
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture
deleted file mode 100644
index 4012c549e26..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_yMTQcMSdEeaKZJ_pGfaSiA" name="Systems Engineering" description="The domain of developing software systems">

-  <stakeholders xmi:id="_yMTQccSdEeaKZJ_pGfaSiA" name="Systems Engineer" description="An engineer interested in system development">

-    <concerns href="#_yMTQcsSdEeaKZJ_pGfaSiA"/>

-    <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf4sSYEeaKZJ_pGfaSiA"/>

-    <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>

-    <concerns href="#_yMTQc8SdEeaKZJ_pGfaSiA"/>

-    <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf5MSYEeaKZJ_pGfaSiA"/>

-  </stakeholders>

-  <concerns xmi:id="_yMTQcsSdEeaKZJ_pGfaSiA" name="Requirements" description="The concern of developing the system's requirements"/>

-  <concerns xmi:id="_yMTQc8SdEeaKZJ_pGfaSiA" name="Parametrics" description="The concern of developing the system's parametrics"/>

-  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_yMTQdMSdEeaKZJ_pGfaSiA" name="SysML" description="The Systems Modeling Language" id="org.eclipse.papyrus.sysml.architecture.SysML" icon="platform:/plugin/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif" creationCommandClass="org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand">

-    <viewpoints xmi:id="_M5u1AMShEeaKZJ_pGfaSiA" name="Systems Analysis" description="A viewpoint allowing systems analysis with SysML" id="org.eclipse.papyrus.sysml.analysis">

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_iBC4gHDvEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_yeY0sHDvEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_m2D8IHDuEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="#_lTE0gHDwEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_d4-QwCT-EeedRqoTe_1ZiA"/>
-    </viewpoints>

-    <viewpoints xmi:id="_PAtvoMShEeaKZJ_pGfaSiA" name="Systems Design" description="A viewpoint allowing systems design with SysML" id="org.eclipse.papyrus.sysml.design">

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_m2D8IHDuEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbioHDvEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbipHDvEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbirXDvEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_UzcgsHDtEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_FuMjYHDuEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_M-Q3sHDuEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_zzf4cXDtEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_TR15IHDvEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_PwD0cHDvEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="#_r5y7wHDuEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_P3J1cEb7EeRVGbM3cmVSqQ"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_Uz8agHDcEeWh-MssWmCB_A"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_P3J1cEa7EeSVGbM3cmVSqQ"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_WC1q0P4UEhSRsNBVzfUrzA"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_wXztQHDwEwWh-MssWmCB_A"/>

-      <representationKinds xsi:type="nattablerepresentation:PapyrusTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_d4-QwCT-EeedRqoTe_1ZiA"/>
-    </viewpoints>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-uml.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations#_rRIxgLOjEeWH6Y3Wi2YKxg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations#_u9Zn4LOjEeWH6Y3Wi2YKxg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations#_3i038FYIEeS0WsAAtVmToA"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations#_0h9coLOjEeWH6Y3Wi2YKxg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations#_2o9lYLOjEeWH6Y3Wi2YKxg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations#_6wATQLOjEeWH6Y3Wi2YKxg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations#_LYuC4LOtEeWH6Y3Wi2YKxg"/>

-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_649xgFYBEeS0WsAAtVmToA"/>

-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_m2D8IHDuEeWh-MssWmCB_A" name="Block Definition Diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Diagram_BlockDefinition.gif" implementationID="BlockDefinition" creationCommandClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramCreateCommand">

-      <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>

-      <modelRules xmi:id="_m2D8IXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <modelRules xmi:id="_m2D8InDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </modelRules>

-      <owningRules xmi:id="_m2D8I3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <owningRules xmi:id="_m2D8JHDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </owningRules>

-      <childRules xmi:id="_m2D8JXDuEeWh-MssWmCB_A"/>

-    </representationKinds>

-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_M-Q3sHDuEeWh-MssWmCB_A" name="Internal Block Diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Diagram_InternalBlock.gif" implementationID="InternalBlock" creationCommandClass="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCreateCommand">

-      <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>

-      <modelRules xmi:id="_M-Q3sXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </modelRules>

-      <owningRules xmi:id="_M-Q3snDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </owningRules>

-      <owningRules xmi:id="_M-Q3s3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        <newModelPath xmi:id="_M-Q3tHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.sysml.Block">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-        </newModelPath>

-      </owningRules>

-      <childRules xmi:id="_M-Q3tXDuEeWh-MssWmCB_A"/>

-    </representationKinds>

-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_eHbioHDvEeWh-MssWmCB_A" name="Parametric Diagram" concerns="_yMTQc8SdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="Parametric" creationCommandClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramCreateCommand">

-      <modelRules xmi:id="_eHbioXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_eHbionDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <childRules xmi:id="_eHbio3DvEeWh-MssWmCB_A"/>

-    </representationKinds>

-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_eHbipHDvEeWh-MssWmCB_A" name="Parametric Diagram" concerns="_yMTQc8SdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="Parametric" creationCommandClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramCreateCommand">

-      <modelRules xmi:id="_eHbipXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints/ConstraintBlock"/>

-      </modelRules>

-      <owningRules xmi:id="_eHbipnDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints/ConstraintBlock"/>

-      </owningRules>

-      <owningRules xmi:id="_eHbip3DvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <childRules xmi:id="_eHbiqHDvEeWh-MssWmCB_A"/>

-      <paletteRules xmi:id="_eHbiqXDvEeWh-MssWmCB_A" permit="false" element="parametric.tool.blockpropertycomposite"/>

-      <paletteRules xmi:id="_eHbiqnDvEeWh-MssWmCB_A" permit="false" element="parametric.tool.reference"/>

-      <paletteRules xmi:id="_eHbiq3DvEeWh-MssWmCB_A" permit="false" element="parametric.tool.value"/>

-      <paletteRules xmi:id="_eHbirHDvEeWh-MssWmCB_A" element=""/>

-    </representationKinds>

-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_eHbirXDvEeWh-MssWmCB_A" name="Parametric Diagram" concerns="_yMTQc8SdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="Parametric" creationCommandClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramCreateCommand">

-      <modelRules xmi:id="_eHbirnDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </modelRules>

-      <owningRules xmi:id="_eHbir3DvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <owningRules xmi:id="_eHbisHDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </owningRules>

-      <childRules xmi:id="_eHbisXDvEeWh-MssWmCB_A"/>

-    </representationKinds>

-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_iBC4gHDvEeWh-MssWmCB_A" name="Requirement Diagram" concerns="_yMTQcsSdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif" implementationID="RequirementDiagram" creationCommandClass="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand">

-      <modelRules xmi:id="_iBC4gXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_iBC4gnDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <childRules xmi:id="_iBC4g3DvEeWh-MssWmCB_A"/>

-    </representationKinds>

-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_r5y7wHDuEeWh-MssWmCB_A" name="Allocation Table" icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png" implementationID="PapyrusSysMLAllocationTable">

-      <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>

-      <modelRules xmi:id="_r5y7wXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_r5y7wnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <configuration href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#/"/>

-    </representationKinds>

-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_lTE0gHDwEeWh-MssWmCB_A" name="Requirement Table" description="" concerns="_yMTQcsSdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.png" implementationID="PapyrusSysMLRequirementTable">

-      <modelRules xmi:id="_lTE0gXDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <modelRules xmi:id="_lTE0gnDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements/Requirement"/>

-      </modelRules>

-      <owningRules xmi:id="_lTE0g3DwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <configuration href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#/"/>

-    </representationKinds>

-    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>

-    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>

-    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>

-  </contexts>

-</architecture:ArchitectureDomain>

diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.properties b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.properties
deleted file mode 100644
index f941ea802d1..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2017 CEA LIST.
-# 
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-#  
-#  Contributors:
-#  Maged Elaasar - Initial API and implementation
-#  
-# 
-
-pluginName = SysML Architecture
-providerName=Eclipse Modeling Project
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.xml b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.xml
deleted file mode 100644
index 17a04ac7b64..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-	<extension
-	      point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-		<clientContext
-	         id="org.eclipse.papyrus.sysml.architecture.SysML">
-	      <matcher
-	            class="org.eclipse.papyrus.sysml.architecture.internal.NoContextEnablementMatcher">
-	      </matcher>
-	   	</clientContext>
-		<binding context="org.eclipse.papyrus.sysml.architecture.SysML">
-			<!-- ElementType that deals with View deletion when their related model element is deleted -->
-			<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-			<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"/>
-	        <!-- Check for attempts to edit read-only objects that cannot reasonably be made writeable. -->		
-	        <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice" />
-	        <!-- Delete markers attached to objects being deleted. -->
-		</binding>
-	</extension>
-
-	 <extension point="org.eclipse.papyrus.infra.architecture.models">
-	    <model path="model/sysml.architecture"/>
-	 </extension>
- 
-	<extension
-	      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
-	   <diagramReconciler
-	         diagramType="BlockDefinition"
-	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
-	         source="1.2.0"
-	         target="1.3.0">
-	   </diagramReconciler>
-	   <diagramReconciler
-	         diagramType="InternalBlock"
-	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
-	         source="1.2.0"
-	         target="1.3.0">
-	   </diagramReconciler>
-	   <diagramReconciler
-	         diagramType="Parametric"
-	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
-	         source="1.2.0"
-	         target="1.3.0">
-	   </diagramReconciler>
-	   <diagramReconciler
-	         diagramType="RequirementDiagram"
-	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
-	         source="1.2.0"
-	         target="1.3.0">
-	   </diagramReconciler>
-	</extension>
-
-	<extension
-	      point="org.eclipse.papyrus.infra.nattable.common.tableReconciler">
-	   <tableReconciler
-	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLTableReconciler_1_3_0"
-	         source="1.0.0"
-	         target="1.3.0">
-	   </tableReconciler>
-	</extension>
-
-</plugin>
-
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/pom.xml b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/pom.xml
deleted file mode 100644
index 7db5130d6e5..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml-architecture</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.architecture</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/SysMLArchitectureContextIds.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/SysMLArchitectureContextIds.java
deleted file mode 100644
index c87a6e77fa8..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/SysMLArchitectureContextIds.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2017 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	 Maged Elaasar - Initial API and Implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.architecture;
-
-/**
- * The ids of SysML-related architecture contexts
- * 
- * @since 1.0
- */
-public class SysMLArchitectureContextIds {
-
-	/**
-	 * The id of the SysML architecture context
-	 */
-	public static final String SysML = "org.eclipse.papyrus.sysml.architecture.SysML"; //$NON-NLS-1$
-}
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/internal/NoContextEnablementMatcher.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/internal/NoContextEnablementMatcher.java
deleted file mode 100644
index 344e823a3fb..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/internal/NoContextEnablementMatcher.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2017 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- * 		Maged Elaasar - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.architecture.internal;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-/**
- * A no context matcher used to register element type bindings in the extension points  
- */
-public class NoContextEnablementMatcher implements IElementMatcher {
-
-	@Override
-	public boolean matches(EObject eObject) {
-		return false;
-	}
-}
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLDiagramReconciler_1_3_0.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLDiagramReconciler_1_3_0.java
deleted file mode 100644
index 468433ca921..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLDiagramReconciler_1_3_0.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2017 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	 Maged Elaasar - Initial API and Implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.architecture.migration;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
-import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDescriptionLanguage;
-import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler_1_3_0;
-import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
-import org.eclipse.papyrus.infra.viewpoints.policy.ProfileUtils;
-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
-import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
-
-/**
- * SysML Diagram Reconciler from 1.2.0 to 1.3.0 that switches the old PapyrusViewStyle by
- * the new PapyrusDiagramStyle
- */
-public class SysMLDiagramReconciler_1_3_0 extends DiagramReconciler_1_3_0 {
-
-	private static final String BLOCK_DEFINITION_DIAGRAM = "BlockDefinition";
-	private static final String INTERNAL_BLOCK_DIAGRAM = "InternalBlock";
-	private static final String PARAMETRIC_DIAGRAM = "Parametric";
-	private static final String REQUIREMENT_DIAGRAM = "RequirementDiagram";
-	
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler_1_3_0#getPapyrusDiagram(org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle)
-	 *
-	 * @param oldStyle
-	 * @return
-	 */
-	@Override
-	protected PapyrusDiagram getDiagramKind(Diagram diagram, PapyrusViewStyle oldStyle) {
-		if (oldStyle != null) {
-			org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram oldDiagramKind =
-				(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram) oldStyle.getConfiguration();
-			if (oldDiagramKind != null)
-				return getDiagramKind(oldDiagramKind.getName(), diagram);
-		}
-		if (BLOCK_DEFINITION_DIAGRAM.equals(diagram.getType())) {
-			return getDiagramKind("Block Definition Diagram", diagram);
-		} else if (INTERNAL_BLOCK_DIAGRAM.equals(diagram.getType())) {
-			return getDiagramKind("Internal Block Diagram", diagram);
-		} else if (PARAMETRIC_DIAGRAM.equals(diagram.getType())) {
-			return getDiagramKind("Parametric Diagram", diagram);
-		} else if (REQUIREMENT_DIAGRAM.equals(diagram.getType())) {
-			return getDiagramKind("Requirement Diagram", diagram);
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the diagram kind that matches given name and that supports the given diagram
-	 */
-	protected PapyrusDiagram getDiagramKind(String name, Diagram diagram) {
-		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
-		MergedArchitectureDescriptionLanguage context = (MergedArchitectureDescriptionLanguage) manager.getArchitectureContextById(SysMLArchitectureContextIds.SysML);
-		for(RepresentationKind pKind : context.getRepresentationKinds()) {
-			if (pKind.getName().equals(name)) {
-				PapyrusDiagram dKind = (PapyrusDiagram) pKind;
-				if (dKind.getModelRules().get(0).getElement().isInstance(diagram.getElement())) {
-					boolean allStereotypesApplied = true;
-					Collection<EClass> appliedStereotypes = 
-						ProfileUtils.getProfileHelper().getAppliedStereotypes(diagram.getElement());
-					for (EClass stereotype : dKind.getModelRules().get(0).getStereotypes()) {
-						if (!appliedStereotypes.contains(stereotype)) {
-							allStereotypesApplied = false;
-						}
-					}
-					if (allStereotypesApplied)
-						return dKind;
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLTableReconciler_1_3_0.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLTableReconciler_1_3_0.java
deleted file mode 100644
index a2d41951db9..00000000000
--- a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLTableReconciler_1_3_0.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2017 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	 Maged Elaasar - Initial API and Implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.architecture.migration;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
-import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
-import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDescriptionLanguage;
-import org.eclipse.papyrus.infra.nattable.common.reconciler.TableReconciler;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
-import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
-
-/**
- * UML Table Reconciler from 1.0.0 to 1.1.0 that replaces the old prototype value for tables
- * with ones based on table kinds
- */
-public class SysMLTableReconciler_1_3_0 extends TableReconciler {
-
-	private static final String ALLOCATION_TABLE = "Allocation Table";
-	private static final String REQUIREMENT_TABLE = "Requirement Table";
-
-	@Override
-	public ICommand getReconcileCommand(Table table) {
-		if (table.getPrototype() instanceof org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView) {
-			org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView oldTableKind =
-				(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView) table.getPrototype();
-			
-			RepresentationKind newTableKind = null;
-			if (oldTableKind != null) {
-				if (ALLOCATION_TABLE.equals(oldTableKind.getName())) {
-					newTableKind = getTableKind(oldTableKind.getName(), table);
-				} else if (REQUIREMENT_TABLE.equals(oldTableKind.getName())) {
-					newTableKind = getTableKind(oldTableKind.getName(), table);
-				}
-			};
-			
-			if (newTableKind != null)
-				return new ReplaceTablePrototypeCommand(table, newTableKind);
-		}
-		return null;
-	}
-
-	protected PapyrusTable getTableKind(String name, Table table) {
-		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
-		MergedArchitectureDescriptionLanguage context = (MergedArchitectureDescriptionLanguage) manager.getArchitectureContextById(SysMLArchitectureContextIds.SysML);
-		for(RepresentationKind pKind : context.getRepresentationKinds()) {
-			if (pKind.getName().equals(name)) {
-				PapyrusTable tKind = (PapyrusTable) pKind;
-				if (tKind.getModelRules().get(0).getElement().isInstance(table.getContext())) {
-					return tKind;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * A command to replace the old table prototype with the new representation kinds 
-	 */
-	protected class ReplaceTablePrototypeCommand extends AbstractCommand {
-
-		private Table table;
-		private RepresentationKind newKind;
-
-		public ReplaceTablePrototypeCommand(Table table, RepresentationKind newKind) {
-			super("Replace the papyrus view style from 1.0.0 to 1.1.0");
-			this.table = table;
-			this.newKind = newKind;
-		}
-
-		@Override
-		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-			table.setPrototype(newKind);
-			return CommandResult.newOKCommandResult();
-		}
-
-		@Override
-		public boolean canUndo() {
-			return false;
-		}
-
-		@Override
-		public boolean canRedo() {
-			return false;
-		}
-
-		@Override
-		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-			throw new ExecutionException("Should not be called, canRedo false"); //$NON-NLS-1$
-		}
-
-		@Override
-		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-			throw new ExecutionException("Should not be called, canUndo false"); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/plugins/sysml/architecture/pom.xml b/plugins/sysml/architecture/pom.xml
deleted file mode 100644
index f7018617303..00000000000
--- a/plugins/sysml/architecture/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.sysml-architecture</artifactId>
-	<packaging>pom</packaging>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-    </parent>
-	<name>Papyrus SysML Architecture</name>
-	<description>Papyrus SysML Architecture Contexts.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.sysml.architecture</module>
-	</modules>
-</project>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.classpath b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.classpath
deleted file mode 100644
index 0c22b5d7e6d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.project
deleted file mode 100644
index b7e1bee8b50..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.diagram.blockdefinition</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/net.sf.jautodoc.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/net.sf.jautodoc.prefs
deleted file mode 100644
index 4de945c12f9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/net.sf.jautodoc.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Apr 21 13:16:39 CEST 2011

-add_header=true

-eclipse.preferences.version=1

-header_text=/*****************************************************************************\r\n * Copyright (c) 2011 CEA LIST.\r\n *\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *\t\t\r\n *\t\tCEA LIST - Initial API and implementation\r\n *\r\n *****************************************************************************/

-project_specific_settings=true

-replace_header=true

-replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f00da6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.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/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index cfcdd23cfde..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.command,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.factory,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.messages,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.part,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.provider,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.ui,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.utils
-Require-Bundle: org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.blockdefinition;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/build.properties
deleted file mode 100644
index ca8d8455ba2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               icons/,\
-               palettes/,\
-               plugin.properties,\
-               messages.properties,\
-               about.html,\
-               plugin.xml,\
-               model/
-output..=bin/
-src.includes = about.html,\
-               model/,\
-               src/
-source..=src/,src-gen/
-bin..=bin/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Diagram_BlockDefinition.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Diagram_BlockDefinition.gif
deleted file mode 100644
index 103060ab79b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Diagram_BlockDefinition.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/InstanceLink.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/InstanceLink.gif
deleted file mode 100644
index d9712d1dad7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/InstanceLink.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Link.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Link.gif
deleted file mode 100644
index 13fb22e4bfe..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Link.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/messages.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/messages.properties
deleted file mode 100644
index 0fbb20aa31b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Notification_Drop_Title=Drop in diagram
-Notification_Drop_UMLAssociationWarning=The Association ({0}) can not be dropped in this diagram because it is not a SysML Association.\nIt was probably not created in a SysML Diagram.
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/SysML.BlockDefinition.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/SysML.BlockDefinition.idgen
deleted file mode 100644
index 128b77ac755..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/SysML.BlockDefinition.idgen
+++ /dev/null
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<idgen:Diagram 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:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="BlockDefinition" type="BlockDefinition" icon="icons/obj16/Diagram_BlockDefinition.gif" label="SysML Block Definition Diagram" language="sysml" javaPackagePrefix="org.eclipse.papyrus.sysml.diagram.blockdefinition" javaClassPrefix="BlockDefinitionDiagram" createCommandLabel="Create a new Block Definition Diagram">

-  <diagramEditPart name="Diagram edit part">

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomDiagramDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>

-    <behaviors name="" javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.ShowHideRelatedLinkEditPolicy" key="ShowHideRelatedLinkEditPolicy"/>

-  </diagramEditPart>

-  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy">

-    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.7"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.26"/>

-    </genNodes>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.28"/>

-    </genNodes>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.3"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.22"/>

-    </genNodes>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.13"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.33"/>

-    </genNodes>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.14"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.32"/>

-    </genNodes>

-    <genLinks name="Comment / Constraint link" generatePreferencePage="false">

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>

-    </genLinks>

-    <genLinks generatePreferencePage="false" generateTool="false">

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.17"/>

-    </genLinks>

-  </inheritedDiagrams>

-  <customJavaClasses customEditPolicyProvider="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomEditPolicyProvider" customPreferenceInitializer="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.CustomPreferenceInitializer"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_constraint_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumerationliteral_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_operation_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintproperty_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowproperty_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_part_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_reference_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_value_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_property_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_reception_as_label"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_actor_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumeration_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_primitivetype_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_valuetype_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_datatype_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowspecification_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_interface_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_signal_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblock_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_dimension_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_unit_as_classifier"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#link_sysml_association"/>

-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_usage"/>

-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_interfacerealization"/>

-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_dependency"/>

-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_generalization"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_enumerationliteral_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_port_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_constraint_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_flowport_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_flowproperty_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_parameter_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_part_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_reference_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_value_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_property_as_list"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#affixedlabel_uml_namedelement_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#affixedlabel_uml_appliedstereotype"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#affixedlabel_uml_port_label"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#affixedlabel_sysml_flowport_label"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#label_uml_namedelement_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_block_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_constraintblock_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_dimension_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_flowspecification_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_unit_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_valuetype_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_appliedstereotype"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_namedelement_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_association_source_multiplicity"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_association_source_role"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_association_target_multiplicity"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_association_target_role"/>

-  <diagramConfig>

-    <contains xsi:type="idgen:GraphicalTypeDiagramRef">

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_property_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_part_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_reference_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_port_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_flowport_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_constraint_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_value_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblock_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_parameter_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_constraint_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowspecification_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_flowproperty_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_dimension_as_classifier"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_datatype_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_unit_as_classifier"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_valuetype_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_actor_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumeration_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_enumerationliteral_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_interface_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_primitivetype_as_classifier"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_signal_as_classifier"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#link_sysml_association"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_usage"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_interfacerealization"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_dependency"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_generalization"/>

-      </contains>

-      <contains xsi:type="idgen:LegacyTypeRef" legacyRef="//@inheritedDiagrams.0/@genNodes.2">

-        <contains xsi:type="idgen:LegacyCompartmentRef">

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblock_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowspecification_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_dimension_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_datatype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_unit_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_valuetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_actor_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumeration_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_interface_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_primitivetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_signal_as_classifier"/>

-          </contains>

-          <legacyRef href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@compartments.31"/>

-        </contains>

-      </contains>

-      <contains xsi:type="idgen:LegacyTypeRef" legacyRef="//@inheritedDiagrams.0/@genNodes.3">

-        <contains xsi:type="idgen:LegacyCompartmentRef">

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblock_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowspecification_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_dimension_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_datatype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_unit_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_valuetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_actor_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumeration_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_interface_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_primitivetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_signal_as_classifier"/>

-          </contains>

-          <legacyRef href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@compartments.13"/>

-        </contains>

-      </contains>

-      <contains xsi:type="idgen:LegacyTypeRef" legacyRef="//@inheritedDiagrams.0/@genNodes.0">

-        <contains xsi:type="idgen:LegacyCompartmentRef">

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblock_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowspecification_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_dimension_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_datatype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_unit_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_valuetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_actor_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumeration_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_interface_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_primitivetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_signal_as_classifier"/>

-          </contains>

-          <legacyRef href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@compartments.30"/>

-        </contains>

-      </contains>

-      <contains xsi:type="idgen:LegacyTypeRef" legacyRef="//@inheritedDiagrams.0/@genNodes.1">

-        <contains xsi:type="idgen:LegacyCompartmentRef">

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblock_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowspecification_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_dimension_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_datatype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_unit_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_valuetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_actor_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumeration_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_interface_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_primitivetype_as_classifier"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_signal_as_classifier"/>

-          </contains>

-          <legacyRef href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@compartments.12"/>

-        </contains>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_flowproperty_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowproperty_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_property_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_parameter_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_property_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_port_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_flowport_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_operation_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_reception_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_constraint_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_constraint_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintproperty_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#compartment_uml_enumerationliteral_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_enumerationliteral_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_property_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_property_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_part_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_reference_as_label"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_value_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_part_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_part_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_reference_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_reference_as_label"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_value_as_list"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_value_as_label"/>

-      </contains>

-    </contains>

-  </diagramConfig>

-  <preferences name="DiagramPreferences">

-    <pages name="Dependency"/>

-  </preferences>

-</idgen:Diagram>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration
deleted file mode 100644
index cc45bb8294c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.blockdefinition.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.blockdefinition Palette" description="">

-  <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__Associations" label="Associations" description="">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_none" label="Association" description="Create a new Association" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.AssociationNone"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_none_directed" label="DirectedAssociation" description="Create a new DirectedAssociation" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_none_directed.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.AssociationNoneDirected"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_composite" label="Composition" description="Create a new Composition" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association_composite.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.AssociationComposite"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_composite_directed" label="DirectedComposition" description="Create a new DirectedComposition" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_composite_directed.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.AssociationCompositeDirected"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_shared" label="Aggregation" description="Create a new Aggregation" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association_shared.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.AssociationShared"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_shared_directed" label="DirectedAggregation" description="Create a new DirectedAggregation" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_shared_directed.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.AssociationSharedDirected"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.instance_specification_link" label="InstanceSpecificationLink" description="Create a new InstanceSpecificationLink" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/InstanceLink.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ModelElements" label="ModelElements" description="">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.package" label="Package" description="Create a new Package">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.actor" label="Actor" description="Create a new Actor">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.block" label="Block" description="Create a new Block">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Block.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Block"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.signal" label="Signal" description="Create a new Signal">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.operation" label="Operation" description="Create a new Operation">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.reception" label="Reception" description="Create a new Reception">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.property" label="Property" description="Create a new Property">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.part" label="Part" description="Create a new Part">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.PartProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.reference" label="Reference" description="Create a new Reference">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ReferenceProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.actorpart" label="ActorPart" description="Create a new ActorPart">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ActorPartProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.value" label="Value" description="Create a new Value">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ValueProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.instancespecification" label="InstanceSpecification" description="Create a new InstanceSpecification">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.slot" label="Slot" description="Create a new Slot">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.generalization" label="Generalization" description="Create a new Generalization" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__PortAndFlowTools" label="PortAndFlows">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.port" label="Port" description="Create a new Port">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.flowport" label="FlowPort" description="Create a new FlowPort">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.flowspecification" label="FlowSpecification" description="Create a new FlowSpecification">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowSpecification.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowSpecification"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.flowproperty" label="FlowProperty" description="Create a new FlowProperty">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowProperty.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.interface" label="Interface" description="Create a new Interface">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.interfacerealization" label="InterfaceRealization" description="Create a new InterfaceRealization" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.usage" label="Usage" description="Create a new Usage" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__DataTypeTools" label="Datatypes">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.datatype" label="DataType" description="Create a new DataType">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.valuetype" label="ValueType" description="Create a new ValueType">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/ValueType.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ValueType"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.primitivetype" label="PrimitiveType" description="Create a new PrimitiveType">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.enumeration" label="Enumeration" description="Create a new Enumeration">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.enumerationliteral" label="EnumerationLiteral" description="Create a new EnumerationLiteral">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.dimension" label="Dimension" description="Create a new Dimension">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Dimension.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Dimension"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.unit" label="Unit" description="Create a new Unit">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Unit.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Unit"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ContraintTools" label="CommentAndConstraints">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.constraintblock" label="ConstraintBlock" description="Create a new ConstraintBlock">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/constraints/ConstraintBlock.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ConstraintBlock"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.constraintproperty" label="ConstraintProperty" description="Create a new ConstraintProperty">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/constraints/ConstraintProperty.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ConstraintProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.property" label="Parameter" description="Create a new Parameter (Property)">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.constraint" label="Constraint" description="Create a new Constraint">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.comment" label="Comment" description="Create a new Comment">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.comment_constraint_link_1486387609929" label="Comment / Constraint link" description="Create a new Comment / Constraint link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <requiredProfiles>SysML</requiredProfiles>

-</paletteconfiguration:PaletteConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.associations.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.associations.xml
deleted file mode 100644
index 51548e1734c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.associations.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__Associations" name="Associations">
-			
-			<aspectTool description="Create a new Association" id="blockdefinition_associations.tool.association_none"
-				name="Association" refToolId="blockdefinition.tool.association_none">
-			</aspectTool>
-			
-			<aspectTool description="Create a new DirectedAssociation" id="blockdefinition_associations.tool.association_none_directed"
-				name="DirectedAssociation" refToolId="blockdefinition.tool.association_none_directed">
-			</aspectTool>
-			
-			<aspectTool description="Create a new Composition" id="blockdefinition_associations.tool.association_composite"
-				name="Composition" refToolId="blockdefinition.tool.association_composite">
-			</aspectTool>
-
-			<aspectTool description="Create a new DirectedComposition" id="blockdefinition_associations.tool.association_composite_directed"
-				name="DirectedComposition" refToolId="blockdefinition.tool.association_composite_directed">
-			</aspectTool>
-	
-			<aspectTool description="Create a new Aggregation" id="blockdefinition_associations.tool.association_shared"
-				name="Aggregation" refToolId="blockdefinition.tool.association_shared">
-			</aspectTool>
-
-			<aspectTool description="Create a new DirectedAggregation" id="blockdefinition_associations.tool.association_shared_directed"
-				name="DirectedAggregation" refToolId="blockdefinition.tool.association_shared_directed">
-			</aspectTool>
-			
-			<aspectTool description="Create a new InstanceSpecificationLink" id="blockdefinition_associations.tool.instance_specification_link"
-				name="InstanceSpecificationLink" refToolId="blockdefinition.tool.instance_specification_link">
-			</aspectTool>
-											
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.constraints.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.constraints.xml
deleted file mode 100644
index 0cd691e179f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.constraints.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ContraintTools" name="CommentAndConstraints">
-			
-			<aspectTool description="Create a new ConstraintBlock" id="blockdefinition_constraints.tool.constraintblock"
-				name="ConstraintBlock" refToolId="blockdefinition.tool.constraintblock">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintProperty" id="blockdefinition_constraints.tool.constraintproperty"
-				name="ConstraintProperty" refToolId="blockdefinition.tool.constraintproperty">
-			</aspectTool>			
-			<aspectTool description="Create a new Parameter (Property)" id="blockdefinition_constraints.tool.property"
-				name="Parameter" refToolId="blockdefinition.tool.property">
-			</aspectTool>			
-			<aspectTool description="Create a new Constraint" id="blockdefinition_constraints.tool.constraint"
-				name="Constraint" refToolId="blockdefinition.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="blockdefinition_constraints.tool.comment"
-				name="Comment" refToolId="blockdefinition.tool.comment">
-			</aspectTool>				
-			<aspectTool description="Create a new Comment / Constraint link" id="blockdefinition_constraints.tool.comment_constraint_link"
-				name="Comment / Constraint link" refToolId="blockdefinition.tool.comment_constraint_link">
-			</aspectTool>				
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.datatypes.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.datatypes.xml
deleted file mode 100644
index db6d81e1ef3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.datatypes.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__DataTypeTools" name="DataTypes">
-			
-			<aspectTool description="Create a new DataType" id="blockdefinition_datatypes.tool.datatype"
-				name="DataType" refToolId="blockdefinition.tool.datatype">
-			</aspectTool>
-			<aspectTool description="Create a new ValueType" id="blockdefinition_datatypes.tool.valuetype"
-				name="ValueType" refToolId="blockdefinition.tool.valuetype">
-			</aspectTool>
-			<aspectTool description="Create a new PrimitiveType" id="blockdefinition_datatypes.tool.primitivetype"
-				name="PrimitiveType" refToolId="blockdefinition.tool.primitivetype">
-			</aspectTool>				
-			<aspectTool description="Create a new Enumeration" id="blockdefinition_datatypes.tool.enumeration"
-				name="Enumeration" refToolId="blockdefinition.tool.enumeration">
-			</aspectTool>			
-			<aspectTool description="Create a new EnumerationLiteral" id="blockdefinition_datatypes.tool.enumerationliteral"
-				name="EnumerationLiteral" refToolId="blockdefinition.tool.enumerationliteral">
-			</aspectTool>
-			<aspectTool description="Create a new Dimension" id="blockdefinition_datatypes.tool.dimension"
-				name="Dimension" refToolId="blockdefinition.tool.dimension">
-			</aspectTool>
-			<aspectTool description="Create a new Unit" id="blockdefinition_datatypes.tool.unit"
-				name="Unit" refToolId="blockdefinition.tool.unit">
-			</aspectTool>			
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.gen.xml
deleted file mode 100644
index 43932810719..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.gen.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__Tools" name="Tools">
-			<aspectTool description="Create a new Actor" id="blockdefinition.tool.actor"
-				name="Actor" refToolId="blockdefinition.tool.actor">
-			</aspectTool>
-			<aspectTool description="Create a new Block" id="blockdefinition.tool.block"
-				name="Block" refToolId="blockdefinition.tool.block">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="blockdefinition.tool.constraint"
-				name="Constraint" refToolId="blockdefinition.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintBlock" id="blockdefinition.tool.constraintblock"
-				name="ConstraintBlock" refToolId="blockdefinition.tool.constraintblock">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintProperty" id="blockdefinition.tool.constraintproperty"
-				name="ConstraintProperty" refToolId="blockdefinition.tool.constraintproperty">
-			</aspectTool>
-			<aspectTool description="Create a new DataType" id="blockdefinition.tool.datatype"
-				name="DataType" refToolId="blockdefinition.tool.datatype">
-			</aspectTool>
-			<aspectTool description="Create a new Dimension" id="blockdefinition.tool.dimension"
-				name="Dimension" refToolId="blockdefinition.tool.dimension">
-			</aspectTool>
-			<aspectTool description="Create a new Enumeration" id="blockdefinition.tool.enumeration"
-				name="Enumeration" refToolId="blockdefinition.tool.enumeration">
-			</aspectTool>
-			<aspectTool description="Create a new EnumerationLiteral" id="blockdefinition.tool.enumerationliteral"
-				name="EnumerationLiteral" refToolId="blockdefinition.tool.enumerationliteral">
-			</aspectTool>
-			<aspectTool description="Create a new FlowPort" id="blockdefinition.tool.flowport"
-				name="FlowPort" refToolId="blockdefinition.tool.flowport">
-			</aspectTool>
-			<aspectTool description="Create a new FlowProperty" id="blockdefinition.tool.flowproperty"
-				name="FlowProperty" refToolId="blockdefinition.tool.flowproperty">
-			</aspectTool>
-			<aspectTool description="Create a new FlowSpecification" id="blockdefinition.tool.flowspecification"
-				name="FlowSpecification" refToolId="blockdefinition.tool.flowspecification">
-			</aspectTool>
-			<aspectTool description="Create a new Interface" id="blockdefinition.tool.interface"
-				name="Interface" refToolId="blockdefinition.tool.interface">
-			</aspectTool>
-			<aspectTool description="Create a new Operation" id="blockdefinition.tool.operation"
-				name="Operation" refToolId="blockdefinition.tool.operation">
-			</aspectTool>
-			<aspectTool description="Create a new Part" id="blockdefinition.tool.part"
-				name="Part" refToolId="blockdefinition.tool.part">
-			</aspectTool>
-			<aspectTool description="Create a new Port" id="blockdefinition.tool.port"
-				name="Port" refToolId="blockdefinition.tool.port">
-			</aspectTool>
-			<aspectTool description="Create a new PrimitiveType" id="blockdefinition.tool.primitivetype"
-				name="PrimitiveType" refToolId="blockdefinition.tool.primitivetype">
-			</aspectTool>
-			<aspectTool description="Create a new Property" id="blockdefinition.tool.property"
-				name="Property" refToolId="blockdefinition.tool.property">
-			</aspectTool>
-			<aspectTool description="Create a new Reception" id="blockdefinition.tool.reception"
-				name="Reception" refToolId="blockdefinition.tool.reception">
-			</aspectTool>
-			<aspectTool description="Create a new Reference" id="blockdefinition.tool.reference"
-				name="Reference" refToolId="blockdefinition.tool.reference">
-			</aspectTool>
-			<aspectTool description="Create a new Signal" id="blockdefinition.tool.signal"
-				name="Signal" refToolId="blockdefinition.tool.signal">
-			</aspectTool>
-			<aspectTool description="Create a new Unit" id="blockdefinition.tool.unit"
-				name="Unit" refToolId="blockdefinition.tool.unit">
-			</aspectTool>
-			<aspectTool description="Create a new Value" id="blockdefinition.tool.value"
-				name="Value" refToolId="blockdefinition.tool.value">
-			</aspectTool>
-			<aspectTool description="Create a new ValueType" id="blockdefinition.tool.valuetype"
-				name="ValueType" refToolId="blockdefinition.tool.valuetype">
-			</aspectTool>
-			<aspectTool description="Create a new Association" id="blockdefinition.tool.association"
-				name="Association" refToolId="blockdefinition.tool.association">
-			</aspectTool>
-			<aspectTool description="Create a new Dependency" id="blockdefinition.tool.dependency"
-				name="Dependency" refToolId="blockdefinition.tool.dependency">
-			</aspectTool>
-			<aspectTool description="Create a new Generalization" id="blockdefinition.tool.generalization"
-				name="Generalization" refToolId="blockdefinition.tool.generalization">
-			</aspectTool>
-			<aspectTool description="Create a new InterfaceRealization" id="blockdefinition.tool.interfacerealization"
-				name="InterfaceRealization" refToolId="blockdefinition.tool.interfacerealization">
-			</aspectTool>
-			<aspectTool description="Create a new Usage" id="blockdefinition.tool.usage"
-				name="Usage" refToolId="blockdefinition.tool.usage">
-			</aspectTool>
-			
-			<aspectTool description="Create a new Comment" id="blockdefinition.tool.comment"
-				name="Comment" refToolId="clazz.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="blockdefinition.tool.constraint"
-				name="Constraint" refToolId="clazz.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new InstanceSpecification" id="blockdefinition.tool.instancespecification"
-				name="InstanceSpecification" refToolId="clazz.tool.instancespecification">
-			</aspectTool>
-			<aspectTool description="Create a new Model" id="blockdefinition.tool.model"
-				name="Model" refToolId="clazz.tool.model">
-			</aspectTool>
-			<aspectTool description="Create a new Package" id="blockdefinition.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new Slot" id="blockdefinition.tool.slot"
-				name="Slot" refToolId="clazz.tool.slot">
-			</aspectTool>
-			<aspectTool description="Create a new Comment / Constraint link" id="blockdefinition.tool.comment / constraint link"
-				name="Comment / Constraint link" refToolId="clazz.tool.link">
-			</aspectTool>
-			
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.incubation.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.incubation.xml
deleted file mode 100644
index 68a2b884339..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.incubation.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__Incubation" name="Incubation">
-			
-			<aspectTool description="Create a new Model" id="blockdefinition.tool.model"
-				name="Model" refToolId="clazz.tool.model">
-			</aspectTool>
-			<aspectTool description="Create a new Package" id="blockdefinition.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new InstanceSpecification" id="blockdefinition.tool.instancespecification"
-				name="InstanceSpecification" refToolId="clazz.tool.instancespecification">
-			</aspectTool>
-			<aspectTool description="Create a new Slot" id="blockdefinition.tool.slot"
-				name="Slot" refToolId="clazz.tool.slot">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="blockdefinition.tool.constraint"
-				name="Constraint" refToolId="clazz.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="blockdefinition.tool.comment"
-				name="Comment" refToolId="clazz.tool.comment">
-			</aspectTool>		
-			<aspectTool description="Create a new Comment / Contraint link" id="blockdefinition.tool.comment / contraint link"
-				name="Comment / Contraint link" refToolId="clazz.tool.link">
-			</aspectTool>
-
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.modelelements.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.modelelements.xml
deleted file mode 100644
index daf4f537d96..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.modelelements.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ModelElements" name="ModelElements">
-			
-			<aspectTool description="Create a new Package" id="blockdefinition_modelelements.tool.package"
-				name="Package" refToolId="blockdefinition.tool.package">
-			</aspectTool>			
-			<aspectTool description="Create a new Actor" id="blockdefinition_modelelements.tool.actor"
-				name="Actor" refToolId="blockdefinition.tool.actor">
-			</aspectTool>
-			<aspectTool description="Create a new Block" id="blockdefinition_modelelements.tool.block"
-				name="Block" refToolId="blockdefinition.tool.block">
-			</aspectTool>
-			<aspectTool description="Create a new Signal" id="blockdefinition_modelelements.tool.signal"
-				name="Signal" refToolId="blockdefinition.tool.signal">
-			</aspectTool>			
-			<aspectTool description="Create a new Operation" id="blockdefinition_modelelements.tool.operation"
-				name="Operation" refToolId="blockdefinition.tool.operation">
-			</aspectTool>
-			<aspectTool description="Create a new Reception" id="blockdefinition_modelelements.tool.reception"
-				name="Reception" refToolId="blockdefinition.tool.reception">
-			</aspectTool>
-			<aspectTool description="Create a new Property" id="blockdefinition_modelelements.tool.property"
-				name="Property" refToolId="blockdefinition.tool.property">
-			</aspectTool>
-			<aspectTool description="Create a new Part" id="blockdefinition_modelelements.tool.part"
-				name="Part" refToolId="blockdefinition.tool.part">
-			</aspectTool>
-			<aspectTool description="Create a new Reference" id="blockdefinition_modelelements.tool.reference"
-				name="Reference" refToolId="blockdefinition.tool.reference">
-			</aspectTool>
-			<aspectTool description="Create a new ActorPart" id="blockdefinition_modelelements.tool.actorpart"
-				name="ActorPart" refToolId="blockdefinition.tool.actorpart">
-			</aspectTool>			
-			<aspectTool description="Create a new Value" id="blockdefinition_modelelements.tool.value"
-				name="Value" refToolId="blockdefinition.tool.value">
-			</aspectTool>
-			<aspectTool description="Create a new InstanceSpecification" id="blockdefinition_modelelements.tool.instancespecification"
-				name="InstanceSpecification" refToolId="blockdefinition.tool.instancespecification">
-			</aspectTool>
-			<aspectTool description="Create a new Slot" id="blockdefinition_modelelements.tool.slot"
-				name="Slot" refToolId="blockdefinition.tool.slot">
-			</aspectTool>
-			<aspectTool description="Create a new Dependency" id="blockdefinition_modelelements.tool.dependency"
-				name="Dependency" refToolId="blockdefinition.tool.dependency">
-			</aspectTool>
-			<aspectTool description="Create a new Generalization" id="blockdefinition_modelelements.tool.generalization"
-				name="Generalization" refToolId="blockdefinition.tool.generalization">
-			</aspectTool>						
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.portandflows.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.portandflows.xml
deleted file mode 100644
index 96c2a8a2c0f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.portandflows.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__PortAndFlowTools" name="PortAndFlows">
-			
-			<aspectTool description="Create a new Port" id="blockdefinition_portandflows.tool.port"
-				name="Port" refToolId="blockdefinition.tool.port">
-			</aspectTool>
-			<aspectTool description="Create a new FlowPort" id="blockdefinition_portandflows.tool.flowport"
-				name="FlowPort" refToolId="blockdefinition.tool.flowport">
-			</aspectTool>			
-			<aspectTool description="Create a new FlowSpecification" id="blockdefinition_portandflows.tool.flowspecification"
-				name="FlowSpecification" refToolId="blockdefinition.tool.flowspecification">
-			</aspectTool>			
-			<aspectTool description="Create a new FlowProperty" id="blockdefinition_portandflows.tool.flowproperty"
-				name="FlowProperty" refToolId="blockdefinition.tool.flowproperty">
-			</aspectTool>
-			<aspectTool description="Create a new Interface" id="blockdefinition_portandflows.tool.interface"
-				name="Interface" refToolId="blockdefinition.tool.interface">
-			</aspectTool>
-			<aspectTool description="Create a new InterfaceRealization" id="blockdefinition_portandflows.tool.interfacerealization"
-				name="InterfaceRealization" refToolId="blockdefinition.tool.interfacerealization">
-			</aspectTool>
-			<aspectTool description="Create a new Usage" id="blockdefinition_portandflows.tool.usage"
-				name="Usage" refToolId="blockdefinition.tool.usage">
-			</aspectTool>
-						
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
deleted file mode 100644
index aceeac5c1d9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
+++ /dev/null
@@ -1,1308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.infra.core.papyrusDiagram">
-	<creationCommand
-		creationCommandClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramCreateCommand"
-		icon="icons/obj16/Diagram_BlockDefinition.gif"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-		language="sysml"
-		label="Block Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramEditorFactory"
-		icon="icons/obj16/Diagram_BlockDefinition.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-		name="Create a new Block Definition Diagram"
-		description="Create a new Block Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramCreateCommand"
-		commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand">
-		<activeWhen>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor" />
-			</with>
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- Diagram creation command registration in menu and toolbar -->
-<extension point="org.eclipse.ui.menus">
-
-	<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
-	<menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-			icon="icons/obj16/Diagram_BlockDefinition.gif" label="Create a new Block Definition Diagram"
-			style="push" tooltip="Create a new Block Definition Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-					
-		</command>
-	</menu>
-	</menuContribution>
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.papyrus.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-			icon="icons/obj16/Diagram_BlockDefinition.gif" label="Create a new Block Definition Diagram"
-			style="push" tooltip="Create a new Block Definition Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-			icon="icons/obj16/Diagram_BlockDefinition.gif"
-			label="Create a new Block Definition Diagram"
-			style="push"
-			tooltip="Create a new Block Definition Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"
-	name="SYSML_BlockDefinition_Predefined_Entries"
-	id="org.eclipse.papyrus.sysml.diagram.blockdefinition.palettedefinition"> 
-		
-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-	<Priority name="Lowest"/> <!-- Lower priority than Palette tool declaration -->
-	
-	<!-- SysML Block Definition Diagram specific tool definition -->
-	<contribution
-		factoryClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.factory.DiagramPaletteFactory">
-			
-		<!-- blockdefinition.tool.actor -->
-		<entry
-			defineOnly="true"
-			description="Create a Actor"
-			id="blockdefinition.tool.actor"
-			kind="tool"
-			label="Actor"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.block -->
-		<entry
-			defineOnly="true"
-			description="Create a Block"
-			id="blockdefinition.tool.block"
-			kind="tool"
-			label="Block"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.constraint -->
-		<entry
-			defineOnly="true"
-			description="Create a Constraint"
-			id="blockdefinition.tool.constraint"
-			kind="tool"
-			label="Constraint"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.constraintblock -->
-		<entry
-			defineOnly="true"
-			description="Create a ConstraintBlock"
-			id="blockdefinition.tool.constraintblock"
-			kind="tool"
-			label="ConstraintBlock"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.constraintproperty -->
-		<entry
-			defineOnly="true"
-			description="Create a ConstraintProperty"
-			id="blockdefinition.tool.constraintproperty"
-			kind="tool"
-			label="ConstraintProperty"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.datatype -->
-		<entry
-			defineOnly="true"
-			description="Create a DataType"
-			id="blockdefinition.tool.datatype"
-			kind="tool"
-			label="DataType"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.dimension -->
-		<entry
-			defineOnly="true"
-			description="Create a Dimension"
-			id="blockdefinition.tool.dimension"
-			kind="tool"
-			label="Dimension"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.enumeration -->
-		<entry
-			defineOnly="true"
-			description="Create a Enumeration"
-			id="blockdefinition.tool.enumeration"
-			kind="tool"
-			label="Enumeration"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.enumerationliteral -->
-		<entry
-			defineOnly="true"
-			description="Create a EnumerationLiteral"
-			id="blockdefinition.tool.enumerationliteral"
-			kind="tool"
-			label="EnumerationLiteral"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.flowport -->
-		<entry
-			defineOnly="true"
-			description="Create a FlowPort"
-			id="blockdefinition.tool.flowport"
-			kind="tool"
-			label="FlowPort"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.flowproperty -->
-		<entry
-			defineOnly="true"
-			description="Create a FlowProperty"
-			id="blockdefinition.tool.flowproperty"
-			kind="tool"
-			label="FlowProperty"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.flowspecification -->
-		<entry
-			defineOnly="true"
-			description="Create a FlowSpecification"
-			id="blockdefinition.tool.flowspecification"
-			kind="tool"
-			label="FlowSpecification"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.interface -->
-		<entry
-			defineOnly="true"
-			description="Create a Interface"
-			id="blockdefinition.tool.interface"
-			kind="tool"
-			label="Interface"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.operation -->
-		<entry
-			defineOnly="true"
-			description="Create a Operation"
-			id="blockdefinition.tool.operation"
-			kind="tool"
-			label="Operation"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.part -->
-		<entry
-			defineOnly="true"
-			description="Create a Part"
-			id="blockdefinition.tool.part"
-			kind="tool"
-			label="Part"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.port -->
-		<entry
-			defineOnly="true"
-			description="Create a Port"
-			id="blockdefinition.tool.port"
-			kind="tool"
-			label="Port"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.primitivetype -->
-		<entry
-			defineOnly="true"
-			description="Create a PrimitiveType"
-			id="blockdefinition.tool.primitivetype"
-			kind="tool"
-			label="PrimitiveType"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.property -->
-		<entry
-			defineOnly="true"
-			description="Create a Property"
-			id="blockdefinition.tool.property"
-			kind="tool"
-			label="Property"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.reception -->
-		<entry
-			defineOnly="true"
-			description="Create a Reception"
-			id="blockdefinition.tool.reception"
-			kind="tool"
-			label="Reception"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.reference -->
-		<entry
-			defineOnly="true"
-			description="Create a Reference"
-			id="blockdefinition.tool.reference"
-			kind="tool"
-			label="Reference"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.signal -->
-		<entry
-			defineOnly="true"
-			description="Create a Signal"
-			id="blockdefinition.tool.signal"
-			kind="tool"
-			label="Signal"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.unit -->
-		<entry
-			defineOnly="true"
-			description="Create a Unit"
-			id="blockdefinition.tool.unit"
-			kind="tool"
-			label="Unit"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.value -->
-		<entry
-			defineOnly="true"
-			description="Create a Value"
-			id="blockdefinition.tool.value"
-			kind="tool"
-			label="Value"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.valuetype -->
-		<entry
-			defineOnly="true"
-			description="Create a ValueType"
-			id="blockdefinition.tool.valuetype"
-			kind="tool"
-			label="ValueType"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif">
-		</entry>
-		<!-- Start of user code Custom node button entry  -->
-
-		<entry
-			defineOnly="true"
-			description="Create a Model"
-			id="blockdefinition.tool.model"
-			kind="tool"
-			label="Model"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">
-		</entry>
-
-		<entry
-			defineOnly="true"
-			description="Create a Package"
-			id="blockdefinition.tool.package"
-			kind="tool"
-			label="Package"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
-		</entry>
-		
-		<entry
-			defineOnly="true"
-			description="Create an InstanceSpecification"
-			id="blockdefinition.tool.instancespecification"
-			kind="tool"
-			label="InstanceSpecification"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif">
-		</entry>
-		
-		<entry
-			defineOnly="true"
-			description="Create a Slot"
-			id="blockdefinition.tool.slot"
-			kind="tool"
-			label="Slot"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif">
-		</entry>
-		
-		<entry
-			defineOnly="true"
-			description="Create a Comment"
-			id="blockdefinition.tool.comment"
-			kind="tool"
-			label="Comment"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
-		</entry>
-													
-		<!-- End of user code  -->
-		
-			
-		<!-- blockdefinition.tool.association -->
-		<entry
-			defineOnly="true"
-			description="Create a Association"
-			id="blockdefinition.tool.association"
-			kind="tool"
-			label="Association"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.dependency -->
-		<entry
-			defineOnly="true"
-			description="Create a Dependency"
-			id="blockdefinition.tool.dependency"
-			kind="tool"
-			label="Dependency"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.generalization -->
-		<entry
-			defineOnly="true"
-			description="Create a Generalization"
-			id="blockdefinition.tool.generalization"
-			kind="tool"
-			label="Generalization"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.interfacerealization -->
-		<entry
-			defineOnly="true"
-			description="Create a InterfaceRealization"
-			id="blockdefinition.tool.interfacerealization"
-			kind="tool"
-			label="InterfaceRealization"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">
-		</entry>
-			
-		<!-- blockdefinition.tool.usage -->
-		<entry
-			defineOnly="true"
-			description="Create a Usage"
-			id="blockdefinition.tool.usage"
-			kind="tool"
-			label="Usage"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
-		</entry>
-		<!-- Start of user code Custom edge button entry  -->
-			
-		<!-- blockdefinition.tool.association -->
-		<entry
-			defineOnly="true"
-			description="Create an Association"
-			id="blockdefinition.tool.association_none"
-			kind="tool"
-			label="Association"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-		</entry>
-		
-		<!-- blockdefinition.tool.directedassociation -->
-		<entry
-			defineOnly="true"
-			description="Create a DirectedAssociation"
-			id="blockdefinition.tool.association_none_directed"
-			kind="tool"
-			label="DirectedAssociation"
-			large_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_none_directed.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_none_directed.gif">
-		</entry>
-		
-		<!-- blockdefinition.tool.composition -->
-		<entry
-			defineOnly="true"
-			description="Create a Composition"
-			id="blockdefinition.tool.association_composite"
-			kind="tool"
-			label="Composition"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_composite.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_composite.gif">
-		</entry>
-		
-		<!-- blockdefinition.tool.directedcomposition -->
-		<entry
-			defineOnly="true"
-			description="Create a DirectedComposition"
-			id="blockdefinition.tool.association_composite_directed"
-			kind="tool"
-			label="DirectedComposition"
-			large_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_composite_directed.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_composite_directed.gif">
-		</entry>
-		
-		<!-- blockdefinition.tool.aggregation -->
-		<entry
-			defineOnly="true"
-			description="Create an Aggregation"
-			id="blockdefinition.tool.association_shared"
-			kind="tool"
-			label="Aggregation"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_shared.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_shared.gif">
-		</entry>
-		
-		<!-- blockdefinition.tool.directedaggregation -->
-		<entry
-			defineOnly="true"
-			description="Create a DirectedAggregation"
-			id="blockdefinition.tool.association_shared_directed"
-			kind="tool"
-			label="DirectedAggregation"
-			large_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_shared_directed.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_shared_directed.gif">
-		</entry>
-				
-		<entry
-			defineOnly="true"
-			description="Create a Comment / Constraint link"
-			id="blockdefinition.tool.comment_constraint_link"
-			kind="tool"
-			label="Comment / Constraint link"
-			large_icon="icons/obj16/Link.gif"
-			small_icon="icons/obj16/Link.gif">
-		</entry>
-						
-		<!-- End of user code  -->
-			
-	</contribution>
-	
-	<!-- Specify diagram this palette tools relate to -->				
-	<editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
-	
-	</paletteProvider>	
-</extension>
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.BlockDefinitionDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="BlockDefinition"/>
-	</viewProvider>
-	
-	<!-- Custom graphical types view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomViewProvider">
-		<Priority name="Medium"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="SysML::ReferenceProperty, UML::EnumerationLiteral, SysML::ConstraintBlock, UML::Signal, UML::Operation, SysML::FlowProperty, UML::PrimitiveType, UML::Port, SysML::ConstraintProperty, SysML::ValueProperty, UML::Reception, UML::Interface, UML::Constraint, UML::DataType, SysML::Unit, UML::Enumeration, SysML::ValueType, UML::Actor, UML::Property, SysML::Dimension, SysML::FlowSpecification, SysML::PartProperty, SysML::Block, SysML::FlowPort"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="shape_sysml_block_as_classifier, shape_sysml_part_as_label, shape_uml_reception_as_label, shape_uml_port_as_label, shape_sysml_valuetype_as_classifier, shape_uml_enumerationliteral_as_label, shape_sysml_constraintproperty_as_label, shape_sysml_dimension_as_classifier, shape_sysml_flowspecification_as_classifier, shape_uml_operation_as_label, shape_sysml_reference_as_label, shape_sysml_unit_as_classifier, shape_sysml_flowport_as_affixed, shape_uml_port_as_affixed, shape_uml_property_as_label, shape_uml_signal_as_classifier, shape_uml_enumeration_as_classifier, shape_uml_primitivetype_as_classifier, shape_uml_datatype_as_classifier, shape_uml_interface_as_classifier, shape_sysml_flowproperty_as_label, shape_sysml_constraintblock_as_classifier, shape_sysml_value_as_label, shape_sysml_flowport_as_label, shape_uml_actor_as_classifier, shape_uml_constraint_as_label"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="SysML::AssociationNone, UML::Dependency, SysML::Association, UML::InterfaceRealization, UML::Generalization, SysML::AssociationSharedDirected, SysML::AssociationCompositeDirected, SysML::AssociationComposite, UML::Usage, SysML::AssociationNoneDirected, SysML::AssociationShared"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="link_uml_dependency, link_uml_usage, link_uml_interfacerealization, link_sysml_association, link_uml_generalization"/>
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Actor" -->
-		<object id="uml.Actor" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Actor"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Actor"/>			
-		
-		<!-- "uml.Class" -->
-		<object id="uml.Class" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Class"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Class"/>			
-		
-		<!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Constraint"/>			
-		
-		<!-- "uml.DataType" -->
-		<object id="uml.DataType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.DataType"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.DataType"/>			
-		
-		<!-- "uml.Enumeration" -->
-		<object id="uml.Enumeration" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Enumeration"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Enumeration"/>			
-		
-		<!-- "uml.EnumerationLiteral" -->
-		<object id="uml.EnumerationLiteral" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.EnumerationLiteral"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.EnumerationLiteral"/>			
-		
-		<!-- "uml.InstanceSpecification" -->
-		<object id="uml.InstanceSpecification" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.InstanceSpecification"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.InstanceSpecification"/>			
-		
-		<!-- "uml.Interface" -->
-		<object id="uml.Interface" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Interface"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Interface"/>			
-		
-		<!-- "uml.Operation" -->
-		<object id="uml.Operation" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Operation"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Operation"/>			
-		
-		<!-- "uml.Port" -->
-		<object id="uml.Port" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Port"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Port"/>			
-		
-		<!-- "uml.PrimitiveType" -->
-		<object id="uml.PrimitiveType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PrimitiveType"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.PrimitiveType"/>			
-		
-		<!-- "uml.Property" -->
-		<object id="uml.Property" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Property"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Property"/>			
-		
-		<!-- "uml.Reception" -->
-		<object id="uml.Reception" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Reception"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Reception"/>			
-		
-		<!-- "uml.Signal" -->
-		<object id="uml.Signal" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Signal"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Signal"/>			
-		
-		<!-- "uml.Association" -->
-		<object id="uml.Association" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Association"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Association"/>			
-		
-		<!-- "uml.Dependency" -->
-		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Dependency"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Dependency"/>			
-		
-		<!-- "uml.Generalization" -->
-		<object id="uml.Generalization" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Generalization"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Generalization"/>			
-		
-		<!-- "uml.InterfaceRealization" -->
-		<object id="uml.InterfaceRealization" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.InterfaceRealization"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.InterfaceRealization"/>			
-		
-		<!-- "uml.Usage" -->
-		<object id="uml.Usage" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Usage"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Usage"/>			
-		
-	</viewProvider>	
-
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.InheritedClassDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Model_Shape, Model_Shape_CN, Package_Shape, Package_Shape_CN, InstanceSpecification_Shape, InstanceSpecification_Shape_CN, Constraint_Shape, Constraint_Shape_CN, Comment_Shape, Comment_Shape_CN"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Slot_SlotLabel"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Model" -->
-		<object id="uml.Model" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Model"/>
-		</object>
-		
-		<!-- "uml.Package" -->
-		<object id="uml.Package" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Package"/>
-		</object>
-		
-		<!-- "uml.InstanceSpecification" -->
-		<object id="uml.InstanceSpecification" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.InstanceSpecification"/>
-		</object>
-		
-		<!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"/>
-		</object>
-		
-		<!-- "uml.Comment" -->
-		<object id="uml.Comment" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Comment"/>
-		</object>
-		
-		<!-- "uml.Slot" -->
-		<object id="uml.Slot" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Slot"/>
-		</object>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Model, uml.Package, uml.InstanceSpecification, uml.Constraint, uml.Comment, uml.Slot"/>
-			
-	</viewProvider>	
-</extension>
-
-<!-- Diagram edit part providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">	
-	<!-- Diagram edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.BlockDefinitionDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="BlockDefinition"/>
-		</object>
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.Diagram"/>	
-	</editpartProvider>
-	
-	<!-- Custom graphical types edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomEditPartProvider">
-		<Priority name="Medium"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomNodeGraphicalTypes">
-			<method name="getType()" value="shape_sysml_block_as_classifier, shape_sysml_part_as_label, shape_uml_reception_as_label, shape_uml_port_as_label, shape_sysml_valuetype_as_classifier, shape_uml_enumerationliteral_as_label, shape_sysml_constraintproperty_as_label, shape_sysml_dimension_as_classifier, shape_sysml_flowspecification_as_classifier, shape_uml_operation_as_label, shape_sysml_reference_as_label, shape_sysml_unit_as_classifier, shape_sysml_flowport_as_affixed, shape_uml_port_as_affixed, shape_uml_property_as_label, shape_uml_signal_as_classifier, shape_uml_enumeration_as_classifier, shape_uml_primitivetype_as_classifier, shape_uml_datatype_as_classifier, shape_uml_interface_as_classifier, shape_sysml_flowproperty_as_label, shape_sysml_constraintblock_as_classifier, shape_sysml_value_as_label, shape_sysml_flowport_as_label, shape_uml_actor_as_classifier, shape_uml_constraint_as_label"/>
-		</object>
-		
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomGraphicalTypes_Decorations">
-			<method name="getType()" value="linklabel_uml_association_target_role, compartment_sysml_value_as_list, label_sysml_block_name, compartment_sysml_flowproperty_as_list, affixedlabel_uml_port_label, affixedlabel_sysml_flowport_label, linklabel_uml_association_source_multiplicity, label_sysml_dimension_name, linklabel_uml_appliedstereotype, linklabel_uml_association_source_role, linklabel_uml_association_target_multiplicity, compartment_sysml_constraint_as_list, label_sysml_valuetype_name, compartment_sysml_flowport_as_list, linklabel_uml_namedelement_name, compartment_sysml_reference_as_list, label_sysml_flowspecification_name, compartment_uml_property_as_list, label_sysml_unit_name, affixedlabel_uml_namedelement_name, compartment_uml_port_as_list, label_sysml_constraintblock_name, compartment_sysml_parameter_as_list, compartment_sysml_property_as_list, compartment_uml_enumerationliteral_as_list, affixedlabel_uml_appliedstereotype, compartment_uml_operation_as_list, compartment_sysml_part_as_list, label_uml_namedelement_name"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomNodeGraphicalTypes"/>
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomGraphicalTypes_Decorations"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Edge(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomEdgeGraphicalTypes">
-			<method name="getType()" value="link_uml_dependency, link_uml_usage, link_uml_interfacerealization, link_sysml_association, link_uml_generalization"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomEdgeGraphicalTypes"/>
-		
-	</editpartProvider>
-	
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object
-			id="MODEL"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Model_Shape, Model_NameLabel, Model_PackagedElementCompartment"/>
-		</object>
-		<object
-			id="MODEL_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Model_Shape_CN, Model_NameLabel_CN, Model_PackagedElementCompartment_CN"/>
-		</object>
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
-		</object>
-		<object
-			id="INSTANCE_SPECIFICATION"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="InstanceSpecification_Shape, InstanceSpecification_NameLabel, InstanceSpecification_SlotCompartment"/>
-		</object>
-		<object
-			id="INSTANCE_SPECIFICATION_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="InstanceSpecification_Shape_CN, InstanceSpecification_NameLabel_CN, InstanceSpecification_SlotCompartment_CN"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
-		</object>
-		
-		<object
-			id="INSTANCE_SPECIFICATION_SLOT_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Slot_SlotLabel"/>
-		</object>
-		
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Comment_AnnotatedElementEdge"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Constraint_ConstrainedElementEdge"/>
-		</object>
-		
-		<context views="MODEL, MODEL_CN, PACKAGE, PACKAGE_CN, INSTANCE_SPECIFICATION, INSTANCE_SPECIFICATION_CN, CONSTRAINT, CONSTRAINT_CN, COMMENT, COMMENT_CN"/>
-		<context views="INSTANCE_SPECIFICATION_SLOT_CLN"/>
-		<context views="COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"/>
-		
-	</editpartProvider>
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomEditPolicyProvider">
-		<Priority name="Low"/>
-	</editpolicyProvider>
-</extension>
-
-<!-- Preference pages declaration -->
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-
-	<!-- Diagram Preference pages declaration -->
-	<page
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		name="BlockDefinition Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.BlockDefinitionDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ModelPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ModelPreferencePage"
-		name="Model">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InstanceSpecificationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InstanceSpecificationPreferencePage"
-		name="InstanceSpecification">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	
-	
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SlotPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SlotPreferencePage"
-		name="Slot">
-	</page>
-			
-
-
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ActorPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ActorPreferencePage"
-		name="Actor">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.BlockPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.BlockPreferencePage"
-		name="Block">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintBlockPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintBlockPreferencePage"
-		name="ConstraintBlock">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPropertyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPropertyPreferencePage"
-		name="ConstraintProperty">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DataTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DataTypePreferencePage"
-		name="DataType">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DimensionPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DimensionPreferencePage"
-		name="Dimension">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationPreferencePage"
-		name="Enumeration">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationLiteralPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationLiteralPreferencePage"
-		name="EnumerationLiteral">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortPreferencePage"
-		name="FlowPort">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPropertyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPropertyPreferencePage"
-		name="FlowProperty">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowSpecificationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowSpecificationPreferencePage"
-		name="FlowSpecification">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfacePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfacePreferencePage"
-		name="Interface">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.OperationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.OperationPreferencePage"
-		name="Operation">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PartPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PartPreferencePage"
-		name="Part">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortPreferencePage"
-		name="Port">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PrimitiveTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PrimitiveTypePreferencePage"
-		name="PrimitiveType">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReceptionPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReceptionPreferencePage"
-		name="Reception">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReferencePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReferencePreferencePage"
-		name="Reference">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SignalPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SignalPreferencePage"
-		name="Signal">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UnitPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UnitPreferencePage"
-		name="Unit">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValuePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValuePreferencePage"
-		name="Value">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValueTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValueTypePreferencePage"
-		name="ValueType">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.AssociationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.AssociationPreferencePage"
-		name="Association">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DependencyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DependencyPreferencePage"
-		name="Dependency">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.GeneralizationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.GeneralizationPreferencePage"
-		name="Generalization">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfaceRealizationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfaceRealizationPreferencePage"
-		name="InterfaceRealization">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UsagePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UsagePreferencePage"
-		name="Usage">
-	</page>
-		
-
-</extension>
-
-<!-- // Start of user code custom extensions 
-  -->
-
-<!-- Insert custom extensions here. -->
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
-	name="SysML Constraints (BDD)">		
-	<paletteDefinition ID="SYSML_Constraints_BlockDefinition"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="SYSML_Constraints_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/blockdefinition.palette.constraints.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-
-		<!-- Specify diagram this palette tools relate to -->				
-		<editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
-	</paletteDefinition>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
-	name="SysML DataTypes (BDD)">
-	<paletteDefinition ID="SYSML_DataTypes_BlockDefinition"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="SYSML_DataTypes_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/blockdefinition.palette.datatypes.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-
-		<!-- Specify diagram this palette tools relate to -->				
-		<editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
-	</paletteDefinition>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
-	name="SysML Port and flows (BDD)">	
-	<paletteDefinition ID="SYSML_PortAndFlows_BlockDefinition"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="SYSML_PortAndFlows_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/blockdefinition.palette.portandflows.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-
-		<!-- Specify diagram this palette tools relate to -->				
-		<editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
-	</paletteDefinition>	
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
-	name="SysML ModelElements (BDD)">
-	<paletteDefinition ID="SYSML_ModelElements_BlockDefinition"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="SYSML_ModelElements_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/blockdefinition.palette.modelelements.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-
-		<!-- Specify diagram this palette tools relate to -->				
-		<editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
-	</paletteDefinition>	
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
-	name="SysML Associations (BDD)">		
-	<paletteDefinition ID="SYSML_Associations_BlockDefinition"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="SYSML_Associations_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/blockdefinition.palette.associations.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-
-		<!-- Specify diagram this palette tools relate to -->				
-		<editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
-	</paletteDefinition>
-</extension>
-
-<!-- Parser provider declaration -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
-	<ParserProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ParserProvider">
-		<Priority name="Low"/>
-	</ParserProvider>
-</extension>
-  
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-      <MarkerNavigationProvider class="org.eclipse.papyrus.gmf.diagram.common.provider.MarkerNavigationProvider">
-         <MarkerType name="org.eclipse.papyrus.sysml.diagram.blockdefinition.diagnostic"/>
-         <Priority name="Lowest"/>
-      </MarkerNavigationProvider>
-   </extension>
-
-<extension id="diagnostic" name="Block Definition Diagram  problems" point="org.eclipse.core.resources.markers">
-      <super type="org.eclipse.core.resources.problemmarker"/>
-      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
-      <persistent value="true"/>
-</extension>
-
-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-	<decoratorProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ValidationDecoratorProvider">
-		<Priority name="Lowest"/>
-		<object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
-		<context decoratorTargets="PRIMARY_VIEW"/>
-	</decoratorProvider>
-</extension>
-
-<!-- The Command to manages the Provided and Required Interfaces for a Port-->
-<extension
-      point="org.eclipse.ui.commands">
-   <command
-         categoryId="org.eclipse.papyrus.editor.category"
-         description="Allows to manage easily provided Interfaces for a Port"
-         id="org.eclipse.papyrus.sysml.diagram.blockdefinition.command.manage.interfaces"
-         name="Manage Provided Interfaces">
-   </command>
-</extension>
-<!-- The Handler to manages the Provided and Required Interfaces for a Port-->
-<extension
-      point="org.eclipse.ui.handlers">
-   <handler
-         class="org.eclipse.papyrus.sysml.diagram.blockdefinition.handler.ManageProvidedInterfacesHandler"
-         commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.command.manage.interfaces">
-      <activeWhen>
-         <and>
-            <with
-                  variable="selection">
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart">
-                  </instanceof>
-               </iterate>
-            </with>
-            <with
-                  variable="activeEditor">
-               <test
-                     forcePluginActivation="true"
-                     property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType"
-                     value="BlockDefinition">
-               </test>
-            </with>
-         </and>
-      </activeWhen>
-   </handler>
-</extension>
-
-<!-- Add the Menu to manages the Provided and Required Interfaces for a Port-->
-<extension
-      point="org.eclipse.ui.menus">
-   <menuContribution
-         allPopups="false"
-         locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?endof=editMenu">
-      <command
-            commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.command.manage.interfaces"
-            icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-            id="org.eclipse.papyrus.sysml.diagram.blockdefinition.popup.manage.interface"
-            label="Manage Interfaces"
-            mnemonic="&amp;I"
-            style="push"
-            tooltip="The command to manage the interfaces provided and required by a Port">
-            <!-- The action is visible only if there is an active handler for it  -->
-         <visibleWhen
-               checkEnabled="true">
-         </visibleWhen>
-      </command>
-      </menuContribution>
-</extension>
-
-<!-- Diagram specific advices -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-
-	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
-
-	<!-- Delete moved views advice -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringMoveHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.DeleteViewDuringMoveHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Element">
-	</adviceBinding>
-		
-	</metamodel>
-</extension>
-	
-<!-- UML ElementType bindings to Papyrus shared IClientContext -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-
-	<!-- Bindings declaration to shared IClientContext -->
-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">	
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringMoveHelperAdvice"/>
-	</binding>
-		
-</extension>
-<!-- // End of user code 
-  -->
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.properties
deleted file mode 100644
index db5df7e1910..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.properties
+++ /dev/null
@@ -1,12 +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:
-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
-##################################################################################
-pluginName=SysML Block Definition Diagram
-providerName=Eclipse Modeling Project
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
deleted file mode 100644
index 83dab0d2c25..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ /dev/null
@@ -1,789 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-<!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-	<creationCommand
-       creationCommandClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramCreateCommand"
-       creationCondition="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramCondition"
-       icon="icons/obj16/Diagram_BlockDefinition.gif"
-       id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-		language="sysml"
-		label="Block Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramEditorFactory"
-		icon="icons/obj16/Diagram_BlockDefinition.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-		name="Create a new Block Definition Diagram"
-		description="Create a new Block Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramCreateCommand"
-		commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand">
-		<activeWhen>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor" />
-			</with>
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- Diagram creation command registration in menu and toolbar -->
-
-<!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.BlockDefinitionDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="BlockDefinition"/>
-	</viewProvider>
-	
-	<!-- Custom graphical types view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomViewProvider">
-		<Priority name="Medium"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="SysML::ActorPartProperty, SysML::ReferenceProperty, UML::EnumerationLiteral, SysML::ConstraintBlock, UML::Signal, UML::Operation, SysML::FlowProperty, UML::PrimitiveType, UML::Port, SysML::ConstraintProperty, SysML::ValueProperty, UML::Reception, UML::Interface, UML::Constraint, UML::DataType, SysML::Unit, UML::Enumeration, SysML::ValueType, UML::Actor, UML::Property, SysML::Dimension, SysML::FlowSpecification, SysML::PartProperty, SysML::Block, SysML::FlowPort"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="shape_sysml_block_as_classifier, shape_sysml_part_as_label, shape_uml_reception_as_label, shape_uml_port_as_label, shape_sysml_valuetype_as_classifier, shape_uml_enumerationliteral_as_label, shape_sysml_constraintproperty_as_label, shape_sysml_dimension_as_classifier, shape_sysml_flowspecification_as_classifier, shape_uml_operation_as_label, shape_sysml_reference_as_label, shape_sysml_unit_as_classifier, shape_sysml_flowport_as_affixed, shape_uml_port_as_affixed, shape_uml_property_as_label, shape_uml_signal_as_classifier, shape_uml_enumeration_as_classifier, shape_uml_primitivetype_as_classifier, shape_uml_datatype_as_classifier, shape_uml_interface_as_classifier, shape_sysml_flowproperty_as_label, shape_sysml_constraintblock_as_classifier, shape_sysml_value_as_label, shape_sysml_flowport_as_label, shape_uml_actor_as_classifier, shape_uml_constraint_as_label"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="SysML::AssociationNone, UML::Dependency, SysML::Association, UML::InterfaceRealization, UML::Generalization, SysML::AssociationSharedDirected, SysML::AssociationCompositeDirected, SysML::AssociationComposite, UML::Usage, SysML::AssociationNoneDirected, SysML::AssociationShared"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="link_uml_dependency, link_uml_usage, link_uml_interfacerealization, link_sysml_association, link_uml_generalization"/>
-		
-		<object id="elementtype.node"
-        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-       
-     <method
-           name="getSemanticHint()"
-           value="SysML::ActorPartProperty, SysML::ReferenceProperty, UML::EnumerationLiteral, SysML::ConstraintBlock, UML::Signal, UML::Operation, SysML::FlowProperty, UML::PrimitiveType, UML::Port, SysML::ConstraintProperty, SysML::ValueProperty, UML::Reception, UML::Interface, UML::Constraint, UML::DataType, SysML::Unit, UML::Enumeration, SysML::ValueType, UML::Actor, UML::Property, SysML::Dimension, SysML::FlowSpecification, SysML::PartProperty, SysML::Block, SysML::FlowPort">
-     </method>
-  </object>
-  <context
-        elements="elementtype.node"
-        viewClass="org.eclipse.gmf.runtime.notation.Node">
-  </context>
-  <object id="elementtype.edge"
-        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-     <method
-           name="getSemanticHint()"
-           value="SysML::AssociationNone, UML::Dependency, SysML::Association, UML::InterfaceRealization, UML::Generalization, SysML::AssociationSharedDirected, SysML::AssociationCompositeDirected, SysML::AssociationComposite, UML::Usage, SysML::AssociationNoneDirected, SysML::AssociationShared">
-     </method>
-  </object>
-  <context
-        elements="elementtype.edge"
-        viewClass="org.eclipse.gmf.runtime.notation.Edge">
-  </context>			
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Actor" -->
-		<object id="uml.Actor" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Actor"/>
-		</object>
-		<context
-        elements="uml.Actor"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Class" -->
-		<object id="uml.Class" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Class"/>
-		</object>
-		<context
-        elements="uml.Class"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"/>
-		</object>
-		<context
-        elements="uml.Constraint"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.DataType" -->
-		<object id="uml.DataType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.DataType"/>
-		</object>
-		<context
-        elements="uml.DataType"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Enumeration" -->
-		<object id="uml.Enumeration" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Enumeration"/>
-		</object>
-		<context
-        elements="uml.Enumeration"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.EnumerationLiteral" -->
-		<object id="uml.EnumerationLiteral" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.EnumerationLiteral"/>
-		</object>
-		<context
-        elements="uml.EnumerationLiteral"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.InstanceSpecification" -->
-		<object id="uml.InstanceSpecification" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.InstanceSpecification"/>
-		</object>
-		<context
-        elements="uml.InstanceSpecification"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Interface" -->
-		<object id="uml.Interface" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Interface"/>
-		</object>
-		<context
-        elements="uml.Interface"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Operation" -->
-		<object id="uml.Operation" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Operation"/>
-		</object>
-		<context
-        elements="uml.Operation"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Port" -->
-		<object id="uml.Port" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Port"/>
-		</object>
-		<context
-        elements="uml.Port"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.PrimitiveType" -->
-		<object id="uml.PrimitiveType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PrimitiveType"/>
-		</object>
-		<context
-        elements="uml.PrimitiveType"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Property" -->
-		<object id="uml.Property" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Property"/>
-		</object>
-		<context
-        elements="uml.Property"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Reception" -->
-		<object id="uml.Reception" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Reception"/>
-		</object>
-		<context
-        elements="uml.Reception"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Signal" -->
-		<object id="uml.Signal" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Signal"/>
-		</object>
-		<context
-        elements="uml.Signal"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"/>			
-		
-		<!-- "uml.Association" -->
-		<object id="uml.Association" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Association"/>
-		</object>
-		<context
-        elements="uml.Association"
-        viewClass="org.eclipse.gmf.runtime.notation.Edge"/>			
-		
-		<!-- "uml.Dependency" -->
-		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Dependency"/>
-		</object>
-		<context
-        elements="uml.Dependency"
-        viewClass="org.eclipse.gmf.runtime.notation.Edge"/>			
-		
-		<!-- "uml.Generalization" -->
-		<object id="uml.Generalization" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Generalization"/>
-		</object>
-		<context
-        elements="uml.Generalization"
-        viewClass="org.eclipse.gmf.runtime.notation.Edge"/>			
-		
-		<!-- "uml.InterfaceRealization" -->
-		<object id="uml.InterfaceRealization" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.InterfaceRealization"/>
-		</object>
-		<context
-        elements="uml.InterfaceRealization"
-        viewClass="org.eclipse.gmf.runtime.notation.Edge"/>			
-		
-		<!-- "uml.Usage" -->
-		<object id="uml.Usage" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Usage"/>
-		</object>
-		<context
-        elements="uml.Usage"
-        viewClass="org.eclipse.gmf.runtime.notation.Edge"/>			
-		
-	</viewProvider>	
-
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.InheritedClassDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- Load the ViewProvider on following SemanticHint related to IElementType(s) used in the palette (also used for legacy elements) -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Model, UML::Package, UML::InstanceSpecification, UML::Comment, UML::Constraint, UML::Slot"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Model_Shape, Model_Shape_CN, Package_Shape, Package_Shape_CN, InstanceSpecification_Shape, InstanceSpecification_Shape_CN, Constraint_Shape, Constraint_Shape_CN, Comment_Shape, Comment_Shape_CN"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Slot_SlotLabel"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Model" -->
-		<object id="uml.Model" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Model"/>
-		</object>
-		
-		<!-- "uml.Package" -->
-		<object id="uml.Package" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Package"/>
-		</object>
-		
-		<!-- "uml.InstanceSpecification" -->
-		<object id="uml.InstanceSpecification" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.InstanceSpecification"/>
-		</object>
-		
-		<!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"/>
-		</object>
-		
-		<!-- "uml.Comment" -->
-		<object id="uml.Comment" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Comment"/>
-		</object>
-		
-		<!-- "uml.Slot" -->
-		<object id="uml.Slot" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Slot"/>
-		</object>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Model, uml.Package, uml.InstanceSpecification, uml.Constraint, uml.Comment, uml.Slot"/>
-			
-	</viewProvider>	
-</extension>
-
-<!-- Diagram edit part providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">	
-	<!-- Diagram edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.BlockDefinitionDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="BlockDefinition"/>
-		</object>
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.Diagram"/>	
-	</editpartProvider>
-	
-	<!-- Custom graphical types edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomEditPartProvider">
-		<Priority name="Medium"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomNodeGraphicalTypes">
-			<method name="getType()" value="shape_sysml_block_as_classifier, shape_sysml_part_as_label, shape_uml_reception_as_label, shape_uml_port_as_label, shape_sysml_valuetype_as_classifier, shape_uml_enumerationliteral_as_label, shape_sysml_constraintproperty_as_label, shape_sysml_dimension_as_classifier, shape_sysml_flowspecification_as_classifier, shape_uml_operation_as_label, shape_sysml_reference_as_label, shape_sysml_unit_as_classifier, shape_sysml_flowport_as_affixed, shape_uml_port_as_affixed, shape_uml_property_as_label, shape_uml_signal_as_classifier, shape_uml_enumeration_as_classifier, shape_uml_primitivetype_as_classifier, shape_uml_datatype_as_classifier, shape_uml_interface_as_classifier, shape_sysml_flowproperty_as_label, shape_sysml_constraintblock_as_classifier, shape_sysml_value_as_label, shape_sysml_flowport_as_label, shape_uml_actor_as_classifier, shape_uml_constraint_as_label"/>
-		</object>
-		
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomGraphicalTypes_Decorations">
-			<method name="getType()" value="linklabel_uml_association_target_role, compartment_sysml_value_as_list, label_sysml_block_name, compartment_sysml_flowproperty_as_list, affixedlabel_uml_port_label, affixedlabel_sysml_flowport_label, linklabel_uml_association_source_multiplicity, label_sysml_dimension_name, linklabel_uml_appliedstereotype, linklabel_uml_association_source_role, linklabel_uml_association_target_multiplicity, compartment_sysml_constraint_as_list, label_sysml_valuetype_name, compartment_sysml_flowport_as_list, linklabel_uml_namedelement_name, compartment_sysml_reference_as_list, label_sysml_flowspecification_name, compartment_uml_property_as_list, label_sysml_unit_name, affixedlabel_uml_namedelement_name, compartment_uml_port_as_list, label_sysml_constraintblock_name, compartment_sysml_parameter_as_list, compartment_sysml_property_as_list, compartment_uml_enumerationliteral_as_list, affixedlabel_uml_appliedstereotype, compartment_uml_operation_as_list, compartment_sysml_part_as_list, label_uml_namedelement_name"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomNodeGraphicalTypes"/>
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomGraphicalTypes_Decorations"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Edge(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomEdgeGraphicalTypes">
-			<method name="getType()" value="link_uml_dependency, link_uml_usage, link_uml_interfacerealization, link_sysml_association, link_uml_generalization"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.blockdefinition.CustomEdgeGraphicalTypes"/>
-		
-	</editpartProvider>
-	
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object
-			id="MODEL"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Model_Shape, Model_NameLabel, Model_PackagedElementCompartment"/>
-		</object>
-		<object
-			id="MODEL_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Model_Shape_CN, Model_NameLabel_CN, Model_PackagedElementCompartment_CN"/>
-		</object>
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
-		</object>
-		<object
-			id="INSTANCE_SPECIFICATION"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="InstanceSpecification_Shape, InstanceSpecification_NameLabel, InstanceSpecification_SlotCompartment"/>
-		</object>
-		<object
-			id="INSTANCE_SPECIFICATION_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="InstanceSpecification_Shape_CN, InstanceSpecification_NameLabel_CN, InstanceSpecification_SlotCompartment_CN"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
-		</object>
-		
-		<object
-			id="INSTANCE_SPECIFICATION_SLOT_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Slot_SlotLabel"/>
-		</object>
-		
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Comment_AnnotatedElementEdge"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Constraint_ConstrainedElementEdge"/>
-		</object>
-		
-		<context views="MODEL, MODEL_CN, PACKAGE, PACKAGE_CN, INSTANCE_SPECIFICATION, INSTANCE_SPECIFICATION_CN, CONSTRAINT, CONSTRAINT_CN, COMMENT, COMMENT_CN"/>
-		<context views="INSTANCE_SPECIFICATION_SLOT_CLN"/>
-		<context views="COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"/>
-		
-	</editpartProvider>
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomEditPolicyProvider">
-		<Priority name="Low"/>
-	</editpolicyProvider>
-</extension>
-
-<!-- Preference pages declaration -->
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-
-	<!-- Diagram Preference pages declaration -->
-	<page
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		name="BlockDefinition Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.BlockDefinitionDiagramGeneralPreferencePage">
-	</page>
-
-</extension>
-
-<!-- Parser provider declaration -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
-	<ParserProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ParserProvider">
-		<Priority name="Low"/>
-	</ParserProvider>
-</extension>
-
-<!-- Validation markers declaration -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-	<MarkerNavigationProvider class="org.eclipse.papyrus.gmf.diagram.common.provider.MarkerNavigationProvider">
-		<MarkerType name="org.eclipse.papyrus.sysml.diagram.blockdefinition.diagnostic"/>
-		<Priority name="Lowest"/>
-	</MarkerNavigationProvider>
-</extension>
-
-<extension id="diagnostic" name="Block Definition Diagram problems" point="org.eclipse.core.resources.markers">
-	<super type="org.eclipse.core.resources.problemmarker"/>
-	<super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
-	<persistent value="true"/>
-</extension>
-
-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-	<decoratorProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ValidationDecoratorProvider">
-		<Priority name="Lowest"/>
-		<object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
-		<context decoratorTargets="PRIMARY_VIEW"/>
-	</decoratorProvider>
-</extension>
-
-<!-- The Command to manages the Provided and Required Interfaces for a Port-->
-<extension
-      point="org.eclipse.ui.commands">
-   <command
-         categoryId="org.eclipse.papyrus.editor.category"
-         description="Allows to manage easily provided Interfaces for a Port"
-         id="org.eclipse.papyrus.sysml.diagram.blockdefinition.command.manage.interfaces"
-         name="Manage Provided Interfaces">
-   </command>
-</extension>
-<!-- The Handler to manages the Provided and Required Interfaces for a Port-->
-<extension
-      point="org.eclipse.ui.handlers">
-	<handler
-         class="org.eclipse.papyrus.sysml.diagram.blockdefinition.handler.BlockDefinitionManageInterfacesHandler"
-         commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.command.manage.interfaces">
-	<activeWhen>
-         <and>
-         <or>
-			<with variable="selection">
-				<iterate>
-				<instanceof value="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart"/>
-				</iterate>
-			</with>
-			<with variable="selection">
-				<iterate>
-				<instanceof value="org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart"/>
-				</iterate>
-            </with>
-		</or>
-		<with variable="activeEditor">
-			<test property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType" value="BlockDefinition" forcePluginActivation="true"/>
-		</with>
-		</and>
-	</activeWhen>
-	</handler>
-</extension>
-
-<!-- Add the Menu to manages the Provided and Required Interfaces for a Port-->
-<extension
-      point="org.eclipse.ui.menus">
-   <menuContribution
-         allPopups="false"
-         locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?endof=editMenu">
-      <command
-            commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.command.manage.interfaces"
-            icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-            id="org.eclipse.papyrus.sysml.diagram.blockdefinition.popup.manage.interface"
-            label="Manage Interfaces"
-            mnemonic="&amp;I"
-            style="push"
-            tooltip="The command to manage the interfaces provided and required by a Port">
-            <!-- The action is visible only if there is an active handler for it  -->
-         <visibleWhen
-               checkEnabled="true">
-         </visibleWhen>
-      </command>
-      </menuContribution>
-</extension>
-
-<!-- Diagram specific advices -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-
-	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-
-	<!-- Delete moved views advice -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringMoveHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.DeleteViewDuringMoveHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Element">
-	</adviceBinding>
-
-	<!-- Generalization specific advices (remove inconsistent views when a Generalization is deleted) -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.GeneralizationHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.GeneralizationHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Generalization">
-	</adviceBinding>
-
-	<!-- Part specific advices (remove inconsistent views when a Part aggregation kind changes) -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringPartEditHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.DeleteViewDuringPartEditHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.sysml.PartProperty">
-	</adviceBinding>
-
-	<!-- Reference specific advices (remove inconsistent views when a reference aggregation kind changes) -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringReferenceEditHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.DeleteViewDuringReferenceEditHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.sysml.ReferenceProperty">
-	</adviceBinding>
-	
-	<!-- Value specific advices (remove inconsistent views when a value aggregation or type changes) -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringValueEditHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.DeleteViewDuringValueEditHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.sysml.ValueProperty">
-	</adviceBinding>
-	
-	<!-- Block specific advices (remove inconsistent Part or Ref views when a Block is deleted) 
-	
-		Not used (the property itself is supposed to be deleted during Block delete, no need to create a specific view deletion.
-		 		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringBlockDeleteHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.DeleteViewDuringBlockDeleteHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.sysml.Block">
-	</adviceBinding>
-	
-	  -->
-		
-	<!-- DataType specific advices (remove inconsistent Value views when a DataType is deleted) -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringDataTypeDeleteHelperAdvice"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice.DeleteViewDuringDataTypeDeleteHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.sysml.DataType">
-	</adviceBinding>
-	
-	</metamodel>
-</extension>
-	
-<!-- UML ElementType bindings to Papyrus shared IClientContext -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-
-	<!-- Bindings declaration to shared IClientContext -->
-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.blockdefinition.GeneralizationHelperAdvice"/>	
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringMoveHelperAdvice"/>
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringPartEditHelperAdvice"/>
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringReferenceEditHelperAdvice"/>		
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringValueEditHelperAdvice"/>
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.blockdefinition.DeleteViewDuringDataTypeDeleteHelperAdvice"/>
-	</binding>
-		
-</extension>
-<!-- // End of user code 
-  -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
-       <diagramMappings diagramID="BlockDefinition">
-              <mapping type="BlockDefinition" humanReadableType="BlockDefinitionDiagram"/>
-              <!-- Compartments -->
-              <mapping
-                     humanReadableType="literals"
-                     type="compartment_uml_enumerationliteral_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="operations"
-                     type="compartment_uml_operation_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="standard ports"
-                     type="compartment_uml_port_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="properties"
-                     type="compartment_uml_property_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="constraints"
-                     type="compartment_sysml_constraint_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="flow ports"
-                     type="compartment_sysml_flowport_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="flow properties"
-                     type="compartment_sysml_flowproperty_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="parameters"
-                     type="compartment_sysml_parameter_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="parts"
-                     type="compartment_sysml_part_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="references"
-                     type="compartment_sysml_reference_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="values"
-                     type="compartment_sysml_value_as_list">
-              </mapping>
-              
-              <mapping
-                     humanReadableType="properties"
-                     type="compartment_sysml_property_as_list">
-              </mapping>
-   
-                      <!-- Link labels -->
-
-              <mapping
-                     humanReadableType="Name"
-                         type="affixedlabel_uml_namedelement_name">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="Name"
-                         type="affixedlabel_uml_appliedstereotype">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="Label"
-                         type="affixedlabel_uml_port_label">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="Label"
-                         type="affixedlabel_sysml_flowport_label">
-                  </mapping>
-   
-                  <mapping
-                         humanReadableType="Stereotype"
-                         type="linklabel_uml_appliedstereotype">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="Name"
-                         type="linklabel_uml_namedelement_name">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="SourceMultiplicity"
-                         type="linklabel_uml_association_source_multiplicity">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="SourceRole"
-                         type="linklabel_uml_association_source_role">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="TargetMultiplicity"
-                         type="linklabel_uml_association_target_multiplicity">
-                  </mapping>
-                  
-                  <mapping
-                         humanReadableType="TargetRole"
-                         type="linklabel_uml_association_target_role">
-                  </mapping>
-                  <mapping
-                        humanReadableType="slots"
-                        type="InstanceSpecification_SlotCompartment">
-                  </mapping>
-                  <mapping
-                        humanReadableType="slots"
-                        type="InstanceSpecification_SlotCompartment_CN">
-                  </mapping>
-			
-			<mapping
-				humanReadableType="packagedElements"
-				type="Model_PackagedElementCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="packagedElements"
-				type="Package_PackagedElementCompartment_CN">
-			</mapping>
-			
-			<mapping
-				humanReadableType="packagedElements"
-				type="Model_PackagedElementCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="packagedElements"
-				type="Package_PackagedElementCompartment">
-			</mapping>
-   
-          </diagramMappings>
-   </extension>
-<extension
-      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
-   <diagramReconciler
-         diagramType="BlockDefinition"
-         reconcilerClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.migration.BDDReconciler"
-         source="0.9.1"
-         target="1.3.0">
-   </diagramReconciler>      
-   <diagramReconciler
-         diagramType="BlockDefinition"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_1_0"
-         source="1.0.0" 
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="BlockDefinition"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="BlockDefinition"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-</extension>
-
-   <extension
-         point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
-      <visualTypeProvider
-            class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.BlockDefinitionVisualTypeProvider"
-            diagramType="BlockDefinition">
-      </visualTypeProvider>
-   </extension>
-   
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<paletteDefinition
-		ID="org.eclipse.papyrus.sysml.diagram.blockdefinition.paletteconfiguration"
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="Papyrus SysML blockdefinition editor Plugin Palette" 
-		path="palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram this palette tools relate to -->
-		<editor
-			id="org.eclipse.papyrus.sysml.diagram.blockdefinition">
-		</editor>
-	</paletteDefinition>
-</extension>
-</plugin>
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
deleted file mode 100644
index ab379003e51..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-	    <artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.sysml.diagram.blockdefinition</artifactId>

-	<version>3.0.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.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/Activator.java
deleted file mode 100644
index 9e1a76e4df9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/Activator.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.CustomPreferenceInitializer;
-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.sysml.diagram.blockdefinition";
-
-	/** The plug-in shared instance */
-	private static Activator plugin;
-
-	/** The logging helper */
-	public static LogHelper log;
-
-	/** The plug-in Preference store */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(PLUGIN_ID);
-
-	/** Default constructor */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the login helper
-		log = new LogHelper(plugin);
-
-		// register the preference store
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-
-		// Preferences initialization
-		CustomPreferenceInitializer diagramPreferenceInitializer = new CustomPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (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 getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 *
-	 * @return Shared Preference Store.
-	 */
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
deleted file mode 100644
index 29cf52a03c5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 		CEA LIST - Initial API and implementation
- * 		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-/**
- * Represents the creation command for a SysML block definition diagram
- *
- * @author Laurent Wouters
- */
-public class BlockDefinitionDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDefaultDiagramName() {
-		return "New Block Definition Diagram"; // //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return ElementTypes.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
deleted file mode 100644
index 4edfa8365b5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-public class BlockDefinitionDiagramEditorFactory extends GmfEditorFactory {
-
-	public BlockDefinitionDiagramEditorFactory() {
-		super(BlockDefinitionDiagramForMultiEditor.class, ElementTypes.DIAGRAM_ID);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramForMultiEditor.java
deleted file mode 100644
index a5c21be0d38..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramForMultiEditor.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *	 CEA LIST - Initial API and implementation
- *   Christian W. Damus (CEA) - bug 392301
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.part.BlockDefinitionDiagramEditor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-
-/**
- * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- *
- */
-public class BlockDefinitionDiagramForMultiEditor extends BlockDefinitionDiagramEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/Diagram_BlockDefinition.gif";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(BlockDefinitionDiagramForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	private Image titleImage;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 *
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 *
-	 */
-	public BlockDefinitionDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
-		super(servicesRegistry, diagram);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		setPartName(LabelInternationalization.getInstance().getDiagramLabel(getDiagram()));
-		titleImage = DIAG_IMG_DESC.createImage();
-		setTitleImage(titleImage);
-	}
-
-	@Override
-	public void dispose() {
-		if (titleImage != null) {
-			titleImage.dispose();
-			titleImage = null;
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setInput(IEditorInput input) {
-		try {
-			// Provide an URI with fragment in order to reuse the same Resource
-			// and set the diagram to the fragment.
-			URIEditorInput uriInput = new URIEditorInput(EcoreUtil.getURI(getDiagram()));
-			doSetInput(uriInput, true);
-		} catch (CoreException x) {
-			String title = "Problem opening";
-			String msg = "Cannot open input element:";
-			Shell shell = getSite().getShell();
-			ErrorDialog.openError(shell, title, msg, x.getStatus());
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createGraphicalViewer(Composite parent) {
-		splitter = parent;
-		super.createGraphicalViewer(parent);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setFocus() {
-		splitter.setFocus();
-		super.setFocus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditingDomainID() {
-		return "org.eclipse.papyrus.sysml.diagram.blockdefinition.EditingDomain";
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
deleted file mode 100644
index b86c2799137..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part;
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultContainerNodeEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.DiagramSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.PackageCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.ShowHideRelatedLinkEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-/**
- *
- * @Generated NOT //change the super class
- */
-public class BlockDefinitionDiagramEditPart extends PapyrusDiagramEditPart {
-
-	public BlockDefinitionDiagramEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultContainerNodeEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
-		installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, new ShowHideRelatedLinkEditPolicy(this));
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/BlockDefinitionDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/BlockDefinitionDiagramDragDropEditPolicy.java
deleted file mode 100644
index a80b81cc433..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/BlockDefinitionDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.GraphicalTypeRegistry;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
-
-/**
- * Customization of the DND edit policy for the BlockDefinition Diagram
- *
- * @deprecated prefer using {@link CustomDiagramDragDropEditPolicy}.
- */
-@Deprecated
-public class BlockDefinitionDiagramDragDropEditPolicy extends ClassDiagramDragDropEditPolicy {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeVisualID(View containerView, EObject domainElement) {
-		String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLinkWithClassVisualID(EObject domainElement) {
-		String domainType = registry.getEdgeGraphicalType(domainElement);
-		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/DiagramSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/DiagramSemanticEditPolicy.java
deleted file mode 100644
index fba7eaa018d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/DiagramSemanticEditPolicy.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;
-
-public class DiagramSemanticEditPolicy extends PackageSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRelationshipSourceCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRelationshipTargetCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRefRelationshipSourceCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRefRelationshipTargetCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		Diagram currentDiagram = null;
-		if (getHost() instanceof IGraphicalEditPart) {
-			currentDiagram = ((IGraphicalEditPart) getHost()).getNotationView().getDiagram();
-		}
-		return getGEFWrapper(new DuplicateAnythingCommand(editingDomain, req, currentDiagram));
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class DuplicateAnythingCommand extends DuplicateNamedElementCommand {
-
-		/**
-		 * @generated
-		 */
-		private Diagram diagram;
-
-		/**
-		 * @generated
-		 */
-		public DuplicateAnythingCommand(TransactionalEditingDomain editingDomain, DuplicateElementsRequest req, Diagram currentDiagram) {
-			super(editingDomain, req.getLabel(), req.getElementsToBeDuplicated(), req.getAllDuplicatedElementsMap(), currentDiagram);
-			this.diagram = currentDiagram;
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/BlockDefinitionDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/BlockDefinitionDiagramViewFactory.java
deleted file mode 100644
index 3f7bc5bb9f8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/BlockDefinitionDiagramViewFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class BlockDefinitionDiagramViewFactory extends DiagramViewFactory {
-
-	@Override
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
deleted file mode 100644
index 991c6ceeabe..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.factory;
-
-import java.util.Arrays;
-import java.util.HashMap;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-@SuppressWarnings("serial")
-public class DiagramPaletteFactory extends PaletteFactory.Adapter {
-
-	private static HashMap<String, IElementType[]> nodesToolIdTypesMap = new HashMap<String, IElementType[]>() {
-
-		{
-			put("blockdefinition.tool.actor", new IElementType[] { UMLElementTypes.ACTOR });
-			put("blockdefinition.tool.block", new IElementType[] { SysMLElementTypes.BLOCK });
-			put("blockdefinition.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
-			put("blockdefinition.tool.constraintblock", new IElementType[] { SysMLElementTypes.CONSTRAINT_BLOCK });
-			put("blockdefinition.tool.constraintproperty", new IElementType[] { SysMLElementTypes.CONSTRAINT_PROPERTY });
-			put("blockdefinition.tool.datatype", new IElementType[] { UMLElementTypes.DATA_TYPE });
-			put("blockdefinition.tool.dimension", new IElementType[] { SysMLElementTypes.DIMENSION });
-			put("blockdefinition.tool.enumeration", new IElementType[] { UMLElementTypes.ENUMERATION });
-			put("blockdefinition.tool.enumerationliteral", new IElementType[] { UMLElementTypes.ENUMERATION_LITERAL });
-			put("blockdefinition.tool.flowport", new IElementType[] { SysMLElementTypes.FLOW_PORT });
-			put("blockdefinition.tool.flowproperty", new IElementType[] { SysMLElementTypes.FLOW_PROPERTY });
-			put("blockdefinition.tool.flowspecification", new IElementType[] { SysMLElementTypes.FLOW_SPECIFICATION });
-			put("blockdefinition.tool.interface", new IElementType[] { UMLElementTypes.INTERFACE });
-			put("blockdefinition.tool.operation", new IElementType[] { UMLElementTypes.OPERATION });
-			put("blockdefinition.tool.part", new IElementType[] { SysMLElementTypes.PART_PROPERTY });
-			put("blockdefinition.tool.port", new IElementType[] { UMLElementTypes.PORT });
-			put("blockdefinition.tool.primitivetype", new IElementType[] { UMLElementTypes.PRIMITIVE_TYPE });
-			put("blockdefinition.tool.property", new IElementType[] { UMLElementTypes.PROPERTY });
-			put("blockdefinition.tool.reception", new IElementType[] { UMLElementTypes.RECEPTION });
-			put("blockdefinition.tool.reference", new IElementType[] { SysMLElementTypes.REFERENCE_PROPERTY });
-			put("blockdefinition.tool.signal", new IElementType[] { UMLElementTypes.SIGNAL });
-			put("blockdefinition.tool.unit", new IElementType[] { SysMLElementTypes.UNIT });
-			put("blockdefinition.tool.value", new IElementType[] { SysMLElementTypes.VALUE_PROPERTY });
-			put("blockdefinition.tool.valuetype", new IElementType[] { SysMLElementTypes.VALUE_TYPE });
-			// Start of user code Custom nodes
-
-			// Constraint button replacement
-			remove("blockdefinition.tool.constraint");
-			put("blockdefinition.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
-
-			put("blockdefinition.tool.model", new IElementType[] { UMLElementTypes.MODEL });
-			put("blockdefinition.tool.package", new IElementType[] { UMLElementTypes.PACKAGE });
-			put("blockdefinition.tool.instancespecification", new IElementType[] { UMLElementTypes.INSTANCE_SPECIFICATION });
-			put("blockdefinition.tool.slot", new IElementType[] { UMLElementTypes.SLOT });
-			put("blockdefinition.tool.comment", new IElementType[] { UMLElementTypes.COMMENT });
-
-			put("blockdefinition.tool.actorpart", new IElementType[] { SysMLElementTypes.ACTOR_PART_PROPERTY });
-
-			// End of user code
-		}
-	};
-
-	private static HashMap<String, IElementType[]> edgesToolIdTypesMap = new HashMap<String, IElementType[]>() {
-
-		{
-			put("blockdefinition.tool.association", new IElementType[] { SysMLElementTypes.ASSOCIATION });
-			put("blockdefinition.tool.dependency", new IElementType[] { UMLElementTypes.DEPENDENCY });
-			put("blockdefinition.tool.generalization", new IElementType[] { UMLElementTypes.GENERALIZATION });
-			put("blockdefinition.tool.interfacerealization", new IElementType[] { UMLElementTypes.INTERFACE_REALIZATION });
-			put("blockdefinition.tool.usage", new IElementType[] { UMLElementTypes.USAGE });
-			// Start of user code Custom edges
-			put("blockdefinition.tool.association_none", new IElementType[] { SysMLElementTypes.ASSOCIATION_NONE });
-			put("blockdefinition.tool.association_none_directed", new IElementType[] { SysMLElementTypes.ASSOCIATION_NONE_DIRECTED });
-			put("blockdefinition.tool.association_composite", new IElementType[] { SysMLElementTypes.ASSOCIATION_COMPOSITE });
-			put("blockdefinition.tool.association_composite_directed", new IElementType[] { SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED });
-			put("blockdefinition.tool.association_shared", new IElementType[] { SysMLElementTypes.ASSOCIATION_SHARED });
-			put("blockdefinition.tool.association_shared_directed", new IElementType[] { SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED });
-
-			put("blockdefinition.tool.comment_constraint_link", new IElementType[] { ElementTypes.COMMENT_ANNOTATED_ELEMENT, ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT });
-
-			put("blockdefinition.tool.instance_specification_link", new IElementType[] { ElementTypes.INSTANCE_SPECIFICATION_LINK });
-
-			// End of user code
-		}
-	};
-
-	@Override
-	public Tool createTool(String toolId) {
-
-		IElementType[] types;
-
-		types = nodesToolIdTypesMap.get(toolId);
-		if (types != null) {
-			return new AspectUnspecifiedTypeCreationTool(Arrays.asList(types));
-		}
-
-		types = edgesToolIdTypesMap.get(toolId);
-		if (types != null) {
-			return new AspectUnspecifiedTypeConnectionTool(Arrays.asList(types));
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
deleted file mode 100644
index 1df0636b286..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.part;
-
-import java.util.EventObject;
-import java.util.Set;
-
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
-import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.commands.util.OperationHistoryDirtyState;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteViewer;
-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.utils.FixPortsLocationOnOpening;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.ShowInContext;
-
-/**
- * @generated
- */
-public class BlockDefinitionDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.sysml.diagram.blockdefinition.part.BlockDefinitionDiagramEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-
-	/**
-	 * @generated
-	 */
-	private OperationHistoryDirtyState dirtyState;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public BlockDefinitionDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, diagram);
-
-		// Fix Port locations (implementations before 0.8.1 were erroneous see https://bugs.eclipse.org/bugs/show_bug.cgi?id=354815)
-		(new FixPortsLocationOnOpening()).fix(diagram);
-
-		// adds a listener to the palette service, which reacts to palette customizations
-		PapyrusPaletteService.getInstance().addProviderChangeListener(this);
-
-		// Share the same editing provider
-		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);
-		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);
-
-		// overrides editing domain created by super constructor
-		setDocumentProvider(documentProvider);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
-		PaletteRoot paletteRoot;
-		if (existingPaletteRoot == null) {
-			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
-		} else {
-			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
-			paletteRoot = existingPaletteRoot;
-		}
-		applyCustomizationsToPalette(paletteRoot);
-		return paletteRoot;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-
-		// Replace diagram contextual menu removing default
-		// delete from model action.
-		DiagramContextMenuProvider provider = (DiagramContextMenuProvider) getDiagramGraphicalViewer().getContextMenu();
-		Set<String> menuExclusions = provider.getExclusionSet();
-		menuExclusions.add(ActionIds.ACTION_DELETE_FROM_MODEL);
-		provider.setExclusionSet(menuExclusions);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		getDirtyState().saved();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected OperationHistoryDirtyState getDirtyState() {
-		if (dirtyState == null) {
-			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());
-		}
-		return dirtyState;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setUndoContext(IUndoContext context) {
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-
-		super.setUndoContext(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return getDirtyState().isDirty();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void providerChanged(ProviderChangeEvent event) {
-		// update the palette if the palette service has changed
-		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {
-			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteViewerProvider createPaletteViewerProvider() {
-		getEditDomain().setPaletteRoot(createPaletteRoot(null));
-		return new PaletteViewerProvider(getEditDomain()) {
-
-			/**
-			 * Override to provide the additional behavior for the tools. Will intialize with a
-			 * PaletteEditPartFactory that has a TrackDragger that understand how to handle the
-			 * mouseDoubleClick event for shape creation tools. Also will initialize the palette
-			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter
-			 * key which will result in the creation of the shape also.
-			 */
-			@Override
-			protected void configurePaletteViewer(PaletteViewer viewer) {
-				super.configurePaletteViewer(viewer);
-
-				// customize menu...
-				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));
-
-				viewer.getKeyHandler().setParent(getPaletteKeyHandler());
-				viewer.getControl().addMouseListener(getPaletteMouseListener());
-
-				// Add a transfer drag target listener that is supported on
-				// palette template entries whose template is a creation tool.
-				// This will enable drag and drop of the palette shape creation
-				// tools.
-				viewer.addDragSourceListener(new PaletteToolTransferDragSourceListener(viewer));
-				viewer.setCustomizer(createPaletteCustomizer());
-			}
-
-			@Override
-			public PaletteViewer createPaletteViewer(Composite parent) {
-				PaletteViewer pViewer = constructPaletteViewer();
-				pViewer.createControl(parent);
-				configurePaletteViewer(pViewer);
-				hookPaletteViewer(pViewer);
-				return pViewer;
-			}
-
-			/**
-			 * @return Palette Key Handler for the palette
-			 */
-			private KeyHandler getPaletteKeyHandler() {
-
-				if (paletteKeyHandler == null) {
-
-					paletteKeyHandler = new KeyHandler() {
-
-						/**
-						 * Processes a <i>key released </i> event. This method is called by the Tool
-						 * whenever a key is released, and the Tool is in the proper state. Override
-						 * to support pressing the enter key to create a shape or connection
-						 * (between two selected shapes)
-						 *
-						 * @param event
-						 *            the KeyEvent
-						 * @return <code>true</code> if KeyEvent was handled in some way
-						 */
-						@Override
-						public boolean keyReleased(KeyEvent event) {
-
-							if (event.keyCode == SWT.Selection) {
-
-								Tool tool = getPaletteViewer().getActiveTool().createTool();
-
-								if (toolSupportsAccessibility(tool)) {
-
-									tool.keyUp(event, getDiagramGraphicalViewer());
-
-									// deactivate current selection
-									getPaletteViewer().setActiveTool(null);
-
-									return true;
-								}
-
-							}
-							return super.keyReleased(event);
-						}
-
-					};
-
-				}
-				return paletteKeyHandler;
-			}
-
-			/**
-			 * @return Palette Mouse listener for the palette
-			 */
-			private MouseListener getPaletteMouseListener() {
-
-				if (paletteMouseListener == null) {
-
-					paletteMouseListener = new MouseListener() {
-
-						/**
-						 * Flag to indicate that the current active tool should be cleared after a
-						 * mouse double-click event.
-						 */
-						private boolean clearActiveTool = false;
-
-						/**
-						 * Override to support double-clicking a palette tool entry to create a
-						 * shape or connection (between two selected shapes).
-						 *
-						 * @see MouseListener#mouseDoubleClick(MouseEvent)
-						 */
-						public void mouseDoubleClick(MouseEvent e) {
-							Tool tool = getPaletteViewer().getActiveTool().createTool();
-
-							if (toolSupportsAccessibility(tool)) {
-
-								tool.setViewer(getDiagramGraphicalViewer());
-								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());
-								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());
-
-								// Current active tool should be deactivated,
-								// but if it is down here it will get
-								// reactivated deep in GEF palette code after
-								// receiving mouse up events.
-								clearActiveTool = true;
-							}
-						}
-
-						public void mouseDown(MouseEvent e) {
-							// do nothing
-						}
-
-						public void mouseUp(MouseEvent e) {
-							// Deactivate current active tool here if a
-							// double-click was handled.
-							if (clearActiveTool) {
-								getPaletteViewer().setActiveTool(null);
-								clearActiveTool = false;
-							}
-
-						}
-					};
-
-				}
-				return paletteMouseListener;
-			}
-
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public GraphicalViewer getGraphicalViewer() {
-		return super.getGraphicalViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-
-		// Enable Drop
-		getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {
-
-			@Override
-			protected Object getJavaObject(TransferData data) {
-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);
-			}
-
-			@Override
-			protected TransactionalEditingDomain getTransactionalEditingDomain() {
-				return getEditingDomain();
-			}
-		});
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
-			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
-			// If not the active editor, ignore selection changed.
-			if (this.equals(editor.getActiveEditor())) {
-				updateActions(getSelectionActions());
-				super.selectionChanged(part, selection);
-			} else {
-				super.selectionChanged(part, selection);
-			}
-		} else {
-			super.selectionChanged(part, selection);
-		}
-		// from
-		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
-		// ISelection)
-		if (part == this) {
-			rebuildStatusLine();
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
deleted file mode 100644
index 631a3102c45..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class ActorPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.FALSE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public ActorPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
deleted file mode 100644
index 0aae340372c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class AssociationPreferencePage extends BlockDefinitionDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public AssociationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
deleted file mode 100644
index 7d35d3a0577..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-public class BlockDefinitionDiagramGeneralPreferencePage extends DiagramPreferencePage {
-
-	public BlockDefinitionDiagramGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-		setPreferenceKey(ElementTypes.DIAGRAM_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramLinkPreferencePage.java
deleted file mode 100644
index 2ae707bd64e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramLinkPreferencePage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class BlockDefinitionDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {

-

-	/** The list of label names for this link */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public BlockDefinitionDiagramLinkPreferencePage() {

-		labelsList = new ArrayList<String>();

-		initializeLabelsList();

-		Collections.unmodifiableList(labelsList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramNodePreferencePage.java
deleted file mode 100644
index db3f983bab7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramNodePreferencePage.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedCompartmentGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class BlockDefinitionDiagramNodePreferencePage extends AbstractPapyrusNodePreferencePage {

-

-	/** The list owning the names of compartments */

-	protected List<String> compartmentNamesList;

-

-	/** The list owning the names of compartment that have a title */

-	protected List<String> compartmentTitlesList;

-

-	/** The list of label names for this node */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public BlockDefinitionDiagramNodePreferencePage() {

-		this.labelsList = new ArrayList<String>();

-		this.compartmentNamesList = new ArrayList<String>();

-		this.compartmentTitlesList = new ArrayList<String>();

-

-		initializeLabelsList();

-		initializeCompartmentNamesList();

-		initializeCompartmentTitlesList();

-

-		Collections.unmodifiableList(labelsList);

-		Collections.unmodifiableList(compartmentNamesList);

-		Collections.unmodifiableList(compartmentTitlesList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add compartments visibility group

-		if (!compartmentNamesList.isEmpty()) {

-			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());

-			addPreferenceGroup(compartmentGroup);

-		}

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartments. */

-	protected void initializeCompartmentNamesList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartment that have titles. */

-	protected void initializeCompartmentTitlesList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {

-		return new TreeMap<String, Boolean>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final void initializeCompartmentsList() {

-		compartmentsList = Collections.emptyList();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramPreferenceInitializer.java
deleted file mode 100644
index d1bb2962b0e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramPreferenceInitializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
-
-public class BlockDefinitionDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ModelPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InstanceSpecificationPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.CommentPreferencePage.initDefaults(store);
-		ActorPreferencePage.initDefaults(store);
-		BlockPreferencePage.initDefaults(store);
-		ConstraintPreferencePage.initDefaults(store);
-		ConstraintBlockPreferencePage.initDefaults(store);
-		ConstraintPropertyPreferencePage.initDefaults(store);
-		DataTypePreferencePage.initDefaults(store);
-		DimensionPreferencePage.initDefaults(store);
-		EnumerationPreferencePage.initDefaults(store);
-		EnumerationLiteralPreferencePage.initDefaults(store);
-		FlowPortPreferencePage.initDefaults(store);
-		FlowPropertyPreferencePage.initDefaults(store);
-		FlowSpecificationPreferencePage.initDefaults(store);
-		InterfacePreferencePage.initDefaults(store);
-		OperationPreferencePage.initDefaults(store);
-		PartPreferencePage.initDefaults(store);
-		PortPreferencePage.initDefaults(store);
-		PrimitiveTypePreferencePage.initDefaults(store);
-		PropertyPreferencePage.initDefaults(store);
-		ReceptionPreferencePage.initDefaults(store);
-		ReferencePreferencePage.initDefaults(store);
-		SignalPreferencePage.initDefaults(store);
-		UnitPreferencePage.initDefaults(store);
-		ValuePreferencePage.initDefaults(store);
-		ValueTypePreferencePage.initDefaults(store);
-		AssociationPreferencePage.initDefaults(store);
-		DependencyPreferencePage.initDefaults(store);
-		GeneralizationPreferencePage.initDefaults(store);
-		InterfaceRealizationPreferencePage.initDefaults(store);
-		UsagePreferencePage.initDefaults(store);
-
-		// DependencyPreferencePage.initDefaults(store);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
deleted file mode 100644
index fe47fb47fc9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class BlockPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("parts", Boolean.FALSE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("references", Boolean.FALSE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("standard ports", Boolean.FALSE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("flow ports", Boolean.FALSE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("values", Boolean.FALSE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("parts", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("references", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("standard ports", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("flow ports", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("values", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public BlockPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 150);
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CommentPreferencePage.java
deleted file mode 100644
index 4b30952c65e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-public class CommentPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
deleted file mode 100644
index 7842d605b1b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class ConstraintBlockPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("parameters", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("parameters", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("constraints", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public ConstraintBlockPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index 838a10b9b15..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class ConstraintPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPropertyPreferencePage.java
deleted file mode 100644
index beaf4a3235e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintPropertyPreferencePage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class ConstraintPropertyPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public ConstraintPropertyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
deleted file mode 100644
index 6a2b5821046..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class DataTypePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public DataTypePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
deleted file mode 100644
index 7554972b5bc..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class DependencyPreferencePage extends BlockDefinitionDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public DependencyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
deleted file mode 100644
index 51d92656ad6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class DimensionPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-
-	/** Constructor */
-	public DimensionPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
-		// End of user code
-
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationLiteralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationLiteralPreferencePage.java
deleted file mode 100644
index 61824b4384a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationLiteralPreferencePage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class EnumerationLiteralPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public EnumerationLiteralPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
deleted file mode 100644
index 7a08df59f4a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class EnumerationPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("literals", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("literals", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public EnumerationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortPreferencePage.java
deleted file mode 100644
index f978bcac938..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortPreferencePage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Composite;
-
-public class FlowPortPreferencePage extends AbstractPreferencePage {
-
-	/** Constructor */
-	public FlowPortPreferencePage() {
-		super();
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		FlowPortAsBorderItemPreferencePage.initDefaults(store);
-		FlowPortAsCompartmentItemPreferencePage.initDefaults(store);
-	}
-
-	@Override
-	protected void addFields(Composite parent) {
-
-	}
-
-	@Override
-	protected void initHelp() {
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPropertyPreferencePage.java
deleted file mode 100644
index c1af80c6287..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPropertyPreferencePage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class FlowPropertyPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public FlowPropertyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
deleted file mode 100644
index e0e3b68ef78..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class FlowSpecificationPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("flow properties", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("flow properties", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public FlowSpecificationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
deleted file mode 100644
index ea7559fed5a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class GeneralizationPreferencePage extends BlockDefinitionDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public GeneralizationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
deleted file mode 100644
index e9ac4e3a8dd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_InstanceSpecification"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("SlotCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("SlotCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public InstanceSpecificationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_InstanceSpecification"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
deleted file mode 100644
index 4726710c22e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class InterfacePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public InterfacePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
deleted file mode 100644
index fe5f3f78a53..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class InterfaceRealizationPreferencePage extends BlockDefinitionDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public InterfaceRealizationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
deleted file mode 100644
index 98898e16b50..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Model"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public ModelPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Model"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/OperationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/OperationPreferencePage.java
deleted file mode 100644
index 3057a24f2a0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/OperationPreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class OperationPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public OperationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
deleted file mode 100644
index 5db4fd9f515..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Package"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public PackagePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Package"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PartPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PartPreferencePage.java
deleted file mode 100644
index 6bb00d0853f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PartPreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class PartPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public PartPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortPreferencePage.java
deleted file mode 100644
index 84028b2b406..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortPreferencePage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Composite;
-
-public class PortPreferencePage extends AbstractPreferencePage {
-
-	/** Constructor */
-	public PortPreferencePage() {
-		super();
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		PortAsBorderItemPreferencePage.initDefaults(store);
-		PortAsCompartmentItemPreferencePage.initDefaults(store);
-	}
-
-	@Override
-	protected void addFields(Composite parent) {
-
-	}
-
-	@Override
-	protected void initHelp() {
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PrimitiveTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PrimitiveTypePreferencePage.java
deleted file mode 100644
index d759b985f7e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PrimitiveTypePreferencePage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PrimitiveTypePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-
-	/** Constructor */
-	public PrimitiveTypePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
deleted file mode 100644
index 53241d2ca16..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PropertyPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public PropertyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReceptionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReceptionPreferencePage.java
deleted file mode 100644
index c8a297f468f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReceptionPreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class ReceptionPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public ReceptionPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReferencePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReferencePreferencePage.java
deleted file mode 100644
index b4b6eddad77..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ReferencePreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class ReferencePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public ReferencePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
deleted file mode 100644
index 4be6d9e8e0d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class SignalPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.FALSE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("operations", Boolean.FALSE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public SignalPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SlotPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SlotPreferencePage.java
deleted file mode 100644
index 610f512c4ab..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SlotPreferencePage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-
-public class SlotPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Slot"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public SlotPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Slot"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UnitPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UnitPreferencePage.java
deleted file mode 100644
index 5222afd3991..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UnitPreferencePage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class UnitPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-
-	/** Constructor */
-	public UnitPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
deleted file mode 100644
index e854a9fefc9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class UsagePreferencePage extends BlockDefinitionDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_USAGE_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public UsagePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_USAGE_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValuePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValuePreferencePage.java
deleted file mode 100644
index 0790ebd38cd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValuePreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class ValuePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public ValuePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
deleted file mode 100644
index 565645bedae..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class ValueTypePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("properties", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("operations", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public ValueTypePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPartProvider.java
deleted file mode 100644
index e6cffd75129..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPartProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import static org.eclipse.papyrus.infra.core.Activator.log;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part.BlockDefinitionDiagramEditPart;
-
-public class BlockDefinitionDiagramEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is BlockDefinition Diagram
-			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-			return BlockDefinitionDiagramEditPart.class;
-		}
-
-		log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPolicyProvider.java
deleted file mode 100644
index db0c7e1127b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramEditPolicyProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomDiagramDragDropEditPolicy;
-
-public class BlockDefinitionDiagramEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
-
-	public boolean provides(IOperation operation) {
-
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
-		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
-			return false;
-		}
-		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
-		String diagramType = gep.getNotationView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public void createEditPolicies(EditPart editPart) {
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramViewProvider.java
deleted file mode 100644
index f0c7462210f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionDiagramViewProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import static org.eclipse.papyrus.infra.core.Activator.log;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.factory.BlockDefinitionDiagramViewFactory;
-
-public class BlockDefinitionDiagramViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
-			return BlockDefinitionDiagramViewFactory.class;
-		}
-
-		log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPartProvider.java
deleted file mode 100644
index b6810464c29..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPartProvider.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.CustomAbstractEditPartProvider;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.AssociationEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockConstraintCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintPropertyChildLabelEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.DimensionEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.DimensionLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedNodeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortChildLabelEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPropertyChildLabelEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowSpecificationEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowSpecificationLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ParameterCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.PartPropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ReferencePropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.UnitEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.UnitLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ValuePropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ValueTypeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ValueTypeLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ActorEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeAffixedLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeLinkLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceRoleEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetRoleEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.DataTypeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.EnumerationEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.EnumerationLiteralCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.InterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementAffixedLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementLinkLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PrimitiveTypeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.SignalEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
-
-	/** Map containing node view types supported by this provider */
-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
-
-	/** Map containing edge view types supported by this provider */
-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
-
-	/** Default constructor */
-	public CustomEditPartProvider() {
-		super();
-
-		diagramType = ElementTypes.DIAGRAM_ID;
-
-		// Nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, BlockEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID, ConstraintBlockEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID, ConstraintPropertyChildLabelEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID, DimensionEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID, FlowPortChildLabelEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID, FlowPropertyChildLabelEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID, FlowSpecificationEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID, UnitEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID, ValueTypeEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID, ActorEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID, DataTypeEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID, EnumerationEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID, InterfaceEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID, PrimitiveTypeEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID, DefaultChildLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID, SignalEditPart.class);
-
-		// Decorations
-		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, FlowPortAffixedLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID, BlockConstraintCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID, FlowPortCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID, FlowPropertyCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID, ParameterCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID, PartPropertyCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID, BlockPropertyCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID, ReferencePropertyCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID, ValuePropertyCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, BlockLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_CONSTRAINTBLOCK_NAME_ID, ConstraintBlockLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_DIMENSION_NAME_ID, DimensionLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_FLOWSPECIFICATION_NAME_ID, FlowSpecificationLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_UNIT_NAME_ID, UnitLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_VALUETYPE_NAME_ID, ValueTypeLabelNameEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeAffixedLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_NAMEDELEMENT_NAME_ID, NamedElementAffixedLabelNameEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, PortAffixedLabelNameEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID, EnumerationLiteralCompartmentEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID, OperationCompartmentEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID, PortCompartmentEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID, PropertyCompartmentEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID, NamedElementNodeLabelNameEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeLinkLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_MULTIPLICITY_ID, AssociationLinkLabelSourceMultiplicityEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_ROLE_ID, AssociationLinkLabelSourceRoleEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_MULTIPLICITY_ID, AssociationLinkLabelTargetMultiplicityEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_ROLE_ID, AssociationLinkLabelTargetRoleEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, NamedElementLinkLabelNameEditPart.class);
-
-		// Edges
-		edgeMap.put(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, AssociationEditPart.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyEditPart.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID, GeneralizationEditPart.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID, InterfaceRealizationEditPart.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_USAGE_ID, UsageEditPart.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View newView = ((IEditPartOperation) operation).getView();
-			if (newView == null) {
-				return false;
-			}
-
-			String graphicalType = newView.getType();
-
-			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
-				return false;
-			}
-
-			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
-				return false;
-			}
-		}
-
-		return super.provides(operation);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getNodeEditPartClass(View view) {
-		return nodeMap.get(view.getType());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getEdgeEditPartClass(View view) {
-		return edgeMap.get(view.getType());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomGraphicalTypeRegistry.java
deleted file mode 100644
index 060bd0688ef..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomGraphicalTypeRegistry.java
+++ /dev/null
@@ -1,862 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
-
-	/** Default constructor */
-	public CustomGraphicalTypeRegistry() {
-
-		super();
-
-		// Nodes
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID);
-		// Decorations
-		knownNodes.add(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_CONSTRAINTBLOCK_NAME_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_DIMENSION_NAME_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_FLOWSPECIFICATION_NAME_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_UNIT_NAME_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_VALUETYPE_NAME_ID);
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID);
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_NAMEDELEMENT_NAME_ID);
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID);
-		knownNodes.add(UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID);
-		knownNodes.add(UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID);
-		knownNodes.add(UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID);
-		knownNodes.add(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_MULTIPLICITY_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_ROLE_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_MULTIPLICITY_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_ROLE_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID);
-
-		// Edges
-		knownEdges.add(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID);
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID);
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID);
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID);
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_USAGE_ID);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)
-
-		// For legacy reuse of Class Diagram Constraint in BDD (DnD especially)
-		if (UMLElementTypes.CONSTRAINT.getEClass().isInstance(domainElement)) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return super.getNodeGraphicalType(domainElement, containerType);
-			}
-
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType) || ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return super.getNodeGraphicalType(domainElement, containerType);
-			}
-
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType) || ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return super.getNodeGraphicalType(domainElement, containerType);
-			}
-
-			// else : managed below...
-		}
-
-		// End of user code
-
-		if (UMLElementTypes.CONSTRAINT.getEClass().isInstance(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.ENUMERATION_LITERAL.getEClass().isInstance(domainElement)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.OPERATION.getEClass().isInstance(domainElement)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PORT.getEClass().isInstance(domainElement)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
-			}
-			if (UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.FLOW_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PROPERTY.getEClass().isInstance(domainElement)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.RECEPTION.getEClass().isInstance(domainElement)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.ACTOR.getEClass().isInstance(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.ENUMERATION.getEClass().isInstance(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PRIMITIVE_TYPE.getEClass().isInstance(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.DATA_TYPE.getEClass().isInstance(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.INTERFACE.getEClass().isInstance(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.SIGNAL.getEClass().isInstance(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.DIMENSION).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.UNIT).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		return super.getNodeGraphicalType(domainElement, containerType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(String proposedType, String containerType) {
-		// Start of user code getNodeGraphicalType(String proposedType, String containerType)
-		// End of user code
-
-		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.ENUMERATION_LITERAL.getSemanticHint().equals(proposedType)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.OPERATION.getSemanticHint().equals(proposedType)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PORT.getSemanticHint().equals(proposedType)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
-			}
-			if (UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.CONSTRAINT_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.FLOW_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.RECEPTION.getSemanticHint().equals(proposedType)) {
-			if (UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.ACTOR.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.ENUMERATION.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PRIMITIVE_TYPE.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.VALUE_TYPE.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.DATA_TYPE.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.FLOW_SPECIFICATION.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.INTERFACE.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.SIGNAL.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.CONSTRAINT_BLOCK.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.DIMENSION.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.UNIT.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		return super.getNodeGraphicalType(proposedType, containerType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(EObject domainElement) {
-		// Start of user code getEdgeGraphicalType(EObject domainElement)
-
-		// End of user code
-
-		if (((ISpecializationType) SysMLElementTypes.ASSOCIATION).getMatcher().matches(domainElement)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		if (UMLElementTypes.USAGE.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_USAGE_ID;
-		}
-		if (UMLElementTypes.INTERFACE_REALIZATION.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID;
-		}
-		if (UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}
-		if (UMLElementTypes.GENERALIZATION.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID;
-		}
-		if (UMLElementTypes.INSTANCE_SPECIFICATION.getEClass().isInstance(domainElement)) {
-			return ElementTypes.INSTANCE_SPECIFICATION_LINK.getSemanticHint();
-		}
-
-		return super.getEdgeGraphicalType(domainElement);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(String proposedType) {
-		// Start of user code getEdgeGraphicalType(String proposedType)
-		if (SysMLElementTypes.ASSOCIATION_NONE.getSemanticHint().equals(proposedType)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		if (SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.getSemanticHint().equals(proposedType)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		if (SysMLElementTypes.ASSOCIATION_COMPOSITE.getSemanticHint().equals(proposedType)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		if (SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.getSemanticHint().equals(proposedType)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		if (SysMLElementTypes.ASSOCIATION_SHARED.getSemanticHint().equals(proposedType)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		if (SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.getSemanticHint().equals(proposedType)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		// End of user code
-
-		if (SysMLElementTypes.ASSOCIATION.getSemanticHint().equals(proposedType)) {
-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;
-		}
-		if (UMLElementTypes.USAGE.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_USAGE_ID;
-		}
-		if (UMLElementTypes.INTERFACE_REALIZATION.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID;
-		}
-		if (UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}
-		if (UMLElementTypes.GENERALIZATION.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID;
-		}
-		return super.getEdgeGraphicalType(proposedType);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomViewProvider.java
deleted file mode 100644
index d271616454d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomViewProvider.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.AffixedLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.CompartmentListViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.InnerLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeChildLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.provider.CustomAbstractViewProvider;
-import org.eclipse.papyrus.sysml.diagram.common.factory.BlockClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.ConstraintBlockClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.DimensionClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.FlowPortAffixedNodeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.FlowSpecificationClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.UnitClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.ValueTypeClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.factory.AssociationLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.ClassifierViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.DependencyLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.EnumerationClassifierViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.GeneralizationLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.InterfaceRealizationLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.PortAffixedNodeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.PrimitiveTypeClassifierViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.UsageLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class CustomViewProvider extends CustomAbstractViewProvider {
-
-	/** Map containing node view types supported by this provider */
-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
-
-	/** Map containing edge view types supported by this provider */
-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
-
-	/** Default constructor */
-	public CustomViewProvider() {
-		super();
-		this.registry = new CustomGraphicalTypeRegistry();
-
-		diagramType = ElementTypes.DIAGRAM_ID;
-
-		// Custom classifier nodes
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID, EnumerationClassifierViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID, PrimitiveTypeClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID, ValueTypeClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID, FlowSpecificationClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID, ConstraintBlockClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, BlockClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID, DimensionClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID, UnitClassifierViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID, ClassifierViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID, ClassifierViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID, ClassifierViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID, ClassifierViewFactory.class);
-		// Custom affixed nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeViewFactory.class);
-		// Custom child node labels
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID, ShapeChildLabelViewFactory.class);
-		// Custom inner labels
-		nodeMap.put(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_CONSTRAINTBLOCK_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_DIMENSION_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_FLOWSPECIFICATION_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_UNIT_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_VALUETYPE_NAME_ID, InnerLabelViewFactory.class);
-		// Custom compartments
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID, CompartmentListViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID, CompartmentListViewFactory.class);
-		// Custom affixed labels
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_NAMEDELEMENT_NAME_ID, AffixedLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AffixedLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, AffixedLabelViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, AffixedLabelViewFactory.class);
-
-		// Custom edges
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_USAGE_ID, UsageLinkViewFactory.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID, InterfaceRealizationLinkViewFactory.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyLinkViewFactory.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID, GeneralizationLinkViewFactory.class);
-		edgeMap.put(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, AssociationLinkViewFactory.class);
-
-		// Custom edge labels
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_MULTIPLICITY_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_ROLE_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_MULTIPLICITY_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_ROLE_ID, ConnectorLabelViewFactory.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getNodeViewClass(IAdaptable semanticAdapter, View containerView, String graphicalType) {
-		return nodeMap.get(graphicalType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getEdgeViewClass(IAdaptable semanticAdapter, View containerView, String graphicalType) {
-		return edgeMap.get(graphicalType);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
deleted file mode 100644
index 1791880dc16..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ElementTypes.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartTN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
-
-public class ElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** SysML Block Definition Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** SysML Block Definition Diagram :: Diagram */
-	public static final String DIAGRAM_ID = "BlockDefinition"; //$NON-NLS-1$
-
-
-
-
-	/** ********************************************************* */
-	/** SysML Block Definition Diagram - ClassDiagram related elements */
-	/** ********************************************************* */
-
-
-	/** ClassDiagram :: MODEL */
-	public static final IHintedType MODEL = (IHintedType) UMLElementTypes.Model_Shape;
-
-	public static final String MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = ModelPackageableElementCompartmentEditPartTN.VISUAL_ID;
-
-	public static final String MODEL_LABEL_NAME_TN_HINT = ModelNameEditPartTN.VISUAL_ID;
-
-	/** ClassDiagram :: MODEL_CN */
-	public static final IHintedType MODEL_CN = (IHintedType) UMLElementTypes.Model_Shape_CN;
-
-	public static final String MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = ModelPackageableElementCompartmentEditPartCN.VISUAL_ID;
-
-	public static final String MODEL_CN_LABEL_NAME_HINT = ModelNameEditPartCN.VISUAL_ID;
-
-	/** ClassDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType) UMLElementTypes.Package_Shape;
-
-	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPart.VISUAL_ID;
-
-	public static final String PACKAGE_LABEL_NAME_HINT = PackageNameEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType) UMLElementTypes.Package_Shape_CN;
-
-	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPartCN.VISUAL_ID;
-
-	public static final String PACKAGE_CN_LABEL_NAME_HINT = PackageNameEditPartCN.VISUAL_ID;
-
-	/** ClassDiagram :: INSTANCE_SPECIFICATION */
-	public static final IHintedType INSTANCE_SPECIFICATION = (IHintedType) UMLElementTypes.InstanceSpecification_Shape;
-
-	/** ClassDiagram :: INSTANCE_SPECIFICATION_LINK */
-	public static final IHintedType INSTANCE_SPECIFICATION_LINK = (IHintedType) UMLElementTypes.InstanceSpecification_Edge;
-
-	public static final String INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT = InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID;
-
-	public static final String INSTANCE_SPECIFICATION_LABEL_NAME_HINT = InstanceSpecificationNameEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: INSTANCE_SPECIFICATION_CN */
-	public static final IHintedType INSTANCE_SPECIFICATION_CN = (IHintedType) UMLElementTypes.InstanceSpecification_Shape_CN;
-
-	public static final String INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT = InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID;
-
-	public static final String INSTANCE_SPECIFICATION_CN_LABEL_NAME_HINT = InstanceSpecificationNameEditPartCN.VISUAL_ID;
-
-	/** ClassDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape;
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
-
-	public static final String CONSTRAINT_LABEL_BODY_HINT = ConstraintBodyEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape_CN;
-
-	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
-
-	public static final String CONSTRAINT_CN_LABEL_BODY_HINT = ConstraintBodyEditPartCN.VISUAL_ID;
-
-	/** ClassDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
-
-	public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
-
-	public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
-
-
-	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
-
-	/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) UMLElementTypes.Constraint_ConstrainedElementEdge;
-
-	/** ClassDiagram :: ChildLabelNodes */
-	public static final IHintedType INSTANCE_SPECIFICATION_SLOT_CLN = (IHintedType) UMLElementTypes.Slot_SlotLabel;
-
-
-	public static IElementType getElementTypeByID(String visualID) {
-		if (ElementTypes.INSTANCE_SPECIFICATION_LINK.getSemanticHint().equalsIgnoreCase(visualID)) {
-			return ElementTypes.INSTANCE_SPECIFICATION_LINK;
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/GraphicalTypeRegistry.java
deleted file mode 100644
index 8aaeab46461..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/GraphicalTypeRegistry.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides graphical type id (used as View type) for
- * domain element according to their actual or expected graphical
- * container type.
- * </pre>
- */
-public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
-
-	/** A Set containing all known node graphical types */
-	protected Set<String> knownNodes = new HashSet<String>();
-
-	/** A Set containing all known edge graphical types */
-	protected Set<String> knownEdges = new HashSet<String>();
-
-	/** Default constructor */
-	public GraphicalTypeRegistry() {
-
-		// Fill known edges set
-		knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint());
-		knownEdges.add(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint());
-		knownEdges.add(ElementTypes.INSTANCE_SPECIFICATION_LINK.getSemanticHint());
-
-		// Fill known nodes set (primary nodes)
-		knownNodes.add(UMLElementTypes.MODEL.getSemanticHint());
-		knownNodes.add(UMLElementTypes.PACKAGE.getSemanticHint());
-		knownNodes.add(UMLElementTypes.INSTANCE_SPECIFICATION.getSemanticHint());
-		knownNodes.add(UMLElementTypes.CONSTRAINT.getSemanticHint());
-		knownNodes.add(UMLElementTypes.COMMENT.getSemanticHint());
-
-		knownNodes.add(ElementTypes.MODEL.getSemanticHint());
-		knownNodes.add(ElementTypes.MODEL_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.PACKAGE.getSemanticHint());
-		knownNodes.add(ElementTypes.PACKAGE_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint());
-		knownNodes.add(ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.CONSTRAINT.getSemanticHint());
-		knownNodes.add(ElementTypes.CONSTRAINT_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
-
-		// Fill known nodes set (child label nodes)
-		knownNodes.add(UMLElementTypes.SLOT.getSemanticHint());
-		knownNodes.add(ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(EObject domainElement) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if (domainElement == null) {
-			return UNDEFINED_TYPE;
-		}
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(IElementType elementType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getEdgeGraphicalType(semanticHint);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(String proposedType) {
-		if (isKnownEdgeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if ((containerType == null) || (domainElement == null)) {
-			return UNDEFINED_TYPE;
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Model) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Model TopNode
-				graphicalType = ElementTypes.MODEL.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
-				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
-				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
-				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Model ChildNode
-				graphicalType = ElementTypes.MODEL_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Package TopNode
-				graphicalType = ElementTypes.PACKAGE.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
-				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
-				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
-				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
-				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.InstanceSpecification) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // InstanceSpecification TopNode
-				graphicalType = ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
-				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
-				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
-				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // InstanceSpecification ChildNode
-				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
-				graphicalType = ElementTypes.COMMENT.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Slot) {
-
-			if (ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Slot ChildLabelNode
-				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
-			}
-			if (ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Slot ChildLabelNode
-				graphicalType = ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
-			}
-		}
-
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getNodeGraphicalType(semanticHint, containerType);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(String proposedType, String containerType) {
-
-		// Explicitly forbid Comment or Constraint creation using ElementType defined in Class Diagram
-		// A better implementation should be provided, this one is not subtle but should have minimal side effect
-		// (see bug #348550)
-
-		if (UMLElementTypes.MODEL.getSemanticHint().equals(proposedType)) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.MODEL.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.MODEL_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.MODEL_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.MODEL_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.MODEL_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (UMLElementTypes.PACKAGE.getSemanticHint().equals(proposedType)) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.PACKAGE.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if ((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.COMMENT.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (UMLElementTypes.INSTANCE_SPECIFICATION.getSemanticHint().equals(proposedType)) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (UMLElementTypes.SLOT.getSemanticHint().equals(proposedType)) {
-
-			if (ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
-			}
-			if (ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerType)) { // Constraint ChildNode
-				return ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-		// Initial implementation (to be improved - see : getNodeGraphicalType(EObject domainElement, String containerType))
-		if (isKnownNodeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isKnownEdgeType(String type) {
-		return knownEdges.contains(type);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isKnownNodeType(String type) {
-		return knownNodes.contains(type);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramEditPartProvider.java
deleted file mode 100644
index f361f5be524..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramEditPartProvider.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.providers.CustomUMLEditPartProvider;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.SlotChildLabelEditPart;
-
-public class InheritedClassDiagramEditPartProvider extends CustomUMLEditPartProvider {
-
-	@Override
-	public synchronized boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is a BlockDefinition Diagram
-			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
-				return false;
-			}
-
-			// Test supported inherited types
-			EObject eobject = view.getElement();
-
-			/** Nodes (and ChildLabelNodes) *********** */
-			if (eobject instanceof org.eclipse.uml2.uml.Model) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Package) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.InstanceSpecification) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Slot) {
-				return true;
-			}
-
-
-			// Additional test needed here to decide whether to support Feature type links.
-			// As feature type link are not related to a MetaClass from the domain model
-			// they are not already handled by previous tests.
-			// Also concerns NotationType.
-			String hint = view.getType();
-
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-
-
-
-		}
-		return false;
-	}
-
-	/**
-	 * EditPart replacement for ChildLabelNodes from inherited diagram.
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=351433
-	 */
-	@Override
-	protected IGraphicalEditPart createEditPart(View view) {
-		if (ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint().equals(view.getType())) {
-			return new SlotChildLabelEditPart(view);
-		}
-		return super.createEditPart(view);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
deleted file mode 100644
index 0a1c51ff214..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import static org.eclipse.papyrus.infra.core.Activator.log;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-public class InheritedClassDiagramViewProvider extends UMLViewProvider {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Edge createdEdge = null;
-		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-		if (elementType != null) {
-			createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-		} else {
-			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
-			String domainElementGraphicalType = semanticHint;
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
-				// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-				if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);
-				}
-			}
-		}
-		if (createdEdge == null) {
-			log.error(new Exception("Could not create Edge."));
-		}
-		return createdEdge;
-	}
-
-	@Override
-	protected boolean provides(CreateViewForKindOperation op) {
-		// Never use this method (often incorrectly implemented due to GMF Tooling choices).
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-		throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
-	}
-
-	@Override
-	protected boolean provides(CreateEdgeViewOperation op) {
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		// This provider is registered for BlockDefinition Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			return true;
-		}
-		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
-			return true;
-		}
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean provides(CreateNodeViewOperation op) {
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		// Get the type of the container
-		String containerGraphicalType = op.getContainerView().getType();
-		// This provider is registered for BlockDefinition Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the ElementType and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
-		if (elementType == UMLElementTypes.MODEL) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			return false;
-		}
-		if (elementType == UMLElementTypes.PACKAGE) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			return false;
-		}
-		if (elementType == UMLElementTypes.INSTANCE_SPECIFICATION) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			return false;
-		}
-		if (elementType == UMLElementTypes.CONSTRAINT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			return false;
-		}
-		if (elementType == UMLElementTypes.COMMENT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			return false;
-		}
-		if (elementType == UMLElementTypes.SLOT) {
-			if (ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			return false;
-		}
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-			} else {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		// Use the GraphicalTypeRegistry to find the expected type for a domain element
-		// Get the type of the container
-		String containerGraphicalType = containerView.getType();
-		// Get the type of the domain element
-		EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (semanticHint != null) {
-			// Look for a possible graphicalType replacement
-			String graphicalType = registry.getNodeGraphicalType(semanticHint, containerGraphicalType);
-			return super.createNode(new SemanticAdapter(domainElement, null), containerView, graphicalType, index, persisted, preferencesHint);
-		}
-		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-		// if(semanticHint != null) {
-		// return super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-		// }
-		//
-		// // Use the GraphicalTypeRegistry to find the expected type for a domain element
-		// // Get the type of the container
-		// String containerGraphicalType = containerView.getType();
-		// // Get the type of the domain element
-		// EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-		// String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-		// Create the expected node
-		if (!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
-			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-		}
-		log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
deleted file mode 100644
index 2cf837b71f5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition;

-

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

-import org.eclipse.papyrus.infra.ui.extension.commands.PerspectiveContextDependence;

-

-/**

- * BlockDefinitionDiagramCondition to set conditions for the diagram creation

- */

-public class BlockDefinitionDiagramCondition extends PerspectiveContextDependence {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean create(EObject selectedElement) {

-		return false;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/command/CustomDeleteCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/command/CustomDeleteCommand.java
deleted file mode 100644
index cd9fcf923d6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/command/CustomDeleteCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.command;

-

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

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

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

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

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

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

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-

-/**

- *

- * <UL>

- * The purpose of this command is to delete view by taking following situation:

- * <LI>if the view is placed direclty on the diagram, do nothing

- * <LI>if the view is placed into another container, the semantic of the container must be the parent of the semantic view

- * </UL>

- */

-public class CustomDeleteCommand extends DeleteCommand {

-

-	public CustomDeleteCommand(TransactionalEditingDomain editingDomain, View view) {

-		super(editingDomain, view);

-	}

-

-	@Override

-	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		String containerType = ViewUtil.getViewContainer(getView()) != null ? ViewUtil.getViewContainer(getView()).getType() : null;

-		if ((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

-			// if the associated element is different of null

-			if (getView().getElement() != null) {

-				// if the container is different of null

-				if (ViewUtil.getContainerView(getView()) != null && ViewUtil.getContainerView(getView()).getElement() != null) {

-					// if the parent of the current element is different of the semantic element of the parent view we have to destroy

-					if (!getView().getElement().eContainer().equals(ViewUtil.getContainerView(getView()).getElement())) {

-						return super.doExecute(monitor, info);

-					}

-

-				}

-			}

-		}

-		return Status.OK_STATUS;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/dnd/helper/CustomLinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/dnd/helper/CustomLinkMappingHelper.java
deleted file mode 100644
index ccbc55f8058..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/dnd/helper/CustomLinkMappingHelper.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-

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

-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.ILinkMappingHelper;

-import org.eclipse.papyrus.uml.diagram.common.dnd.helper.LinkMappingHelper.CommonSourceUMLSwitch;

-import org.eclipse.papyrus.uml.diagram.common.dnd.helper.LinkMappingHelper.CommonTargetUMLSwitch;

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

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

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

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

-

-/**

- * The Class LinkMappingHelper is specialization of the link mapping helper for the Class diagram

- */

-public class CustomLinkMappingHelper implements ILinkMappingHelper {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Collection<?> getSource(Element link) {

-		CommonSourceUMLSwitch umlSwitch = new CommonSourceUMLSwitch() {

-

-			@Override

-			public java.util.Collection<?> caseAssociation(org.eclipse.uml2.uml.Association object) {

-

-				java.util.Collection<?> ends = Collections.emptySet();

-

-				// Binary associations only in this diagram.

-				// Other expectation:

-				// - property ends are typed by Classifiers

-				// - property ends are type is not null

-

-				if (object.getMemberEnds().size() == 2) {

-

-					Property semanticTarget = object.getMemberEnds().get(1);

-

-					// The proposed graphical target is a representation of the type of

-					// the semantic source.

-					Type sourceType = semanticTarget.getType();

-					if ((sourceType != null) && (sourceType instanceof Classifier)) {

-						ends = Arrays.asList(new EObject[] { sourceType });

-					}

-

-				} else {

-					// TODO: log warning here - can only drop binary associations in this diagram...

-				}

-

-				return ends;

-			};

-

-			// public java.util.Collection<?> caseAssociationClass(org.eclipse.uml2.uml.AssociationClass object) {

-			// return object.getEndTypes();

-			// };

-

-			// public java.util.Collection<?> caseGeneralizationSet(org.eclipse.uml2.uml.GeneralizationSet object) {

-			// return object.getGeneralizations();

-			// };

-

-			@Override

-			public java.util.Collection<?> caseInterfaceRealization(org.eclipse.uml2.uml.InterfaceRealization object) {

-				ArrayList<EObject> result = new ArrayList<EObject>();

-				result.add(object.getImplementingClassifier());

-				return result;

-			};

-

-		};

-		return umlSwitch.doSwitch(link);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Collection<?> getTarget(Element link) {

-		CommonTargetUMLSwitch umlSwitch = new CommonTargetUMLSwitch() {

-

-			@Override

-			public java.util.Collection<?> caseAssociation(org.eclipse.uml2.uml.Association object) {

-

-				java.util.Collection<?> ends = Collections.emptySet();

-

-				// Binary associations only in this diagram.

-				// Other expectation:

-				// - property ends are typed by Classifiers

-				// - property ends are type is not null

-

-				if (object.getMemberEnds().size() == 2) {

-

-					Property semanticSource = object.getMemberEnds().get(0);

-

-					// The proposed graphical target is a representation of the type of

-					// the semantic source.

-					Type sourceType = semanticSource.getType();

-					if ((sourceType != null) && (sourceType instanceof Classifier)) {

-						ends = Arrays.asList(new EObject[] { sourceType });

-					}

-

-				} else {

-					// TODO: log warning here - can only drop binary associations in this diagram...

-				}

-

-				return ends;

-			};

-

-			// public java.util.Collection<?> caseAssociationClass(org.eclipse.uml2.uml.AssociationClass object) {

-			// return object.getEndTypes();

-			// };

-

-			// public java.util.Collection<?> caseGeneralizationSet(org.eclipse.uml2.uml.GeneralizationSet object) {

-			// return object.getGeneralizations();

-			// };

-

-			@Override

-			public java.util.Collection<?> caseInterfaceRealization(org.eclipse.uml2.uml.InterfaceRealization object) {

-				ArrayList<EObject> result = new ArrayList<EObject>();

-				result.add(object.getContract());

-				return result;

-			};

-

-		};

-		return umlSwitch.doSwitch(link);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
deleted file mode 100644
index 64186cf5082..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *	Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 446668
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.GraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLCreateOrShowExistingElementHelper;
-import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;
-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;
-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;
-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;
-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <pre>
- * Custom semantic edit policy that replace DefaultSemanticEditPolicy
- * in order to manage Class Diagram specific elements (reference
- * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).
- * </pre>
- */
-public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemanticEditPolicy {
-
-	/** Local graphical type registry for graphical elements */
-	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();
-
-	/** Local graphical type registry for inherited graphical elements */
-	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();
-
-	private CreateOrShowExistingElementHelper existingElementHelper = new SysMLCreateOrShowExistingElementHelper();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-
-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {
-			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));
-		}
-
-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {
-			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));
-		}
-
-		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());
-
-		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		final Command defaultCommand = super.getCreateRelationshipCommand(req);
-		final IElementType elementType = req.getElementType();
-		final EClass eClass = elementType.getEClass();
-		if (defaultCommand.canExecute()) {
-			if (elementType.getEClass() == UMLPackage.eINSTANCE.getAssociation()) {
-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);
-			} else if (eClass == UMLPackage.eINSTANCE.getDependency()) {
-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);
-			} else if (eClass == UMLPackage.eINSTANCE.getGeneralization()) {
-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);
-			} else if (eClass == UMLPackage.eINSTANCE.getUsage()) {
-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);
-			}
-		}
-		return defaultCommand;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
-
-		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);
-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;
-
-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {
-			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));
-		}
-
-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {
-			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));
-		}
-
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDefaultSemanticEditPolicy.java
deleted file mode 100644
index 34e72074b70..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDefaultSemanticEditPolicy.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;

-

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

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.GraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLCreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

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

-

-/**

- * <pre>

- * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference

- * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

- * </pre>

- */

-public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {

-

-	/** Local graphical type registry for graphical elements */

-	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();

-

-	/** Local graphical type registry for inherited graphical elements */

-	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();

-

-	private CreateOrShowExistingElementHelper existingElementHelper = new SysMLCreateOrShowExistingElementHelper();

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

-		}

-

-		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

-

-		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		final Command defaultCommand = super.getCreateRelationshipCommand(req);

-		if (defaultCommand.canExecute() && req.getSource() != null && req.getTarget() != null) {

-			final EClass eClass = req.getElementType().getEClass();

-			final IElementType elementType = req.getElementType();

-			if (UMLPackage.eINSTANCE.getInterfaceRealization() == eClass) {

-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if (elementType.getEClass() == UMLPackage.eINSTANCE.getAssociation()) {

-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if (eClass == UMLPackage.eINSTANCE.getDependency()) {

-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if (eClass == UMLPackage.eINSTANCE.getGeneralization()) {

-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			} else if (eClass == UMLPackage.eINSTANCE.getUsage()) {

-				return this.existingElementHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			}

-		}

-		return defaultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-

-		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

-		}

-

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDiagramDragDropEditPolicy.java
deleted file mode 100644
index 54c140e48fd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/CustomDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

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

-import org.eclipse.draw2d.geometry.Point;

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

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

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

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.gmf.diagram.common.commands.IdentityCommandWithNotification;

-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.CommonDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper.CustomLinkMappingHelper;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.messages.Messages;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.CustomGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.helper.InstanceSpecificationLinkHelper;

-import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

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

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

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

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

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

-

-/**

- * Custom diagram drag drop edit policy for elements handling drop in the Block Definition Diagram.

- */

-public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {

-

-	/** Default constructor. */

-	public CustomDiagramDragDropEditPolicy() {

-		super(new CustomLinkMappingHelper());

-		registry = new CustomGraphicalTypeRegistry();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Set<String> getSpecificDropBehaviorTypes() {

-		Set<String> result = new HashSet<String>();

-		result.add(ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint());

-		result.add(ElementTypes.INSTANCE_SPECIFICATION_LINK.getSemanticHint());

-		return result;

-	}

-

-	@Override

-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {

-		if (ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint().equalsIgnoreCase(nodeType) ||

-				ElementTypes.INSTANCE_SPECIFICATION_LINK.getSemanticHint().equalsIgnoreCase(edgeType)) {

-			return new CommandProxy(dropInstanceSpecification(nodeType, dropRequest, droppedEObject));

-		}

-		return super.getSpecificDropCommand(dropRequest, droppedEObject, nodeType, edgeType);

-	}

-

-	/**

-	 * drop a instance specification as a link or as a node

-	 *

-	 * @param dropRequest

-	 *            the drop request

-	 * @param droppedEObject

-	 *            the element

-	 * @param edgeType

-	 *            the edge type

-	 * @return the command in charge of the drop

-	 */

-	protected Command dropInstanceSpecification(String droppedNodeType, DropObjectsRequest dropRequest, EObject droppedEObject) {

-		if (false == droppedEObject instanceof InstanceSpecification) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		// Drop as link

-		List<InstanceSpecification> endTypes = InstanceSpecificationLinkHelper.getEnds(((InstanceSpecification) droppedEObject));

-		if (endTypes.size() > 0) {

-			Element source = endTypes.get(0);

-			Element target = endTypes.get(1);

-			return new ICommandProxy(dropBinaryLink(new CompositeCommand("drop InstanceSpecification link"), source, target, ElementTypes.INSTANCE_SPECIFICATION_LINK.getSemanticHint(), dropRequest.getLocation(), (Element) droppedEObject));

-		}

-		// Drop as node

-		return new ICommandProxy(getDefaultDropNodeCommand(droppedNodeType, droppedEObject, dropRequest.getLocation()));

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getUnknownDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject) {

-

-		// Add a notification message in case an attempt to drop a UML Association in this diagram occurs.

-		if ((droppedEObject instanceof Association) && !(droppedEObject instanceof AssociationClass)) {

-			if (!((ISpecializationType) SysMLElementTypes.ASSOCIATION).getMatcher().matches(droppedEObject)) {

-				return new IdentityCommandWithNotification(Messages.Notification_Drop_Title, NLS.bind(Messages.Notification_Drop_UMLAssociationWarning, EMFCoreUtil.getQualifiedName(droppedEObject, true)), Type.WARNING);

-			}

-		}

-

-		return super.getUnknownDropCommand(dropRequest, droppedEObject);

-	}

-

-	/**

-	 * the method provides command to create the binary link into the diagram.

-	 * If the source and the target views do not exist, these views will be

-	 * created.

-	 *

-	 * @param cc

-	 *            the composite command that will contain the set of command to

-	 *            create the binary link

-	 * @param source

-	 *            the source the element source of the link

-	 * @param target

-	 *            the target the element target of the link

-	 * @param edgeType

-	 *            the edge type used to create the view

-	 * @param location

-	 *            the location the location where the view will be be created

-	 * @param semanticLink

-	 *            the semantic link that will be attached to the view

-	 *

-	 * @return the composite command

-	 */

-	protected CompositeCommand dropBinaryLink(CompositeCommand cc, Element source, Element target, String edgeType, Point absoluteLocation, Element semanticLink) {

-		IAdaptable sourceViewAdapter = findAdapter(cc, source, getLinkSourceDropLocation(absoluteLocation, source, target), edgeType);

-		IAdaptable targetViewAdapter = findAdapter(cc, target, getLinkTargetDropLocation(absoluteLocation, source, target), edgeType);

-

-		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(getElementType(edgeType, semanticLink), edgeType, getDiagramPreferencesHint());

-		CommonDeferredCreateConnectionViewCommand createConnectionViewCommand = new CommonDeferredCreateConnectionViewCommand(getEditingDomain(), edgeType, sourceViewAdapter, targetViewAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor, null);

-		createConnectionViewCommand.setElement(semanticLink);

-		cc.compose(createConnectionViewCommand);

-		return cc;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	protected IAdaptable getElementType(String elementID, Element semanticLink) {

-		IElementType result = ElementTypes.getElementTypeByID(elementID);

-		return result == null ? new SemanticAdapter(semanticLink, null) : result;

-	}

-

-	/**

-	 * This method allows to specify a location for the creation of a node at

-	 * the source of a dropped link. Overriding implementations must not modify

-	 * the absoluteLocation parameter (use {@link Point#getCopy()})

-	 *

-	 * @param absoluteLocation

-	 *            the request's drop location

-	 * @param source

-	 *            the source of the dropped link

-	 * @param target

-	 *            the target of the dropped link

-	 * @return the new location for the node

-	 */

-	protected Point getLinkSourceDropLocation(Point absoluteLocation, Element source, Element target) {

-		return absoluteLocation;

-	}

-

-	/**

-	 * This method allows to specify a location for the creation of a node at

-	 * the target of a dropped link. Overriding implementations must not modify

-	 * the absoluteLocation parameter (use {@link Point#getCopy()})

-	 *

-	 * @param absoluteLocation

-	 *            the request's drop location

-	 * @param source

-	 *            the source of the dropped link

-	 * @param target

-	 *            the target of the dropped link

-	 * @return the new location for the node

-	 */

-	protected Point getLinkTargetDropLocation(Point absoluteLocation, Element source, Element target) {

-		if (lookForEditPart(source) == null && lookForEditPart(target) == null) {

-			return absoluteLocation.getTranslated(100, 0);

-		}

-		return absoluteLocation;

-	}

-

-	/**

-	 * the method provides command to create the binary link into the diagram.

-	 * Find source/target adapter

-	 * If the source and the target views do not exist, these views will be

-	 * created.

-	 * 

-	 * @see dropBinaryLink(CompositeCommand cc, Element source, Element target, int linkVISUALID

-	 *      , Point absoluteLocation, Element semanticLink)

-	 *

-	 * @param cc

-	 *            the composite command that will contain the set of command to

-	 *            create the binary link

-	 * @param source

-	 *            source/target link node

-	 * @param point

-	 *            source/target node location

-	 */

-	private IAdaptable findAdapter(CompositeCommand cc, Element source, Point dropLocation, String edgeType) {

-		GraphicalEditPart editPart = (GraphicalEditPart) lookForEditPart(source);

-		if (editPart != null) {

-			return new SemanticAdapter(null, editPart.getModel());

-		}

-		ICommand createCommand = getDefaultDropNodeCommand(edgeType, dropLocation, source);

-		cc.add(createCommand);

-		return (IAdaptable) createCommand.getCommandResult().getReturnValue();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	protected EditPart lookForEditPart(EObject semantic) {

-		return lookForEditPart(semantic, false);

-	}

-

-	/**

-	 * Look for editPart from his semantic.

-	 *

-	 * @param semantic

-	 *            the semantic

-	 *

-	 * @return the edits the part or null if not found

-	 */

-	protected EditPart lookForEditPart(EObject semantic, boolean byType) {

-		Collection<EditPart> editPartSet = getHost().getViewer().getEditPartRegistry().values();

-		Iterator<EditPart> editPartIterator = editPartSet.iterator();

-		while (editPartIterator.hasNext()) {

-			EditPart nextEditPart = editPartIterator.next();

-			if (false == isEditPartTypeAdapted(nextEditPart.getClass(), semantic.eClass())) {

-				continue;

-			}

-			EObject nextSemantic = ((GraphicalEditPart) nextEditPart).resolveSemanticElement();

-			if (semantic.equals(nextSemantic)) {

-				return nextEditPart;

-			}

-			if (byType && nextSemantic instanceof TypedElement && ((TypedElement) nextSemantic).getType() != null) {

-				EObject nextSemanticType = ((TypedElement) nextSemantic).getType();

-				if (semantic.equals(nextSemanticType)) {

-					return nextEditPart;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Check if the edit part type is the best one to represent an object of the

-	 * given EClass type

-	 *

-	 * @param editPartClass

-	 *            the type of EditPart which may represent a semantic element

-	 * @param eClass

-	 *            the EClass type of the represented semantic element

-	 * @return true if an edit part of this type should be selected

-	 */

-	private boolean isEditPartTypeAdapted(Class<? extends EditPart> editPartClass, EClass eClass) {

-		if (DiagramEditPart.class.isAssignableFrom(editPartClass) || CompartmentEditPart.class.isAssignableFrom(editPartClass)) {

-			// the edit part is disqualified, as a compartment or a diagram can

-			// not be dropped

-			return false;

-		} else if (GraphicalEditPart.class.isAssignableFrom(editPartClass)) {

-			// check the edit part type against advised ones

-			return isEditPartTypeSuitableForEClass(editPartClass.asSubclass(GraphicalEditPart.class), eClass);

-		} else {

-			// only a GraphicalEditPart must be selected

-			return false;

-		}

-	}

-

-	/**

-	 * Check if an edit part type correctly represent a semantic element of the

-	 * given EClass. Subclasses should implement this method to restrict the

-	 * possibilities during drop of a link. If an edit part is not of a suitable

-	 * type, returning false will eliminate it to represent the element as a

-	 * source or target edit part. This can be used for example to disable label

-	 * edit parts, which may represent the same model element as the main node.

-	 *

-	 * @param editPartClass

-	 *            the type of EditPart which must be checked

-	 * @param eClass

-	 *            the EClass type of the element which the edit part must

-	 *            represent

-	 * @return the only edit part type which can be selected (return a common

-	 *         super type if several edit parts can be chosen)

-	 */

-	protected boolean isEditPartTypeSuitableForEClass(Class<? extends GraphicalEditPart> editPartClass, EClass eClass) {

-		return true;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageCreationEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageCreationEditPolicy.java
deleted file mode 100644
index 1f8e70776f3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageCreationEditPolicy.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;

-

-import java.util.Iterator;

-

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

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

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

-

-/**

- * this editpolicy allow graphical and semantic reparent for contained elements

- *

- */

-

-public class PackageCreationEditPolicy extends DefaultCreationEditPolicy {

-

-	/**

-	 * return a command to reparent both the semantic and view elements.

-	 *

-	 * @param request

-	 *            the request

-	 * @return command

-	 */

-	@Override

-	protected Command getReparentCommand(ChangeBoundsRequest request) {

-		Iterator<EditPart> editParts = request.getEditParts().iterator();

-		View container = (View) getHost().getAdapter(View.class);

-		EObject context = container == null ? null : ViewUtil.resolveSemanticElement(container);

-		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);

-		while (editParts.hasNext()) {

-			EditPart ep = editParts.next();

-			if (ep instanceof LabelEditPart) {

-				continue;

-			}

-			if (ep instanceof GroupEditPart) {

-				cc.compose(getReparentGroupCommand((GroupEditPart) ep));

-			}

-			View view = (View) ep.getAdapter(View.class);

-			if (view == null) {

-				continue;

-			}

-

-			EObject semantic = ViewUtil.resolveSemanticElement(view);

-			if (semantic == null) {

-				cc.compose(getReparentViewCommand((IGraphicalEditPart) ep));

-			}

-			else if (context != null && shouldReparent(semantic, context)) {

-				cc.compose(getReparentCommand((IGraphicalEditPart) ep));

-			}

-		}

-		return cc.isEmpty() ? null : new ICommandProxy(cc.reduce());

-	}

-

-

-	/**

-	 * change the order of the move, first graphical, then semantic to launch behavior about editservice {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getReparentCommand(IGraphicalEditPart gep) {

-		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);

-		View container = (View) getHost().getModel();

-		EObject context = ViewUtil.resolveSemanticElement(container);

-		View view = (View) gep.getModel();

-		EObject element = ViewUtil.resolveSemanticElement(view);

-

-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())

-				.getEditingDomain();

-		//

-		// notation

-		cc.compose(getReparentViewCommand(gep));

-		//

-		// semantic

-		if (element != null) {

-			Command moveSemanticCmd =

-					getHost().getCommand(

-							new EditCommandRequestWrapper(

-									new MoveRequest(editingDomain, context, element)));

-

-			if (moveSemanticCmd == null) {

-				return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-			}

-

-			cc.compose(new CommandProxy(moveSemanticCmd));

-		}

-

-		return cc;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageSemanticEditPolicy.java
deleted file mode 100644
index 22e33a294ef..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/PackageSemanticEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;

-

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

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

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

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

-import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * this editpolicy allow the move command between semantic element

- *

- */

-

-public class PackageSemanticEditPolicy extends DefaultSemanticEditPolicy {

-

-	/**

-	 * allow the move command between elements

-	 */

-	@Override

-	protected Command getMoveCommand(MoveRequest req) {

-		EObject targetCEObject = req.getTargetContainer();

-		if (targetCEObject != null) {

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

-			if (provider != null) {

-				ICommand moveCommand = provider.getEditCommand(req);

-				if (moveCommand != null) {

-					return new ICommandProxy(moveCommand);

-				}

-			}

-			return UnexecutableCommand.INSTANCE;

-		} else {

-			return getGEFWrapper(new MoveElementsCommand(req));

-		}

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java
deleted file mode 100644
index e01c58b962e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;

-

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

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.structure.DiagramStructure;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.part.SysMLDiagramUpdater;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.part.SysMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractUMLShowHideRelatedLinkEditPolicy;

-

-/**

- *

- * The edit policy to use in the IBD diagram to restore existing links

- *

- */

-public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLinkEditPolicy {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param host

-	 */

-	public ShowHideRelatedLinkEditPolicy(DiagramEditPart host) {

-		super(host);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramUpdater()

-	 *

-	 * @return

-	 */

-	public DiagramUpdater getDiagramUpdater() {

-		return SysMLDiagramUpdater.TYPED_INSTANCE;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramStructure()

-	 *

-	 * @return

-	 */

-	public DiagramStructure getDiagramStructure() {

-		return SysMLVisualIDRegistry.TYPED_INSTANCE;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#getSemanticHint(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param eobject

-	 * @return

-	 */

-	@Override

-	protected String getSemanticHint(final EObject eobject) {

-		return SysMLVisualIDRegistry.getLinkWithClassVisualID(eobject);

-	}

-

-	// /**

-	// *

-	// * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#cleanAdd(java.util.Collection,

-	// * org.eclipse.gmf.runtime.notation.View, java.util.List, java.util.Map)

-	// *

-	// * @param result

-	// * @param view

-	// * @param descriptors

-	// * @param domain2NotationMap

-	// */

-	// @Override

-	// protected void cleanAdd(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

-	// cleanAddForConnector(result, view, descriptors, domain2NotationMap);

-	// super.cleanAdd(result, view, descriptors, domain2NotationMap);

-	// }

-	//

-	// /**

-	// * This method manages descriptors representing Connector to verify that it

-	// * can be displayed according to the nestedPath of the {@link ConnectorEnd} If the connector can be displayed :

-	// * <ul>

-	// * <li>

-	// * the link descriptor is removed from descriptors and added to result</li>

-	// * <li>

-	// * the view associated to the role of the connector are added to domain2NotationMap (using the ConnectorEnd as key)</li>

-	// * </ul>

-	// *

-	// *

-	// *

-	// * @param result

-	// * the result of the method

-	// * @param view

-	// * a view

-	// * @param descriptors

-	// * the link descriptors

-	// * @param domain2NotationMap

-	// * the map between model element and views

-	// *

-	// *

-	// */

-	// protected void cleanAddForConnector(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

-	// final List<UpdaterLinkDescriptor> toRemove = new ArrayList<UpdaterLinkDescriptor>();

-	// for(final Object current : descriptors) {

-	// if(current instanceof UpdaterLinkDescriptor) {

-	// final UpdaterLinkDescriptor descriptor = (UpdaterLinkDescriptor)current;

-	// final EObject element = descriptor.getModelElement();

-	// if(element instanceof Connector) {

-	// if(canBeDisplayed((Connector)element, view, domain2NotationMap)) {

-	// result.add((UpdaterLinkDescriptor)current);

-	// }

-	// toRemove.add((UpdaterLinkDescriptor)current);

-	// }

-	// }

-	// }

-	// descriptors.removeAll(toRemove);

-	// }

-

-	// /**

-	// *

-	// * @param end

-	// * a connector end

-	// * @param view

-	// * a view

-	// * @return <code>true</code> if the view represents the role of the

-	// * connector AND if the view is encapsulated as required by the

-	// * nested path of the connector end

-	// */

-	// protected boolean isCorrectGraphicalView(final ConnectorEnd end, final View view) {

-	// final NestedConnectorEnd nestedConnectorEnd = org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(end, NestedConnectorEnd.class);

-	// final Property partWithPort = end.getPartWithPort();

-	// // final ConnectableElement role = end.getRole();

-	// // 1. we get the top view of this view with the same semantic element

-	// View localView = getTopViewWithSameSemanticElement(view);

-	//

-	// // 2. we verify the part with port

-	// if(partWithPort != null) {

-	// View parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(localView));

-	// if(parent.getElement() != partWithPort) {

-	// return false;

-	// }

-	// }

-	//

-	// // 3. we verify the nested path

-	// if(nestedConnectorEnd != null && nestedConnectorEnd.getPropertyPath().size() > 0) {

-	// View parent = view;

-	// final List<Property> paths = nestedConnectorEnd.getPropertyPath();

-	// for(int i = paths.size() - 1; i >= 0; i--) {

-	// final Property currentProperty = paths.get(i);

-	// parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(parent));

-	// if(parent.getElement() != currentProperty) {

-	// return false;

-	// }

-	// }

-	// }

-	// return true;

-	// }

-

-	// /**

-	// *

-	// * @param connector

-	// * a connector

-	// * @param selectedView

-	// * a view used as source or target for the connector to display

-	// * @param domain2NotationMap

-	// * the map to complete if we found source and target View on the

-	// * diagram to diplsay the connector

-	// * @return <code>true</code> if the view can be used as source/target for

-	// * the connector according to the nested path AND if we found a

-	// * second view for the 2nd connector end according to the nested

-	// * path

-	// */

-	// protected boolean canBeDisplayed(final Connector connector, final View selectedView, final Map<EObject, View> domain2NotationMap) {

-	// // we need to verify the selected view

-	// final EObject semanticElement = selectedView.getElement();

-	// ConnectorEnd endForView = null;

-	//

-	// // 1. look for the connector end represented by the selected view

-	// for(final ConnectorEnd current : connector.getEnds()) {

-	// if(current.getRole() == semanticElement) {

-	// endForView = current;

-	// break;

-	// }

-	// }

-	// Assert.isNotNull(endForView);

-	// // 2. verify the view of the selected connector end

-	// if(!isCorrectGraphicalView(endForView, selectedView)) {

-	// return false;

-	// }

-	//

-	// // 3. try to find a view for the second connector end

-	// View secondView = null;

-	// for(final ConnectorEnd end : connector.getEnds()) {

-	// final ConnectableElement role = end.getRole();

-	// if(role==null){

-	// return false;

-	// }

-	// if(end == endForView) {

-	// continue;

-	// }

-	//

-	// final Set<View> views = CrossReferencerUtil.getCrossReferencingViewsInDiagram(role, getCurrentDiagram());

-	// final Iterator<View> iterOnView = views.iterator();

-	// while(secondView == null && iterOnView.hasNext()) {

-	// final View currentView = iterOnView.next();

-	// if(isCorrectGraphicalView(end, currentView)) {

-	// domain2NotationMap.put(endForView, selectedView);

-	// domain2NotationMap.put(end, currentView);

-	// secondView = currentView;

-	// }

-	// }

-	// }

-	// return secondView != null;

-	// }

-

-	// /**

-	// *

-	// * @param domain

-	// * the editing domain to use for this command

-	// * @param linkToShow

-	// * a link to show

-	// * @param domain2NotationMap

-	// * @param linkDescriptors

-	// * @return the command to display the link on the diagram

-	// */

-	// protected ICommand getShowLinkCommand(final TransactionalEditingDomain domain, final EObject linkToShow, final Map<EObject, View> domain2NotationMap, final Collection<? extends UpdaterLinkDescriptor> linkDescriptors) {

-	// if(!(linkToShow instanceof Connector)) {

-	// return super.getShowLinkCommand(domain, linkToShow, domain2NotationMap, linkDescriptors);

-	// }

-	// mapModel((View)getHost().getAdapter(View.class), domain2NotationMap);

-	// final View view = domain2NotationMap.get(linkToShow);

-	// if(view != null) {

-	//			return new SetPropertyCommand(domain, "Restore related linksCommand show view", new EObjectAdapter(view), Properties.ID_ISVISIBLE, Boolean.TRUE);//$NON-NLS-1$

-	// } else {// we need to recreate the view

-	//

-	// // we look for the link descriptor

-	// UpdaterLinkDescriptor descriptor = getLinkDescriptor(linkToShow, linkDescriptors);

-	//

-	// if(descriptor != null) {

-	// // we override the way to find the source and the target edit

-	// // part

-	// EditPart sourceEditPart = getEditPart(((Connector)linkToShow).getEnds().get(0), domain2NotationMap);

-	// EditPart targetEditPart = getEditPart(((Connector)linkToShow).getEnds().get(1), domain2NotationMap);

-	//

-	// // If the parts are still null...

-	// if(sourceEditPart == null || targetEditPart == null) {

-	// return null;

-	// }

-	// String semanticHint = getSemanticHint(linkToShow);

-	// CreateConnectionViewRequest.ConnectionViewDescriptor viewDescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(descriptor.getSemanticAdapter(), semanticHint, ViewUtil.APPEND, false,

-	// ((GraphicalEditPart)getHost()).getDiagramPreferencesHint());

-	// CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(viewDescriptor);

-	// ccr.setType(RequestConstants.REQ_CONNECTION_START);

-	// ccr.setSourceEditPart(sourceEditPart);

-	// sourceEditPart.getCommand(ccr);

-	// ccr.setTargetEditPart(targetEditPart);

-	// ccr.setType(RequestConstants.REQ_CONNECTION_END);

-	// return new CommandProxy(targetEditPart.getCommand(ccr));

-	// }

-	// }

-	// return null;

-	// }

-

-	// /**

-	// *

-	// * @param view

-	// * a view

-	// * @return the last parent of this view referencing the same semantic

-	// * element

-	// */

-	// protected View getTopViewWithSameSemanticElement(final View view) {

-	// final EObject semanticElement = view.getElement();

-	// View parent = view;

-	// View lastParent = view;

-	// while(parent.getElement() == semanticElement) {

-	// lastParent = parent;

-	// parent = (View)parent.eContainer();

-	// }

-	// return lastParent;

-	// }

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/handler/BlockDefinitionManageInterfacesHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/handler/BlockDefinitionManageInterfacesHandler.java
deleted file mode 100644
index 066c614b211..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/handler/BlockDefinitionManageInterfacesHandler.java
+++ /dev/null
@@ -1,38 +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:
- *	Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.handler;
-
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.ui.BlockDefinitionInterfaceManagerDialog;
-import org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler;
-import org.eclipse.papyrus.uml.diagram.common.dialogs.InterfaceManagerDialog;
-import org.eclipse.uml2.uml.Port;
-
-/**
- * Manage Interface handler for Block Definition diagram.
- *
- * @author Gabriel Pascual
- */
-public class BlockDefinitionManageInterfacesHandler extends ManagePortInterfacesHandler {
-
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler#getInterfaceManagerDialog(org.eclipse.uml2.uml.Port)
-	 *
-	 * @param port
-	 * @return
-	 */
-	@Override
-	public InterfaceManagerDialog getInterfaceManagerDialog(Port port) {
-		return new BlockDefinitionInterfaceManagerDialog(DisplayUtils.getDefaultShell(), port);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringBlockDeleteHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringBlockDeleteHelperAdvice.java
deleted file mode 100644
index d5b25148ceb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringBlockDeleteHelperAdvice.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

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

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

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;

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

-

-/**

- * <pre>

- * Edit helper advice that delete Part or Reference views from diagram when its type (Block) is deleted.

- * @unused - The Part or Ref are deleted when their Block type is deleted (done in Service Edit).

- * </pre>

- */

-public class DeleteViewDuringBlockDeleteHelperAdvice extends AbstractEditHelperAdvice {

-

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-

-

-		EObject elementToEdit = request.getElementToDestroy();

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		// Get all Part or Reference typed by this deleted Block

-		Iterator<?> references = EMFCoreUtil.getReferencers(elementToEdit, new EReference[] { UMLPackage.eINSTANCE.getTypedElement_Type() }).iterator();

-		while (references.hasNext()) {

-			Object current = references.next();

-

-			if (!(current instanceof EObject)) {

-				continue;

-			}

-

-			EObject property = (EObject) current;

-

-			// Search inconsistent views if the reference is a Part or a Reference

-			if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(property)) {

-				viewsToDestroy.addAll(getPartViewsToDestroy(property));

-			}

-			if (((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(property)) {

-				viewsToDestroy.addAll(getReferenceViewsToDestroy(property));

-			}

-		}

-

-		if (!(viewsToDestroy.isEmpty())) {

-			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

-			req.setClientContext(request.getClientContext());

-			req.addParameters(request.getParameters());

-			return req.getDestroyDependentsCommand(viewsToDestroy);

-		}

-

-		return super.getBeforeDestroyDependentsCommand(request);

-	}

-

-	/**

-	 * This methods looks for inconsistent Part views to delete.

-	 *

-	 * @param modifiedObject

-	 *            the modified {@link EObject}

-	 * @return the list of {@link View} to delete

-	 */

-	private Set<View> getPartViewsToDestroy(EObject modifiedObject) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while (viewIt.hasNext()) {

-			View view = viewIt.next();

-

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

-

-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {

-				viewsToDestroy.add(view);

-			}

-		}

-

-		return viewsToDestroy;

-	}

-

-	/**

-	 * This methods looks for inconsistent Reference views to delete.

-	 *

-	 * @param modifiedObject

-	 *            the modified {@link EObject}

-	 * @return the list of {@link View} to delete

-	 */

-	private Set<View> getReferenceViewsToDestroy(EObject modifiedObject) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while (viewIt.hasNext()) {

-			View view = viewIt.next();

-

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

-

-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {

-				viewsToDestroy.add(view);

-			}

-		}

-

-		return viewsToDestroy;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringDataTypeDeleteHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringDataTypeDeleteHelperAdvice.java
deleted file mode 100644
index 33c6cbcf8b0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringDataTypeDeleteHelperAdvice.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

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

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

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;

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

-

-/**

- * <pre>

- * Edit helper advice that delete Part or Reference views from diagram when its type (Block) is deleted.

- * </pre>

- */

-public class DeleteViewDuringDataTypeDeleteHelperAdvice extends AbstractEditHelperAdvice {

-

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-

-

-		EObject elementToEdit = request.getElementToDestroy();

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		// Get all Value (property) typed by this deleted DataType

-		Iterator<?> references = EMFCoreUtil.getReferencers(elementToEdit, new EReference[] { UMLPackage.eINSTANCE.getTypedElement_Type() }).iterator();

-		while (references.hasNext()) {

-			Object current = references.next();

-

-			if (!(current instanceof EObject)) {

-				continue;

-			}

-

-			EObject property = (EObject) current;

-

-			// Search inconsistent views if the property is a Value

-			if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(property)) {

-				viewsToDestroy.addAll(getValueViewsToDestroy(property));

-			}

-		}

-

-		if (!(viewsToDestroy.isEmpty())) {

-			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

-			req.setClientContext(request.getClientContext());

-			req.addParameters(request.getParameters());

-			return req.getDestroyDependentsCommand(viewsToDestroy);

-		}

-

-		return super.getBeforeDestroyDependentsCommand(request);

-	}

-

-	/**

-	 * This methods looks for inconsistent Value views to delete.

-	 *

-	 * @param modifiedObject

-	 *            the modified {@link EObject}

-	 * @return the list of {@link View} to delete

-	 */

-	private Set<View> getValueViewsToDestroy(EObject modifiedObject) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while (viewIt.hasNext()) {

-			View view = viewIt.next();

-

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

-

-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {

-				viewsToDestroy.add(view);

-			}

-		}

-

-		return viewsToDestroy;

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringMoveHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringMoveHelperAdvice.java
deleted file mode 100644
index e9776b3c03d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringMoveHelperAdvice.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-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.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.command.CustomDeleteCommand;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;

-

-/**

- * <pre>

- * Edit helper advice that delete views from diagram when an element is

- * moved in a new container (in the model explorer).

- * this is a post advice

- * </pre>

- */

-public class DeleteViewDuringMoveHelperAdvice extends AbstractEditHelperAdvice {

-

-

-	@Override

-	protected ICommand getAfterMoveCommand(MoveRequest request) {

-

-		ICommand moveCommand = super.getBeforeMoveCommand(request);

-

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		@SuppressWarnings("unchecked")

-		Iterator<EObject> it = request.getElementsToMove().keySet().iterator();

-		while (it.hasNext()) {

-			EObject eObject = it.next();

-			viewsToDestroy.addAll(getViewsToDestroy(eObject));

-		}

-		Iterator<View> viewToDestroyIterator = viewsToDestroy.iterator();

-		while (viewToDestroyIterator.hasNext()) {

-			View view = viewToDestroyIterator.next();

-			CustomDeleteCommand destroyViewsCommand = new CustomDeleteCommand(request.getEditingDomain(), view);

-			moveCommand = CompositeCommand.compose(moveCommand, destroyViewsCommand);

-		}

-

-		return moveCommand;

-	}

-

-	/**

-	 * This methods looks for inconsistent views to delete in case a semantic move done in the model explorer.

-	 *

-	 * @param movedObject

-	 *            the moved {@link EObject}

-	 * @return the list of {@link View} to delete

-	 */

-	protected Set<View> getViewsToDestroy(EObject movedObject) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(movedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while (viewIt.hasNext()) {

-			View view = viewIt.next();

-

-			// Views are to be destroyed if they are not the diagram itself (containerType == null)

-			// and not a view directly owned by the diagram (the current policy in Papyrus allows

-			// to drop nearly anything in the diagram whatever the semantic container).

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

-			if ((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {

-				viewsToDestroy.add(view);

-			}

-		}

-

-

-		return viewsToDestroy;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringPartEditHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringPartEditHelperAdvice.java
deleted file mode 100644
index 84a21d88993..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringPartEditHelperAdvice.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-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.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;

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

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

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

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

-

-/**

- * <pre>

- * Edit helper advice that delete Part views from diagram when its aggregation kind

- * is modified and turns it into Reference.

- * </pre>

- */

-public class DeleteViewDuringPartEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	@Override

-	protected ICommand getBeforeSetCommand(SetRequest request) {

-

-		ICommand setCommand = super.getBeforeSetCommand(request);

-

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		// Get modified object and retrieve inconsistent view

-		EObject modifiedObject = request.getElementToEdit();

-		if ((modifiedObject != null) && (modifiedObject instanceof Property)

-				&& (request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation())

-				&& (request.getValue() != AggregationKind.COMPOSITE_LITERAL)) {

-

-			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

-		}

-

-		if ((modifiedObject != null) && (modifiedObject instanceof Property)

-				&& (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type())

-				&& (request.getValue() instanceof Type)

-				&& !((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue())) {

-

-			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

-		}

-

-		if (!viewsToDestroy.isEmpty()) {

-			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getElementToEdit(), false);

-			ddr.setClientContext(request.getClientContext());

-			ddr.addParameters(request.getParameters());

-			ICommand destroyViewsCommand = ddr.getDestroyDependentsCommand(viewsToDestroy);

-			setCommand = CompositeCommand.compose(setCommand, destroyViewsCommand);

-		}

-

-		return setCommand;

-	}

-

-	/**

-	 * This methods looks for inconsistent views to delete in case a Part aggregation kind changes.

-	 *

-	 * @param modifiedObject

-	 *            the modified {@link EObject}

-	 * @return the list of {@link View} to delete

-	 */

-	protected Set<View> getViewsToDestroy(EObject modifiedObject) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while (viewIt.hasNext()) {

-			View view = viewIt.next();

-

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

-

-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID.equals(containerType)) {

-				viewsToDestroy.add(view);

-			}

-		}

-

-		return viewsToDestroy;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringReferenceEditHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringReferenceEditHelperAdvice.java
deleted file mode 100644
index cf2686deae2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringReferenceEditHelperAdvice.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-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.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;

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

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

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

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

-

-/**

- * <pre>

- * Edit helper advice that delete Reference views from diagram when its aggregation kind

- * is modified and turns it into Part.

- * </pre>

- */

-public class DeleteViewDuringReferenceEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	@Override

-	protected ICommand getBeforeSetCommand(SetRequest request) {

-

-		ICommand setCommand = super.getBeforeSetCommand(request);

-

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		// Get modified object and retrieve inconsistent view

-		EObject modifiedObject = request.getElementToEdit();

-		if ((modifiedObject != null) && (modifiedObject instanceof Property)

-				&& (request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation())

-				&& (request.getValue() == AggregationKind.COMPOSITE_LITERAL)) {

-

-			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

-		}

-

-		if ((modifiedObject != null) && (modifiedObject instanceof Property)

-				&& (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type())

-				&& (request.getValue() instanceof Type)

-				&& !((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue())) {

-

-			viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

-		}

-

-		if (!viewsToDestroy.isEmpty()) {

-			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getElementToEdit(), false);

-			ddr.setClientContext(request.getClientContext());

-			ddr.addParameters(request.getParameters());

-			ICommand destroyViewsCommand = ddr.getDestroyDependentsCommand(viewsToDestroy);

-			setCommand = CompositeCommand.compose(setCommand, destroyViewsCommand);

-		}

-

-		return setCommand;

-	}

-

-	/**

-	 * This methods looks for inconsistent views to delete in case a Reference aggregation kind changes.

-	 *

-	 * @param modifiedObject

-	 *            the modified {@link EObject}

-	 * @return the list of {@link View} to delete

-	 */

-	protected Set<View> getViewsToDestroy(EObject modifiedObject) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while (viewIt.hasNext()) {

-			View view = viewIt.next();

-

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

-

-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID.equals(containerType)) {

-				viewsToDestroy.add(view);

-			}

-		}

-

-		return viewsToDestroy;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringValueEditHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringValueEditHelperAdvice.java
deleted file mode 100644
index 59ddc93a096..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/DeleteViewDuringValueEditHelperAdvice.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-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.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;

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

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

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

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

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

-

-/**

- * <pre>

- * Edit helper advice that delete Value views from diagram when its aggregation kind

- * is modified, or when the type is set to anything but DataType or ValueType.

- * </pre>

- */

-public class DeleteViewDuringValueEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	@Override

-	protected ICommand getBeforeSetCommand(SetRequest request) {

-

-		ICommand setCommand = super.getBeforeSetCommand(request);

-

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		// Get modified object and retrieve inconsistent view

-		EObject modifiedObject = request.getElementToEdit();

-		if ((modifiedObject != null) && (modifiedObject instanceof Property) && !(modifiedObject instanceof Port)) {

-

-			// Aggregation modified

-			if ((request.getFeature() == UMLPackage.eINSTANCE.getProperty_Aggregation()) && (request.getValue() != AggregationKind.COMPOSITE_LITERAL)) {

-				viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

-			}

-

-			// Type modified

-			if ((request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (request.getValue() != modifiedObject.eGet(UMLPackage.eINSTANCE.getTypedElement_Type()))) {

-

-				EObject newType = (request.getValue() instanceof EObject) ? (EObject) request.getValue() : null;

-				if ((newType == null) || !(newType instanceof DataType)) {

-					viewsToDestroy.addAll(getViewsToDestroy(modifiedObject));

-				}

-

-			}

-		}

-

-		if (!viewsToDestroy.isEmpty()) {

-			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getElementToEdit(), false);

-			ddr.setClientContext(request.getClientContext());

-			ddr.addParameters(request.getParameters());

-			ICommand destroyViewsCommand = ddr.getDestroyDependentsCommand(viewsToDestroy);

-			setCommand = CompositeCommand.compose(setCommand, destroyViewsCommand);

-		}

-

-		return setCommand;

-	}

-

-	/**

-	 * This methods looks for inconsistent views to delete in case a Reference aggregation kind changes.

-	 *

-	 * @param modifiedObject

-	 *            the modified {@link EObject}

-	 * @return the list of {@link View} to delete

-	 */

-	protected Set<View> getViewsToDestroy(EObject modifiedObject) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(modifiedObject, ElementTypes.DIAGRAM_ID).iterator();

-		while (viewIt.hasNext()) {

-			View view = viewIt.next();

-

-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;

-

-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID.equals(containerType)) {

-				viewsToDestroy.add(view);

-			}

-		}

-

-		return viewsToDestroy;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationHelperAdvice.java
deleted file mode 100644
index 538a2971198..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/helper/advice/GeneralizationHelperAdvice.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *		Fanch Bonnabesse (ALL4TEC) fanch.bonnabesse@alltec.net - Bug 481317
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.helper.advice;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
-import org.eclipse.papyrus.uml.diagram.common.util.GeneralizationUtil;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Generalization;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * <pre>
- * This HelperAdvice completes {@link Generalization} edit commands with diagram specific
- * commands in order to remove inconsistent views (e.g. inherited Port or Property
- * in case a {@link Generalization} is deleted or re-oriented.
- * </pre>
- */
-public class GeneralizationHelperAdvice extends AbstractEditHelperAdvice {
-
-	@Override
-	protected ICommand getBeforeReorientRelationshipCommand(ReorientRelationshipRequest request) {
-
-		// The list of member views becoming inconsistent after re-orient that should be deleted.
-		Set<View> viewsToDestroy = new HashSet<View>();
-
-		if (request.getRelationship() instanceof Generalization) {
-			viewsToDestroy.addAll(getMemberViewsToDestroy((Generalization) request.getRelationship()));
-		}
-
-		// return the command to destroy all these views
-		if (!viewsToDestroy.isEmpty()) {
-
-			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getRelationship(), false);
-			ddr.setClientContext(request.getClientContext());
-			ddr.addParameters(request.getParameters());
-			return ddr.getDestroyDependentsCommand(viewsToDestroy);
-
-		}
-		return null;
-	}
-
-	@Override
-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
-
-		EObject destructee = request.getElementToDestroy();
-
-		Set<View> viewsToDestroy = new HashSet<View>();
-
-		if (destructee instanceof Generalization) {
-			viewsToDestroy = getMemberViewsToDestroy((Generalization) destructee);
-		}
-
-		// return the command to destroy all these views
-		if (!viewsToDestroy.isEmpty()) {
-			return request.getDestroyDependentsCommand(viewsToDestroy);
-		}
-		return null;
-	}
-
-	/**
-	 * This methods looks for inconsistent views to delete in case the generalization is deleted or
-	 * re-oriented.
-	 *
-	 * @param generalization
-	 *            the modified generalization
-	 * @return the list of {@link View} to delete
-	 */
-	protected Set<View> getMemberViewsToDestroy(Generalization generalization) {
-		Set<View> viewsToDestroy = new HashSet<View>();
-
-		Classifier general = generalization.getGeneral();
-		if (general != null) {
-
-			// Parse members
-			EList<NamedElement> members = general.getMembers();
-			for (NamedElement member : members) {
-
-				// Find Views in Composite Structure Diagram that are referencing current member
-				Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(member, ElementTypes.DIAGRAM_ID).iterator();
-				while (viewIt.hasNext()) {
-					View view = viewIt.next();
-
-					// Test if current view (member) is concerned by the deletion (re-orientation) of the generalization
-					GeneralizationUtil util = new GeneralizationUtil();
-					if (util.isConcernedByGeneralizationChanges(generalization, view)) {
-						viewsToDestroy.add(view);
-					}
-				}
-			}
-		}
-
-		return viewsToDestroy;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/messages/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/messages/Messages.java
deleted file mode 100644
index 17c30bc30ae..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/messages/Messages.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	public static String Notification_Drop_Title;
-
-	public static String Notification_Drop_UMLAssociationWarning;
-
-	static {
-		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
-	}
-
-	private Messages() {
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconciler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconciler.java
deleted file mode 100644
index 131f71f3343..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/migration/BDDReconciler.java
+++ /dev/null
@@ -1,81 +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:

- *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.migration;

-

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

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

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

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-

-/**

- * Block Definition Diagram Reconciler from 0.9.1 to 1.0.0

- */

-public class BDDReconciler extends DiagramReconciler {

-

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		return new BDDReconcileCommand(diagram);

-	}

-

-	/**

-	 * change the root to the parent (Package), because BBD root can't be a Block see

-	 * #439094

-	 */

-	protected class BDDReconcileCommand extends AbstractCommand {

-

-		protected final Diagram diagram;

-

-		public BDDReconcileCommand(Diagram diagram) {

-			super("Migrate BDD Diagram");

-			this.diagram = diagram;

-		}

-

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			EObject element = diagram.getElement();

-			if (element instanceof org.eclipse.uml2.uml.Class) { // Block

-				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class) element;

-				diagram.setElement(clazz.getNearestPackage());

-				DiagramUtils.setOwner(diagram, element);

-			}

-			return CommandResult.newOKCommandResult();

-		}

-

-		@Override

-		public boolean canUndo() {

-			return false;

-		}

-

-		@Override

-		public boolean canRedo() {

-			return false;

-		}

-

-		@Override

-		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			throw new ExecutionException("Should not be called, canRedo false");

-		}

-

-		@Override

-		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			throw new ExecutionException("Should not be called, canUndo false");

-		}

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
deleted file mode 100644
index 609e8f500b5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
+++ /dev/null
@@ -1,1305 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *      Christian W. Damus (CEA) - bug 410909
- *      Fanch Bonnabesse (ALL4TEC) fanch.bonnabesse@alltec.net - Bug 480510
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.part;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.UpdaterLinkDescriptor;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLLinkDescriptor;
-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.BehavioredClassifier;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.Generalization;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Reception;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.Usage;
-
-
-/**
- *
- * @author vl222926
- *         Adapted code from generated code for UML Diagram
- *         The name of the methods are not java compliant, but it is done to be consistent with the generated classes which use the id of the elements
- */
-public class SysMLDiagramUpdater {
-
-	/**
-	 * @generated
-	 */
-	public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {
-
-		/**
-		 *
-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getSemanticChildren(org.eclipse.gmf.runtime.notation.View)
-		 *
-		 * @param view
-		 * @return
-		 */
-		public List<UpdaterLinkDescriptor> getSemanticChildren(View view) {
-			return SysMLDiagramUpdater.getSemanticChildren(view);
-		}
-
-		/**
-		 *
-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getContainedLinks(org.eclipse.gmf.runtime.notation.View)
-		 *
-		 * @param view
-		 * @return
-		 */
-		public List<UpdaterLinkDescriptor> getContainedLinks(View view) {
-			return SysMLDiagramUpdater.getContainedLinks(view);
-		}
-
-		/**
-		 *
-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getIncomingLinks(org.eclipse.gmf.runtime.notation.View)
-		 *
-		 * @param view
-		 * @return
-		 */
-		public List<UpdaterLinkDescriptor> getIncomingLinks(View view) {
-			return SysMLDiagramUpdater.getIncomingLinks(view);
-		}
-
-		/**
-		 *
-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getOutgoingLinks(org.eclipse.gmf.runtime.notation.View)
-		 *
-		 * @param view
-		 * @return
-		 */
-		public List<UpdaterLinkDescriptor> getOutgoingLinks(View view) {
-			return SysMLDiagramUpdater.getOutgoingLinks(view);
-		}
-	};
-
-	public static List<UpdaterLinkDescriptor> getContainedLinks(final View view) {
-		throw new UnsupportedOperationException("Not yet implemented"); //$NON-NLS-1$
-	}
-
-	public static List<UpdaterLinkDescriptor> getSemanticChildren(final View view) {
-		throw new UnsupportedOperationException("Not yet implemented"); //$NON-NLS-1$
-	}
-
-	/**
-	 *
-	 * @param view
-	 *            a view
-	 * @return
-	 * 		the list of the incoming links for this view
-	 */
-	public static List<UpdaterLinkDescriptor> getIncomingLinks(final View view) {
-		final String id = view.getType();
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {
-			return getBlock_shape_sysml_block_as_classifier_IncomingLink(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {
-			return getAssociation_link_sysml_association_IncomingLink(view);
-		}
-		if (id.equals(PackageEditPart.VISUAL_ID) || id.equals(PackageEditPartCN.VISUAL_ID)) {
-			return getPackage_Shape_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {
-			return getActor_shape_uml_actor_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {
-			return getSignal_shape_uml_signal_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {
-			return getProperty_shape_uml_property_as_label_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {
-			return getPart_shape_sysml_part_as_label_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {
-			return getReference_shape_sysml_reference_as_label_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {
-			return getValue_shape_sysml_value_as_label_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {
-			return getOperation_shape_uml_operation_as_label_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {
-			return getReception_shape_uml_reception_as_label_IncomingLinks(view);
-		}
-		if (id.equals(InstanceSpecificationEditPart.VISUAL_ID) || id.equals(InstanceSpecificationEditPartCN.VISUAL_ID)) {
-			return getInstanceSpecification_Shape_IncomingLinks(view);
-		}
-		if (id.equals(SlotEditPart.VISUAL_ID)) {
-			return getSlot_SlotLabel_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {
-			return getDependency_link_uml_dependency_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {
-			return getGeneralization_link_uml_generalization_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {
-			return getPort_shape_uml_port_as_label_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {
-			return getFlowPort_shape_sysml_flowport_as_label_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {
-			return getPort_shape_uml_port_as_affixed_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {
-			return getFlowPort_shape_sysml_flowport_as_affixed_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {
-			return getFlowSpecification_shape_sysml_flowspecification_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {
-			return getInterface_shape_uml_interface_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {
-			return getFlowProperty_shape_sysml_flowproperty_as_label_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {
-			return getInterfaceRealization_link_uml_interfacerealization_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {
-			return getUsage_link_uml_usage_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {
-			return getDataType_shape_uml_data_type_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {
-			return getEnumeration_shape_uml_enumeration_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {
-			return getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {
-			return getPrimitiveType_shape_uml_primitivetype_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {
-			return getDimension_shape_sysml_dimension_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {
-			return getUnit_shape_sysml_unit_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {
-			return getValueType_shape_sysml_valuetype_as_classifier_IncommingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {
-			return getConstraintBlock_shape_sysml_constraintblock_as_classifier_IncomingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {
-			return getConstraintProperty_shape_sysml_constraintproperty_as_label_IncomingLinks(view);
-		}
-		if (id.equals(CommentEditPart.VISUAL_ID) || id.equals(CommentEditPartCN.VISUAL_ID)) {
-			return getComment_IncominkLinks(view);
-		}
-		if (id.equals(ConstraintEditPart.VISUAL_ID) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {
-			return getConstraint_IncomingLinks(view);
-		}
-
-		return Collections.emptyList();
-	}
-
-
-
-
-
-	/**
-	 *
-	 * @param view
-	 *            a view
-	 * @return
-	 * 		the list of the outgoing links for this view
-	 */
-	public static List<UpdaterLinkDescriptor> getOutgoingLinks(final View view) {
-		final String id = view.getType();
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {
-			return getBlock_shape_sysml_block_as_classifier_OutgoingLink(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {
-			return getAssociation_link_sysml_association_OutgoingLink(view);
-		}
-		if (id.equals(PackageEditPart.VISUAL_ID) || id.equals(PackageEditPartCN.VISUAL_ID)) {
-			return getPackage_Shape_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {
-			return getActor_shape_uml_actor_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {
-			return getSignal_shape_uml_signal_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {
-			return getProperty_shape_uml_property_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {
-			return getPart_shape_sysml_part_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {
-			return getReference_shape_sysml_reference_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {
-			return getValue_shape_sysml_value_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {
-			return getOperation_shape_uml_operation_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {
-			return getReception_shape_uml_reception_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(InstanceSpecificationEditPart.VISUAL_ID) || id.equals(InstanceSpecificationEditPartCN.VISUAL_ID)) {
-			return getInstanceSpecification_Shape_OutgoingLinks(view);
-		}
-		if (id.equals(SlotEditPart.VISUAL_ID)) {
-			return getSlot_SlotLabel_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {
-			return getDependency_link_uml_dependency_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {
-			return getGeneralization_link_uml_generalization_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {
-			return getPort_shape_uml_port_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {
-			return getFlowPort_shape_sysml_flowport_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {
-			return getPort_shape_uml_port_as_affixed_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {
-			return getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {
-			return getFlowSpecification_shape_sysml_flowspecification_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {
-			return getInterface_shape_uml_interface_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {
-			return getFlowProperty_shape_sysml_flowproperty_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {
-			return getInterfaceRealization_link_uml_interfacerealization_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {
-			return getUsage_link_uml_usage_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {
-			return getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {
-			return getEnumeration_shape_uml_enumeration_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {
-			return getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {
-			return getPrimitiveType_shape_uml_primitivetype_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {
-			return getDimension_shape_sysml_dimension_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {
-			return getUnit_shape_sysml_unit_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {
-			return getValueType_shape_sysml_valuetype_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {
-			return getConstraintBlock_shape_sysml_constraintblock_as_classifier_OutgoingLinks(view);
-		}
-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {
-			return getConstraintProperty_shape_sysml_constraintproperty_as_label_OutgoingLinks(view);
-		}
-		if (id.equals(CommentEditPart.VISUAL_ID) || id.equals(CommentEditPartCN.VISUAL_ID)) {
-			return getComment_OutgoingLinks(view);
-		}
-		if (id.equals(ConstraintEditPart.VISUAL_ID) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {
-			return getConstraint_OutgoingLinks(view);
-		}
-		return Collections.emptyList();
-	}
-
-	private static List<UpdaterLinkDescriptor> getConstraint_IncomingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getConstraint_OutgoingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getComment_IncominkLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getComment_OutgoingLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getConstraintProperty_shape_sysml_constraintproperty_as_label_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getConstraintProperty_shape_sysml_constraintproperty_as_label_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getConstraintBlock_shape_sysml_constraintblock_as_classifier_IncomingLinks(View view) {
-		return getBlock_shape_sysml_block_as_classifier_IncomingLink(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getConstraintBlock_shape_sysml_constraintblock_as_classifier_OutgoingLinks(View view) {
-		return getBlock_shape_sysml_block_as_classifier_OutgoingLink(view);
-	}
-
-
-
-
-	private static List<UpdaterLinkDescriptor> getValueType_shape_sysml_valuetype_as_classifier_IncommingLinks(View view) {
-		return getDataType_shape_uml_data_type_as_classifier_IncomingLinks(view);
-	}
-
-
-	private static List<UpdaterLinkDescriptor> getValueType_shape_sysml_valuetype_as_classifier_OutgoingLinks(View view) {
-		return getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getDimension_shape_sysml_dimension_as_classifier_OutgoingLinks(View view) {
-		return getInstanceSpecification_Shape_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getDimension_shape_sysml_dimension_as_classifier_IncomingLinks(View view) {
-		return getInstanceSpecification_Shape_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getUnit_shape_sysml_unit_as_classifier_OutgoingLinks(View view) {
-		return getInstanceSpecification_Shape_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getUnit_shape_sysml_unit_as_classifier_IncomingLinks(View view) {
-		return getInstanceSpecification_Shape_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getPrimitiveType_shape_uml_primitivetype_as_classifier_IncomingLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getPrimitiveType_shape_uml_primitivetype_as_classifier_OutgoingLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		return result;
-	}
-
-
-
-	private static List<UpdaterLinkDescriptor> getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_IncomingLinks(View view) {
-		EnumerationLiteral modelElement = (EnumerationLiteral) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_OutgoingLinks(View view) {
-		EnumerationLiteral modelElement = (EnumerationLiteral) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getEnumeration_shape_uml_enumeration_as_classifier_IncomingLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getEnumeration_shape_uml_enumeration_as_classifier_OutgoingLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getDataType_shape_uml_data_type_as_classifier_IncomingLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getUsage_link_uml_usage_IncomingLinks(View view) {
-		Usage modelElement = (Usage) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getUsage_link_uml_usage_OutgoingLinks(View view) {
-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getInterfaceRealization_link_uml_interfacerealization_IncomingLinks(View view) {
-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getInterfaceRealization_link_uml_interfacerealization_OutgoingLinks(View view) {
-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowProperty_shape_sysml_flowproperty_as_label_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowProperty_shape_sysml_flowproperty_as_label_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getInterface_shape_uml_interface_as_classifier_IncomingLinks(View view) {
-		return getInterface_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getInterface_shape_uml_interface_as_classifier_OutgoingLinks(View view) {
-		return getInterface_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowSpecification_shape_sysml_flowspecification_as_classifier_IncomingLinks(View view) {
-		return getInterface_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowSpecification_shape_sysml_flowspecification_as_classifier_OutgoingLinks(View view) {
-		return getInterface_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getInterface_IncomingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getInterface_OutgoingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_affixed_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_affixed_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_affixed_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_label_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_label_OutgoingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_label_IncomingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_label_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_IncomingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_OutgoingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getGeneralization_link_uml_generalization_IncomingLinks(View view) {
-		Generalization modelElement = (Generalization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getGeneralization_link_uml_generalization_OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	private static List<UpdaterLinkDescriptor> getSlot_SlotLabel_IncomingLinks(View view) {
-		Slot modelElement = (Slot) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getSlot_SlotLabel_OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	private static List<UpdaterLinkDescriptor> getInstanceSpecification_Shape_IncomingLinks(View view) {
-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getInstanceSpecification_Shape_OutgoingLinks(View view) {
-		InstanceSpecification modelElement = (InstanceSpecification) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getReception_shape_uml_reception_as_label_IncomingLinks(View view) {
-		Reception modelElement = (Reception) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getReception_shape_uml_reception_as_label_OutgoingLinks(View view) {
-		Reception modelElement = (Reception) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getOperation_shape_uml_operation_as_label_IncomingLinks(View view) {
-		Operation modelElement = (Operation) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getOperation_shape_uml_operation_as_label_OutgoingLinks(View view) {
-		Operation modelElement = (Operation) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-
-	private static List<UpdaterLinkDescriptor> getValue_shape_sysml_value_as_label_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getValue_shape_sysml_value_as_label_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getReference_shape_sysml_reference_as_label_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getReference_shape_sysml_reference_as_label_OutgoingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getPart_shape_sysml_part_as_label_IncomingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getPart_shape_sysml_part_as_label_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getProperty_shape_uml_property_as_label_IncomingLinks(View view) {
-		return getProperty_IncomingLinks(view);
-	}
-
-	private static List<UpdaterLinkDescriptor> getProperty_shape_uml_property_as_label_OutgoingLinks(View view) {
-		return getProperty_OutgoingLinks(view);
-	}
-
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(Interface target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract() || false == setting.getEObject() instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) setting.getEObject();
-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			if (false == link.eContainer() instanceof BehavioredClassifier) {
-				continue;
-			}
-			BehavioredClassifier container = (BehavioredClassifier) link.eContainer();
-			result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_Edge, InterfaceRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getProperty_IncomingLinks(View view) {
-		Property modelElement = (Property) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getProperty_OutgoingLinks(View view) {
-		Property modelElement = (Property) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-
-	private static List<UpdaterLinkDescriptor> getSignal_shape_uml_signal_as_classifier_IncomingLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getSignal_shape_uml_signal_as_classifier_OutgoingLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		return result;
-
-	}
-
-	private static List<UpdaterLinkDescriptor> getActor_shape_uml_actor_as_classifier_IncomingLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getActor_shape_uml_actor_as_classifier_OutgoingLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_link_uml_interfacerealization(modelElement));
-		return result;
-	}
-
-	public static List<UpdaterLinkDescriptor> getPackage_Shape_IncomingLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	public static List<UpdaterLinkDescriptor> getPackage_Shape_OutgoingLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		return result;
-	}
-
-
-	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_classifier_IncomingLink(View view) {
-		final Class modelElement = (Class) view.getElement();
-		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_classifier_OutgoingLink(final View view) {
-		final Class modelElement = (Class) view.getElement();
-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_link_uml_interfacerealization(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getAssociation_link_sysml_association_IncomingLink(final View view) {
-		final Association modelElement = (Association) view.getElement();
-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
-		return result;
-	}
-
-	private static List<UpdaterLinkDescriptor> getAssociation_link_sysml_association_OutgoingLink(final View view) {
-		final Association modelElement = (Association) view.getElement();
-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));
-		return result;
-	}
-
-	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) setting.getEObject();
-			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<NamedElement> sources = link.getClients();
-			Object theSource = sources.size() >= 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge, null));
-		}
-		return result;
-	}
-
-	private static Collection<UpdaterLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_link_uml_interfacerealization(BehavioredClassifier container) {
-		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		for (Iterator<InterfaceRealization> links = container.getInterfaceRealizations().iterator(); links.hasNext();) {
-			EObject linkObject = links.next();
-			if (false == linkObject instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) linkObject;
-			if (!UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			Interface dst = link.getContract();
-			result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.InterfaceRealization_Edge, null));
-		}
-		return result;
-	}
-
-	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_link_uml_usage(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {
-				continue;
-			}
-			Usage link = (Usage) setting.getEObject();
-			if (!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<NamedElement> sources = link.getClients();
-			Object theSource = sources.size() >= 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UpdaterLinkDescriptor(src, target, link, UMLElementTypes.Usage_Edge, null));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Comment source) {
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {
-			Element destination = (Element) destinations.next();
-			result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Constraint source) {
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {
-			Element destination = (Element) destinations.next();
-			result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {
-				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {
-				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));
-			}
-		}
-		return result;
-	}
-
-
-	private static Collection<UpdaterLinkDescriptor> getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		for (Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = links.next();
-			if (false == linkObject instanceof Usage) {
-				continue;
-			}
-			Usage link = (Usage) linkObject;
-			if (!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(linkObject))) {
-				continue;
-			}
-			List<NamedElement> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<NamedElement> sources = link.getClients();
-			Object theSource = sources.size() >= 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_Edge, null));
-		}
-		return result;
-	}
-
-	private static Collection<UpdaterLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		for (Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = links.next();
-			if (false == linkObject instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			List<NamedElement> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<NamedElement> sources = link.getClients();
-			Object theSource = sources.size() >= 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UpdaterLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, null));
-		}
-		return result;
-	}
-
-	private static Collection<UpdaterLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(Classifier container) {
-		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		for (Iterator<Generalization> links = container.getGeneralizations().iterator(); links.hasNext();) {
-			EObject linkObject = links.next();
-			if (false == linkObject instanceof Generalization) {
-				continue;
-			}
-			Generalization link = (Generalization) linkObject;
-			if (!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			Classifier dst = link.getGeneral();
-			result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_Edge, null));
-		}
-		return result;
-	}
-
-	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(Classifier target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {
-				continue;
-			}
-			Generalization link = (Generalization) setting.getEObject();
-			if (!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			if (false == link.eContainer() instanceof Classifier) {
-				continue;
-			}
-			Classifier container = (Classifier) link.eContainer();
-			result.add(new UpdaterLinkDescriptor(container, target, link, UMLElementTypes.Generalization_Edge, null));
-		}
-		return result;
-	}
-
-	/**
-	 * This returns the collection of the incoming associations of a model element.
-	 * 
-	 * @param target
-	 *            The model element.
-	 * @return The list of the incoming associations of the model element.
-	 */
-	private static Collection<? extends UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Association_link_sysml_association(Type target) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		EObject element = target;
-
-		while (null != element && null == container) {
-			element = element.eContainer();
-
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-
-		if (null == container) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (!(linkObject instanceof Association)) {
-				continue;
-			}
-			Association link = (Association) linkObject;
-			if (!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			EList<Type> endTypes = link.getEndTypes();
-			if (null == endTypes || endTypes.isEmpty()) {
-				continue;
-			}
-
-			Object theSource = endTypes.size() >= 2 ? endTypes.get(1) : endTypes.get(0);// source and target are inverted in BDD // If only one source : same target and source for the link
-			if (!(theSource instanceof Type)) {
-				continue;
-			}
-			Type src = (Type) theSource;
-
-			Object theTarget = endTypes.get(0);// source and target are inverted in BDD
-			if (!(theTarget instanceof Type)) {
-				continue;
-			}
-			Type trgt = (Type) theTarget;
-
-			if (trgt != target) {
-				continue;
-			}
-
-			result.add(new UMLLinkDescriptor(src, trgt, link, SysMLElementTypes.ASSOCIATION, null));
-		}
-		return result;
-	}
-
-	private static Collection<? extends UpdaterLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_link_sysml_association(final Type source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();
-		for (Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {
-			EObject linkObject = links.next();
-			if (false == linkObject instanceof Association) {
-				continue;
-			}
-			Association link = (Association) linkObject;
-			if (!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
-				continue;
-			}
-			// Papyrus GenCode
-			List<Type> targets = link.getEndTypes();
-			// Object theTarget = targets.size() >= 2 ? targets.get(1) : null;
-			Object theTarget = targets.size() >= 1 ? targets.get(0) : null;// source and target are inverted in BDD
-			if (false == theTarget instanceof Type) {
-				continue;
-			}
-			Type dst = (Type) theTarget;
-			List<Type> sources = link.getEndTypes();
-			// Object theSource = sources.size() >= 1 ? sources.get(0) : null;
-			Object theSource = sources.size() >= 2 ? sources.get(1) : null;// source and target are inverted in BDD
-			if (false == theSource instanceof Type) {
-				continue;
-			}
-			Type src = (Type) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, SysMLElementTypes.ASSOCIATION, null));
-		}
-		return result;
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java
deleted file mode 100644
index ef9eb95e86a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.part;

-

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

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

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.structure.DiagramStructure;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

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

-

-/**

- *

- * @author vl222926

- *         Adapted code for the code generated for the UML Diagrams

- */

-public class SysMLVisualIDRegistry {

-

-	private static final String UNKNOWN = "-1"; //$NON-NLS-1$

-

-	public static String getLinkWithClassVisualID(EObject domainElement) {

-		if (domainElement == null) {

-			return UNKNOWN;

-		}

-		final EClass eClass = domainElement.eClass();

-		if (UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(eClass)) {

-			return UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID;

-		}

-		if (UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(eClass)) {

-			return UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID;

-		}

-		if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(eClass)) {

-			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;

-		}

-		if (UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(eClass)) {

-			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;

-		}

-		// if(UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

-		// return AssociationClassLinkEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		// return AssociationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		// return AssociationBranchEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

-		// return GeneralizationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

-		// return InterfaceRealizationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

-		// return SubstitutionEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

-		// return RealizationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

-		// return AbstractionEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

-		// return UsageEditPart.VISUAL_ID;

-		// }

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;

-		}

-		// if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-		// return DependencyBranchEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

-		// return ElementImportEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

-		// return PackageImportEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

-		// return PackageMergeEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

-		// return ProfileApplicationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

-		// return TemplateBindingEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

-		// return GeneralizationSetEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-		// return InstanceSpecificationLinkEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

-		// return InformationFlowEditPart.VISUAL_ID;

-		// }

-		return UNKNOWN;

-	}

-

-	// //TODO : this class as not been tested...

-	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

-

-		@Override

-		public String getVisualID(View view) {

-			return null;

-		}

-

-		@Override

-		public String getModelID(View view) {

-			return null;

-		}

-

-		@Override

-		public String getNodeVisualID(View containerView, EObject domainElement) {

-			return null;

-		}

-

-		@Override

-		public boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) {

-			return false;

-		}

-

-		@Override

-		public boolean isCompartmentVisualID(String visualID) {

-			return false;

-		}

-

-		@Override

-		public boolean isSemanticLeafVisualID(String visualID) {

-			return false;

-		}

-

-		// public String getVisualIDAsString(final View view) {

-		// return view.getType();

-		// }

-		//

-		// public int getVisualID(View view) {//TODO : not useful with sysml, because we are using String!

-		// final String type = view.getType();

-		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);

-		// }

-		//

-		//

-		// public String getModelID(View view) {

-		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);

-		// }

-		//

-		//

-		// public int getNodeVisualID(View containerView, EObject domainElement) {

-		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

-		// }

-		//

-		//

-		// public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

-		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

-		// }

-		//

-		//

-		// public boolean isCompartmentVisualID(int visualID) {

-		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

-		// }

-		//

-		//

-		// public boolean isSemanticLeafVisualID(int visualID) {

-		// return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

-		// }

-	};

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
deleted file mode 100644
index a2463473072..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;

-

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

-

-/**

- * Custom preferences initializer.

- */

-public class CustomPreferenceInitializer extends BlockDefinitionDiagramPreferenceInitializer {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void initializeDefaultPreferences() {

-		super.initializeDefaultPreferences();

-

-		// Initialize default positions for labels.

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, 0, -10);

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);

-

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, 0, -10);

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);

-

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_USAGE_ID, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, 0, -10);

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_USAGE_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);

-

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);

-

-		initDefaultPosition(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, 0, -10);

-		initDefaultPosition(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);

-		initDefaultPosition(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_ROLE_ID, 0, -10);

-		initDefaultPosition(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_MULTIPLICITY_ID, 0, 10);

-		initDefaultPosition(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_ROLE_ID, 0, -10);

-		initDefaultPosition(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_MULTIPLICITY_ID, 0, 10);

-

-		initDefaultPosition(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, 30, 0);

-		initDefaultPosition(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, 30, -20);

-

-		initDefaultPosition(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, 30, 0);

-		initDefaultPosition(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, 30, -20);

-	}

-

-	/**

-	 * Initialize default position of a link label in preferences.

-	 *

-	 * @param parentGraphicalType

-	 *            the graphical type of the view owning the label

-	 * @param graphicalType

-	 *            the graphical type of the label

-	 * @param x

-	 * @param y

-	 */

-	protected void initDefaultPosition(String parentGraphicalType, String graphicalType, int x, int y) {

-		IPreferenceStore store = getPreferenceStore();

-

-		String xKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_X);

-		String yKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_Y);

-

-		store.setDefault(xKey, x);

-		store.setDefault(yKey, y);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsBorderItemPreferencePage.java
deleted file mode 100644
index a7f8d598004..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsBorderItemPreferencePage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class FlowPortAsBorderItemPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public FlowPortAsBorderItemPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsCompartmentItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsCompartmentItemPreferencePage.java
deleted file mode 100644
index 273a95d78b7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsCompartmentItemPreferencePage.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class FlowPortAsCompartmentItemPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public FlowPortAsCompartmentItemPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsBorderItemPreferencePage.java
deleted file mode 100644
index a11ac22f8a5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsBorderItemPreferencePage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PortAsBorderItemPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public PortAsBorderItemPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsCompartmentItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsCompartmentItemPreferencePage.java
deleted file mode 100644
index cca7a478b4c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsCompartmentItemPreferencePage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PortAsCompartmentItemPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public PortAsCompartmentItemPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionVisualTypeProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionVisualTypeProvider.java
deleted file mode 100644
index 96925937a3a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/BlockDefinitionVisualTypeProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.gmf.diagram.common.provider.SysMLVisualTypeProvider;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLVisualTypeProvider;
-
-/**
- * Visual type provider for the SysML Block Diagram.
- */
-public class BlockDefinitionVisualTypeProvider extends SysMLVisualTypeProvider {
-
-	public BlockDefinitionVisualTypeProvider() {
-		super(new CustomGraphicalTypeRegistry(), new UMLVisualTypeProvider());
-	}
-
-	@Override
-	protected IElementType getCustomElementType(String viewType) {
-		return ElementTypes.getElementTypeByID(viewType);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPolicyProvider.java
deleted file mode 100644
index 5b10e83e2e6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/CustomEditPolicyProvider.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *		

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.part.BlockDefinitionDiagramEditPart;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomBlockCompositeSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomDefaultSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.PackageCreationEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.PackageSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.AssociationEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.DimensionEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedNodeEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortChildLabelEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowSpecificationEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.UnitEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ValueTypeEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.CustomDuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationSlotCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementChildLabelEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.ActorEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.DataTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.EnumerationEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.InterfaceEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.SignalEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

-

-/**

- * Edit policy provider for the Block definition diagram (install or remove policies on edit part creation).

- */

-public class CustomEditPolicyProvider extends BlockDefinitionDiagramEditPolicyProvider {

-

-	public boolean provides(IOperation operation) {

-

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

-			return false;

-		}

-

-		// Make sure this concern Block Definition Diagram only

-		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();

-		String diagramType = gep.getNotationView().getDiagram().getType();

-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

-			return false;

-		}

-

-		// Provides for edit parts that represent nodes in Block Definition diagram

-		if (gep instanceof AbstractElementEditPart) {

-			return true;

-		}

-

-		// Provides for edit parts that represent edges in Block Definition diagram

-		if (gep instanceof AbstractElementLinkEditPart) {

-			return true;

-		}

-

-		if (gep instanceof ResizeableListCompartmentEditPart) {

-			return true;

-		}

-

-		if (gep instanceof AbstractElementChildLabelEditPart) {

-			return true;

-		}

-

-		if (gep instanceof BlockDefinitionDiagramEditPart) {

-			return true;

-		}

-

-		return super.provides(operation);

-	}

-

-	public void createEditPolicies(EditPart editPart) {

-		super.createEditPolicies(editPart);

-

-		if (editPart instanceof BlockDefinitionDiagramEditPart) {

-			editPart.installEditPolicy(PasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());

-			// no installation of other policies.

-			return;

-		}

-

-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

-

-		// Legacy management of new Nodes / Edges with nodes from Class Diagram and navigation support (installed by edit policy provider in Class Diagram)

-		if ((editPart instanceof PackagePackageableElementCompartmentEditPartCN) || (editPart instanceof PackagePackageableElementCompartmentEditPart)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageSemanticEditPolicy());// replace DefaultCreationEditPolicy to let reparent

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

-			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

-			editPart.installEditPolicy(PasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());

-

-		}

-

-		if ((editPart instanceof ModelPackageableElementCompartmentEditPartCN) || (editPart instanceof ModelPackageableElementCompartmentEditPartTN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PackageSemanticEditPolicy());// replace DefaultCreationEditPolicy to let reparent

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

-			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

-			editPart.installEditPolicy(PasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());

-

-		}

-

-		if ((editPart instanceof PackageEditPart) || (editPart instanceof PackageEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

-		}

-

-		if ((editPart instanceof ModelEditPartTN) || (editPart instanceof ModelEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PackageCreationEditPolicy());// replace DefaultCreationEditPolicy to let reparent

-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

-		}

-

-		if ((editPart instanceof InstanceSpecificationEditPart) || (editPart instanceof InstanceSpecificationEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

-		}

-

-		if ((editPart instanceof InstanceSpecificationSlotCompartmentEditPart) || (editPart instanceof InstanceSpecificationSlotCompartmentEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

-		}

-

-		if ((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

-		}

-

-		if ((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

-		}

-

-		// Legacy management of Comment / Constraint links

-		if (editPart instanceof ActorEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof EnumerationEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof PrimitiveTypeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof ValueTypeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof DataTypeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof FlowSpecificationEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof InterfaceEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof SignalEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof ConstraintBlockEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof BlockEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockCompositeSemanticEditPolicy());

-		}

-

-		if (editPart instanceof DimensionEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof UnitEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof DependencyEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof GeneralizationEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof UsageEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof AssociationEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof InterfaceRealizationEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof FlowPortChildLabelEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof FlowPortAffixedNodeEditPart || editPart instanceof PortAffixedNodeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof AbstractElementChildLabelEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ParserProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ParserProvider.java
deleted file mode 100644
index fa8a03cbee9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ParserProvider.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;

-

-import java.util.HashMap;

-import java.util.Map;

-

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

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.common.parser.FlowPortLabelParser;

-import org.eclipse.papyrus.sysml.diagram.common.parser.FlowPropertyLabelParser;

-import org.eclipse.papyrus.sysml.diagram.common.parser.UnitLabelParser;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

-import org.eclipse.papyrus.uml.diagram.common.parser.AssociationEndLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.OperationLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.PropertyLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.ReceptionLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.SlotLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

-

-/**

- * Parser provider for labels used by this diagram.

- */

-public class ParserProvider extends AbstractProvider implements IParserProvider {

-

-	/** map from graphical hint to parsers */

-	private static final Map<String, IParser> graphicalHintToParser = new HashMap<String, IParser>();

-

-	static {

-		graphicalHintToParser.put(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_NAMEDELEMENT_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID, new FlowPortLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID, new FlowPropertyLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, new ConstraintLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID, new OperationLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID, new ReceptionLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID, new NamedElementLabelParser());

-

-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_CONSTRAINTBLOCK_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_DIMENSION_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_FLOWSPECIFICATION_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_VALUETYPE_NAME_ID, new NamedElementLabelParser());

-

-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_UNIT_NAME_ID, new UnitLabelParser());

-

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_ROLE_ID, new AssociationEndLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_MULTIPLICITY_ID, new AssociationEndLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_ROLE_ID, new AssociationEndLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_MULTIPLICITY_ID, new AssociationEndLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, new AppliedStereotypeParser());

-

-		graphicalHintToParser.put(SlotEditPart.VISUAL_ID, new SlotLabelParser());

-

-		graphicalHintToParser.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, new FlowPortLabelParser());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		if (operation instanceof GetParserOperation) {

-			IAdaptable hint = ((GetParserOperation) operation).getHint();

-

-			if (!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {

-				return false;

-			}

-

-			return getParser(hint) != null;

-		}

-		return false;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public IParser getParser(IAdaptable hint) {

-		String parserHint = hint.getAdapter(String.class);

-		if (parserHint != null) {

-			IParser parser = graphicalHintToParser.get(parserHint);

-			if (parser != null) {

-				return parser;

-			}

-		}

-

-		View view = hint.getAdapter(View.class);

-		if (view != null) {

-			IParser parser = graphicalHintToParser.get(view.getType());

-			if (parser != null) {

-				return parser;

-			}

-		}

-

-		return null;

-	}

-

-	private String getDiagramType(IAdaptable hint) {

-		Diagram diagram = hint.getAdapter(Diagram.class);

-		if (diagram != null) {

-			return diagram.getType();

-		}

-

-		return "undefined";

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationDecoratorProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationDecoratorProvider.java
deleted file mode 100644
index 88652d35737..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationDecoratorProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;

-

-import org.eclipse.gef.EditDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

-

-public class ValidationDecoratorProvider extends org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider implements IDecoratorProvider {

-

-	@Override

-	public void createDecorators(IDecoratorTarget decoratorTarget) {

-		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

-		if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

-			Object model = editPart.getModel();

-			if ((model instanceof View)) {

-				View view = (View) model;

-				if (!(view instanceof Edge) && !view.isSetElement()) {

-					return;

-				}

-			}

-			EditDomain ed = editPart.getViewer().getEditDomain();

-			if (!(ed instanceof DiagramEditDomain)) {

-				return;

-			}

-			if (((DiagramEditDomain) ed).getEditorPart() instanceof UmlGmfDiagramEditor) {

-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

-			}

-		}

-	}

-

-	@Override

-	public boolean provides(IOperation operation) {

-		if (!(operation instanceof CreateDecoratorsOperation)) {

-			return false;

-		}

-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

-		View view = (View) decoratorTarget.getAdapter(View.class);

-		return view != null && ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType());

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationProvider.java
deleted file mode 100644
index cc5d1036d47..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/ValidationProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.blockdefinition.provider;

-

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

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;

-

-public class ValidationProvider {

-

-	private static boolean constraintsActive = false;

-

-	public static boolean shouldConstraintsBePrivate() {

-		return false;

-	}

-

-	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {

-		final Runnable op = operation;

-		Runnable task = new Runnable() {

-

-			public void run() {

-				try {

-					constraintsActive = true;

-					op.run();

-				} finally {

-					constraintsActive = false;

-				}

-			}

-		};

-		if (editingDomain != null) {

-			try {

-				editingDomain.runExclusive(task);

-			} catch (Exception e) {

-				Activator.log.error("Validation failed", e); //$NON-NLS-1$

-			}

-		} else {

-			task.run();

-		}

-	}

-

-	static boolean isInDefaultEditorContext(Object object) {

-		if (shouldConstraintsBePrivate() && !constraintsActive) {

-			return false;

-		}

-		if (object instanceof View) {

-			return constraintsActive && ElementTypes.DIAGRAM_ID.equals(((View) object).getDiagram().getType());

-		}

-		return true;

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/ui/BlockDefinitionInterfaceManagerDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/ui/BlockDefinitionInterfaceManagerDialog.java
deleted file mode 100644
index bc88eda072c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/ui/BlockDefinitionInterfaceManagerDialog.java
+++ /dev/null
@@ -1,83 +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:
- *	Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.ui;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
-import org.eclipse.papyrus.uml.diagram.common.dialogs.InterfaceManagerDialog;
-import org.eclipse.papyrus.uml.diagram.common.util.Visitor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * <pre>
- * This class provides a Dialog to manage easily the provided and
- * the required Interfaces for a {@link Port}.
- * </pre>
- */
-public class BlockDefinitionInterfaceManagerDialog extends InterfaceManagerDialog {
-
-
-	/**
-	 * Instantiates a new block definition interface manager dialog.
-	 *
-	 * @param parentShell
-	 *            the parent shell
-	 * @param port
-	 *            the port
-	 */
-	public BlockDefinitionInterfaceManagerDialog(Shell parentShell, Port port) {
-		super(parentShell, port);
-
-	}
-
-
-	/**
-	 * Gets the all available interfaces.
-	 *
-	 * @param pack
-	 *            the pack
-	 * @return the all available interfaces
-	 * @see org.eclipse.papyrus.uml.diagram.common.dialogs.InterfaceManagerDialog#getAllAvailableInterfaces(org.eclipse.uml2.uml.Package)
-	 */
-	@Override
-	protected List<Interface> getAllAvailableInterfaces(Package pack) {
-		Set<Interface> otherInterfaces = new HashSet<Interface>();
-		List<Element> interfaces = Visitor.getOwnedAndImportedElement(pack, Interface.class);
-		for (Namespace namespace : Visitor.getOwnedAndImportedNamespaces(pack)) {
-			interfaces.addAll(Visitor.getOwnedAndImportedElement(namespace, Interface.class));
-
-		}
-
-		for (Element element : interfaces) {
-			// Test if the interface is a FlowSpecification
-			FlowSpecification flowSpec = UMLUtil.getStereotypeApplication(element, FlowSpecification.class);
-			if (flowSpec == null) {
-				otherInterfaces.add((Interface) element);
-			}
-		}
-
-		return Arrays.asList(otherInterfaces.toArray(new Interface[otherInterfaces.size()]));
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
deleted file mode 100644
index 3c21d40895c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.blockdefinition.utils;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocatorUtils;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * This class fix Port and FlowPort location during diagram opening (no edit part exists yet).
- */
-public class FixPortsLocationOnOpening {
-
-	/**
-	 * This method fix the diagram Port and FlowPort locations.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 */
-	public void fix(Diagram diagram) {
-
-		// Parse diagram content
-		Iterator<EObject> it = diagram.eAllContents();
-		while (it.hasNext()) {
-			EObject current = it.next();
-
-			// Select Port and FlowPorts
-			if (!(current instanceof Shape)) {
-				continue;
-			}
-			Shape portView = (Shape) current;
-			String currentType = (portView).getType();
-			if (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(currentType) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(currentType)) {
-
-				int borderItemOffset = 10;
-				View parentView = ViewUtil.getViewContainer(portView);
-
-				if (parentView instanceof Shape) {
-					Shape parentShape = (Shape) parentView;
-					Bounds portViewBounds = (Bounds) portView.getLayoutConstraint();
-					Bounds parentViewBounds = (Bounds) parentShape.getLayoutConstraint();
-
-					final Rectangle portBounds = new Rectangle(portViewBounds.getX(), portViewBounds.getY(), portViewBounds.getWidth(), portViewBounds.getHeight());
-
-					int parentWidth = parentViewBounds.getWidth();
-					int parentHeight = parentViewBounds.getHeight();
-					if ((parentWidth == -1) && (parentHeight == -1)) {
-						// warning the size may not be set in notation (default size), in such a case get default size from preferences.
-						String parentPrefKey = ElementTypes.DIAGRAM_ID + "_" + parentShape.getType();
-						parentWidth = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.WIDTH));
-						parentHeight = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.HEIGHT));
-					}
-					final Rectangle parentBounds = new Rectangle(parentViewBounds.getX(), parentViewBounds.getY(), parentWidth, parentHeight);
-
-					// Calculate the valid location based on currently stored location and parent bounds
-					final Rectangle validLocation = PortPositionLocatorUtils.getBorderLocation(parentBounds, portBounds, borderItemOffset);
-
-					// Fix when current location is not the valid location (only possible if parent size is set)
-					if (!portBounds.equals(validLocation)) {
-
-						TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(diagram);
-						Command fixCommand = new FixLocationCommand(editingDomain, "Fix Port location on opening", portViewBounds, validLocation);
-						editingDomain.getCommandStack().execute(fixCommand);
-					}
-				}
-
-			}
-		}
-	}
-
-	/**
-	 * This command set the Port view with valid locations.
-	 */
-	public class FixLocationCommand extends RecordingCommand {
-
-		/** Port view bounds. */
-		private Bounds portViewBounds;
-
-		/** Port valid bounds (only the location is used here). */
-		private Rectangle portValidBounds;
-
-		/** Constructor. */
-		public FixLocationCommand(TransactionalEditingDomain domain, String label, Bounds portViewBounds, Rectangle portValidBounds) {
-			super(domain, label);
-			this.portViewBounds = portViewBounds;
-			this.portValidBounds = portValidBounds;
-		}
-
-		@Override
-		protected void doExecute() {
-			portViewBounds.setX(portValidBounds.x());
-			portViewBounds.setY(portValidBounds.y());
-		}
-
-		@Override
-		public boolean canUndo() {
-			return false;
-		}
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.classpath b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.classpath
deleted file mode 100644
index beb405d35fd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src-common-sysml"/>
-	<classpathentry kind="src" path="src-common-uml"/>
-	<classpathentry kind="src" path="src-common-gmf"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.project
deleted file mode 100644
index 9f75f3a94b6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.diagram.common</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/net.sf.jautodoc.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/net.sf.jautodoc.prefs
deleted file mode 100644
index f03f98026a8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/net.sf.jautodoc.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Aug 19 13:56:17 CEST 2011
-add_header=true
-eclipse.preferences.version=1
-header_text=/*****************************************************************************\r\n * Copyright (c) 2011 CEA LIST.\r\n *\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *\t\t\r\n *\t\tCEA LIST - Initial API and implementation\r\n *\r\n *****************************************************************************/
-project_specific_settings=true
-replace_header=true
-replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6285ded23e0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,295 +0,0 @@
-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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.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/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 51849aa9227..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,

- org.eclipse.papyrus.gmf.diagram.common.compatibility,

- org.eclipse.papyrus.gmf.diagram.common.edit.part,

- org.eclipse.papyrus.gmf.diagram.common.edit.policy,

- org.eclipse.papyrus.gmf.diagram.common.factory,

- org.eclipse.papyrus.gmf.diagram.common.locator,

- org.eclipse.papyrus.gmf.diagram.common.parser,

- org.eclipse.papyrus.gmf.diagram.common.provider,

- org.eclipse.papyrus.sysml.diagram.common,

- org.eclipse.papyrus.sysml.diagram.common.commands,

- org.eclipse.papyrus.sysml.diagram.common.dialogs,

- org.eclipse.papyrus.sysml.diagram.common.edit.part,

- org.eclipse.papyrus.sysml.diagram.common.edit.policy,

- org.eclipse.papyrus.sysml.diagram.common.factory,

- org.eclipse.papyrus.sysml.diagram.common.figure,

- org.eclipse.papyrus.sysml.diagram.common.messages,

- org.eclipse.papyrus.sysml.diagram.common.parser,

- org.eclipse.papyrus.sysml.diagram.common.preferences,

- org.eclipse.papyrus.sysml.diagram.common.strategy.paste,

- org.eclipse.papyrus.sysml.diagram.common.utils,

- org.eclipse.papyrus.uml.diagram.common.dnd.helper,

- org.eclipse.papyrus.uml.diagram.common.edit.part,

- org.eclipse.papyrus.uml.diagram.common.edit.policy,

- org.eclipse.papyrus.uml.diagram.common.factory,

- org.eclipse.papyrus.uml.diagram.common.figure,

- org.eclipse.papyrus.uml.diagram.common.parser,

- org.eclipse.papyrus.uml.diagram.common.utils

-Require-Bundle: org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",

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

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

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

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

- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

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

- org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/build.properties
deleted file mode 100644
index 58321663d25..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               icons/,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml
-output..=bin/
-src.includes = icons/,\
-               about.html
-source..=src/,src-gen/,src-common-uml/,src-common-sysml/,src-common-gmf/
-bin..=bin/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/category_sysml.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/category_sysml.gif
deleted file mode 100644
index ecc0b715e2d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/category_sysml.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_EAST.gif
deleted file mode 100644
index c33d1234b1c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH.gif
deleted file mode 100644
index 52a2cb62512..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH_EAST.gif
deleted file mode 100644
index 6c518958906..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH_WEST.gif
deleted file mode 100644
index f798e3456ae..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_NORTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH.gif
deleted file mode 100644
index 52a2cb62512..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH_EAST.gif
deleted file mode 100644
index f798e3456ae..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH_WEST.gif
deleted file mode 100644
index 6c518958906..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_SOUTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_WEST.gif
deleted file mode 100644
index c33d1234b1c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_INOUT_A_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_EAST.gif
deleted file mode 100644
index 273f7c629a5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH.gif
deleted file mode 100644
index 0947953d6af..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH_EAST.gif
deleted file mode 100644
index dfb4021df08..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH_WEST.gif
deleted file mode 100644
index 9ad7d3d046a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_NORTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH.gif
deleted file mode 100644
index 80409678456..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH_EAST.gif
deleted file mode 100644
index 3fe4ebf9053..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH_WEST.gif
deleted file mode 100644
index f9beebd3126..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_SOUTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_WEST.gif
deleted file mode 100644
index 259d142f074..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_IN_A_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_EAST.gif
deleted file mode 100644
index d08bfd9d07b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH.gif
deleted file mode 100644
index b888cee57ba..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH_EAST.gif
deleted file mode 100644
index 48925afcf06..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH_WEST.gif
deleted file mode 100644
index 21c7e975df9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_NORTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH.gif
deleted file mode 100644
index b888cee57ba..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH_EAST.gif
deleted file mode 100644
index 21c7e975df9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH_WEST.gif
deleted file mode 100644
index 48925afcf06..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_SOUTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_WEST.gif
deleted file mode 100644
index d08bfd9d07b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_NA_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_EAST.gif
deleted file mode 100644
index 259d142f074..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH.gif
deleted file mode 100644
index 80409678456..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH_EAST.gif
deleted file mode 100644
index f9beebd3126..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH_WEST.gif
deleted file mode 100644
index 3fe4ebf9053..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_NORTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH.gif
deleted file mode 100644
index 0947953d6af..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH_EAST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH_EAST.gif
deleted file mode 100644
index 9ad7d3d046a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH_EAST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH_WEST.gif
deleted file mode 100644
index dfb4021df08..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_SOUTH_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_WEST.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_WEST.gif
deleted file mode 100644
index 273f7c629a5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/icons/flowports/FlowPort_OUT_A_WEST.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen
deleted file mode 100644
index d47ed2793e7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<idgen:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="SysML Reusable Parts" type="" icon="" label="" language="" javaPackagePrefix="org.eclipse.papyrus.sysml.diagram.common" javaClassPrefix="SysML" createCommandLabel="">

-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_sysml_constraintproperty_as_label" label="ConstraintProperty" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintPropertyChildLabelEditPart" semanticType="org.eclipse.papyrus.sysml.ConstraintProperty" labelMask="Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers"/>

-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_sysml_flowport_as_label" label="FlowPort" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortChildLabelEditPart" semanticType="org.eclipse.papyrus.sysml.FlowPort" labelMask="Direction, Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers"/>

-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_sysml_flowproperty_as_label" label="FlowProperty" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPropertyChildLabelEditPart" semanticType="org.eclipse.papyrus.sysml.FlowProperty" labelMask="Direction, Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers"/>

-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_sysml_part_as_label" label="Part" semanticType="org.eclipse.papyrus.sysml.PartProperty" labelMask="Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers">

-    <editPart href="UML.ReusableParts.idgen#org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_sysml_reference_as_label" label="Reference" semanticType="org.eclipse.papyrus.sysml.ReferenceProperty" labelMask="Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers">

-    <editPart href="UML.ReusableParts.idgen#org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_sysml_value_as_label" label="Value" semanticType="org.eclipse.papyrus.sysml.ValueProperty" labelMask="Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers">

-    <editPart href="UML.ReusableParts.idgen#org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_block_as_classifier" label="Block" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy" creationPolicy="org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy" semanticType="org.eclipse.papyrus.sysml.Block" tag="block" labels="label_sysml_block_name">

-    <affixedNodes href="#shape_sysml_flowport_as_affixed"/>

-    <affixedNodes href="UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-    <borderedNodeFigure href="UML.ReusableParts.idgen#org.eclipse.papyrus.gmf.diagram.common.figure.SelectableBorderedNodeFigure"/>

-    <compartments href="#compartment_sysml_property_as_list"/>

-    <compartments href="#compartment_sysml_part_as_list"/>

-    <compartments href="#compartment_sysml_reference_as_list"/>

-    <compartments href="UML.ReusableParts.idgen#compartment_uml_port_as_list"/>

-    <compartments href="#compartment_sysml_flowport_as_list"/>

-    <compartments href="UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-    <compartments href="#compartment_sysml_constraint_as_list"/>

-    <compartments href="#compartment_sysml_value_as_list"/>

-    <visibleCompartments href="#compartment_sysml_property_as_list"/>

-    <visibleCompartments href="UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-    <visibleCompartments href="#compartment_sysml_constraint_as_list"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_block_as_composite" label="BlockComposite" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy" creationPolicy="org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy" semanticType="org.eclipse.papyrus.sysml.Block" tag="block" labels="label_sysml_block_name" compartments="compartment_sysml_structure" visibleCompartments="compartment_sysml_structure">

-    <affixedNodes href="#shape_sysml_flowport_as_affixed"/>

-    <affixedNodes href="UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-    <borderedNodeFigure href="UML.ReusableParts.idgen#org.eclipse.papyrus.gmf.diagram.common.figure.SelectableBorderedNodeFigure"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_blockproperty_as_composite" label="BlockPropertyComposite" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart" semanticType="org.eclipse.papyrus.sysml.PartProperty" altSemanticTypes="org.eclipse.papyrus.sysml.ReferenceProperty" tag="[#runtime-defined]" compartments="compartment_sysml_blockproperty_structure" visibleCompartments="compartment_sysml_blockproperty_structure">

-    <labels href="UML.ReusableParts.idgen#label_uml_property_label"/>

-    <affixedNodes href="#shape_sysml_flowport_as_affixed"/>

-    <affixedNodes href="UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-    <borderedNodeFigure href="UML.ReusableParts.idgen#org.eclipse.papyrus.gmf.diagram.common.figure.SelectableBorderedNodeFigure"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_constraintblockproperty_as_composite" label="ConstraintBlockPropertyComposite" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockPropertyCompositeEditPart" semanticType="org.eclipse.papyrus.sysml.PartProperty" altSemanticTypes="org.eclipse.papyrus.sysml.ReferenceProperty" tag="[#runtime-defined]" compartments="compartment_sysml_blockproperty_structure" visibleCompartments="compartment_sysml_blockproperty_structure">

-    <labels href="UML.ReusableParts.idgen#label_uml_property_label"/>

-    <affixedNodes href="#shape_sysml_flowport_as_affixed"/>

-    <affixedNodes href="UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-    <affixedNodes href="UML.ReusableParts.idgen#shape_uml_property_as_affixed"/>

-    <borderedNodeFigure href="UML.ReusableParts.idgen#org.eclipse.papyrus.gmf.diagram.common.figure.SelectableBorderedNodeFigure"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_dimension_as_classifier" label="Dimension" semanticType="org.eclipse.papyrus.sysml.Dimension" tag="dimension" labels="label_sysml_dimension_name"/>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_constraintblock_as_classifier" label="ConstraintBlock" semanticType="org.eclipse.papyrus.sysml.ConstraintBlock" tag="constraint" labels="label_sysml_constraintblock_name" compartments="compartment_sysml_parameter_as_list compartment_sysml_constraint_as_list" visibleCompartments="compartment_sysml_parameter_as_list compartment_sysml_constraint_as_list"/>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_flowspecification_as_classifier" label="FlowSpecification" semanticType="org.eclipse.papyrus.sysml.FlowSpecification" tag="flowSpecification" labels="label_sysml_flowspecification_name" compartments="compartment_sysml_flowproperty_as_list" visibleCompartments="compartment_sysml_flowproperty_as_list"/>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_unit_as_classifier" label="Unit" semanticType="org.eclipse.papyrus.sysml.Unit" labelMask="Name, Dimension" tag="unit" labels="label_sysml_unit_name"/>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_valuetype_as_classifier" label="ValueType" semanticType="org.eclipse.papyrus.sysml.ValueType" tag="valuetype" labels="label_sysml_valuetype_name">

-    <compartments href="UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-    <compartments href="UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-    <visibleCompartments href="UML.ReusableParts.idgen#compartment_uml_property_as_list"/>

-    <visibleCompartments href="UML.ReusableParts.idgen#compartment_uml_operation_as_list"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomAffixedNode" id="shape_sysml_flowport_as_affixed" label="FlowPort" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedNodeEditPart" semanticType="org.eclipse.papyrus.sysml.FlowPort" altSemanticTypes="org.eclipse.papyrus.sysml.FlowPort_In org.eclipse.papyrus.sysml.FlowPort_Out org.eclipse.papyrus.sysml.FlowPort_InOut">

-    <affixedLabels href="#affixedlabel_sysml_flowport_label"/>

-    <affixedLabels href="UML.ReusableParts.idgen#affixedlabel_uml_appliedstereotype"/>

-    <locator href="UML.ReusableParts.idgen#org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator"/>

-  </customNodes>

-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_sysml_nestedblockproperty_as_composite" label="NestedBlockPropertyComposite" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.NestedBlockPropertyCompositeEditPart" semanticType="org.eclipse.papyrus.sysml.PartProperty" altSemanticTypes="org.eclipse.papyrus.sysml.ReferenceProperty" tag="[#runtime-defined]">

-    <labels href="UML.ReusableParts.idgen#label_uml_property_label"/>

-    <affixedNodes href="#shape_sysml_flowport_as_affixed"/>

-    <affixedNodes href="UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-    <borderedNodeFigure href="UML.ReusableParts.idgen#org.eclipse.papyrus.gmf.diagram.common.figure.SelectableBorderedNodeFigure"/>

-  </customNodes>

-  <customEdges xsi:type="idgen:CustomLink" id="link_sysml_association" label="Association" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.AssociationEditPart" semanticType="org.eclipse.papyrus.sysml.Association" altSemanticTypes="org.eclipse.papyrus.sysml.AssociationComposite org.eclipse.papyrus.sysml.AssociationCompositeDirected org.eclipse.papyrus.sysml.AssociationNone org.eclipse.papyrus.sysml.AssociationNoneDirected org.eclipse.papyrus.sysml.AssociationShared org.eclipse.papyrus.sysml.AssociationSharedDirected" figure="org.eclipse.papyrus.sysml.diagram.common.figure.AssociationFigure">

-    <viewFactory href="UML.ReusableParts.idgen#org.eclipse.papyrus.uml.diagram.common.factory.AssociationLinkViewFactory"/>

-    <labels href="UML.ReusableParts.idgen#linklabel_uml_namedelement_name"/>

-    <labels href="UML.ReusableParts.idgen#linklabel_uml_association_source_role"/>

-    <labels href="UML.ReusableParts.idgen#linklabel_uml_association_source_multiplicity"/>

-    <labels href="UML.ReusableParts.idgen#linklabel_uml_association_target_role"/>

-    <labels href="UML.ReusableParts.idgen#linklabel_uml_association_target_multiplicity"/>

-  </customEdges>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_constraint_as_list" label="BlockConstraint" title="constraints"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_flowport_as_list" label="FlowPort" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.FlowPortDefaultCompartmentSemanticEditPolicy" title="flow ports"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_flowproperty_as_list" label="FlowProperty" title="flow properties"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_parameter_as_list" label="Parameter" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.ConstraintParameterDefaultCompartmentSemanticEditPolicy" title="parameters"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_part_as_list" label="PartProperty" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.PartDefaultCompartmentSemanticEditPolicy" title="parts"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_property_as_list" label="BlockProperty" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.PropertyDefaultCompartmentSemanticEditPolicy" title="properties"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_reference_as_list" label="ReferenceProperty" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.ReferenceDefaultCompartmentSemanticEditPolicy" title="references"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_structure" label="Structure" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.StructureDefaultCompartmentSemanticEditPolicy" title="structure" list="false"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_blockproperty_structure" label="BlockPropertyStructure" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockPropertyStructureDefaultCompartmentSemanticEditPolicy" title="structure" list="false"/>

-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_sysml_value_as_list" label="ValueProperty" semanticPolicy="org.eclipse.papyrus.sysml.diagram.common.edit.policy.ValueDefaultCompartmentSemanticEditPolicy" title="values"/>

-  <customDecorations xsi:type="idgen:CustomAffixedLabel" id="affixedlabel_sysml_flowport_label" label="FlowPortAffixedLabel" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedLabelNameEditPart" role="Label">

-    <locator href="UML.ReusableParts.idgen#org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"/>

-  </customDecorations>

-  <customDecorations xsi:type="idgen:CustomClassifierInnerLabel" id="label_sysml_block_name" label="BlockLabelName" specificIconKey=""/>

-  <customDecorations xsi:type="idgen:CustomClassifierInnerLabel" id="label_sysml_constraintblock_name" label="ConstraintBlockLabelName" specificIconKey=""/>

-  <customDecorations xsi:type="idgen:CustomClassifierInnerLabel" id="label_sysml_dimension_name" label="DimensionLabelName" specificIconKey=""/>

-  <customDecorations xsi:type="idgen:CustomClassifierInnerLabel" id="label_sysml_flowspecification_name" label="FlowSpecificationLabelName" specificIconKey=""/>

-  <customDecorations xsi:type="idgen:CustomClassifierInnerLabel" id="label_sysml_unit_name" label="UnitLabelName" specificIconKey=""/>

-  <customDecorations xsi:type="idgen:CustomClassifierInnerLabel" id="label_sysml_valuetype_name" label="ValueTypeLabelName" specificIconKey=""/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.Block" name="Block" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.ConstraintBlock" name="ConstraintBlock" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.ConstraintProperty" name="ConstraintProperty" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.Dimension" name="Dimension" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.FlowPort" name="FlowPort" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.FlowPort_In" name="FlowPort_In" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.FlowPort_Out" name="FlowPort_Out" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.FlowPort_InOut" name="FlowPort_InOut" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.FlowProperty" name="FlowProperty" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.FlowSpecification" name="FlowSpecification" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.PartProperty" name="PartProperty" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.ReferenceProperty" name="ReferenceProperty" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.Unit" name="Unit" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.ValueProperty" name="ValueProperty" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.ValueType" name="ValueType" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.Association" name="Association" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.AssociationNone" name="AssociationNone" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.AssociationNoneDirected" name="AssociationNoneDirected" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_none_directed.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.AssociationComposite" name="AssociationComposite" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_composite.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.AssociationCompositeDirected" name="AssociationCompositeDirected" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_composite_directed.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.AssociationShared" name="AssociationShared" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_shared.gif"/>

-  <semanticTypes id="org.eclipse.papyrus.sysml.AssociationSharedDirected" name="AssociationSharedDirected" constantTypePackage="org.eclipse.papyrus.sysml.service.types.element" constantTypeClass="SysMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_shared_directed.gif"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.NestedBlockPropertyCompositeEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintPropertyChildLabelEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedLabelNameEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedNodeEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPropertyChildLabelEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortChildLabelEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockPropertyCompositeEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.part.AssociationEditPart"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.figure.AssociationFigure"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.ConstraintParameterDefaultCompartmentSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.PartDefaultCompartmentSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.PropertyDefaultCompartmentSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.ReferenceDefaultCompartmentSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.StructureDefaultCompartmentSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.ValueDefaultCompartmentSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockPropertyStructureDefaultCompartmentSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy"/>

-  <javaClasses qualifiedName="org.eclipse.papyrus.sysml.diagram.common.edit.policy.FlowPortDefaultCompartmentSemanticEditPolicy"/>

-</idgen:Diagram>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen
deleted file mode 100644
index 5047ade7a02..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<idgen:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="UML Reusable Parts" type="" icon="" label="" language="" javaPackagePrefix="org.eclipse.papyrus.uml.diagram.common" javaClassPrefix="UML" createCommandLabel="">
-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_uml_constraint_as_label" label="Constraint" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart" semanticType="org.eclipse.papyrus.uml.Constraint" labelMask="Name, Specification"/>
-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_uml_enumerationliteral_as_label" label="EnumerationLiteral" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart" semanticType="org.eclipse.papyrus.uml.EnumerationLiteral" labelMask=""/>
-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_uml_operation_as_label" label="Operation" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart" semanticType="org.eclipse.papyrus.uml.Operation" labelMask="Visibility, Name, Type, Modifiers, Param_Direction, Param_Name, Param_Type, Param_Multiplicity, Param_DefaultValue, Param_Modifiers"/>
-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_uml_port_as_label" label="Port" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart" semanticType="org.eclipse.papyrus.uml.Port" labelMask="Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers"/>
-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_uml_property_as_label" label="Property" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart" semanticType="org.eclipse.papyrus.uml.Property" labelMask="Visibility, Derive, Name, Type, Undefined_Type, Multiplicity, Default_Multiplicity, DefaultValue, Modifiers"/>
-  <customNodes xsi:type="idgen:CustomLabelNode" id="shape_uml_reception_as_label" label="Reception" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart" semanticType="org.eclipse.papyrus.uml.Reception" labelMask="Name, Signal"/>
-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_uml_actor_as_classifier" label="Actor" viewFactory="org.eclipse.papyrus.uml.diagram.common.factory.ClassifierViewFactory" semanticType="org.eclipse.papyrus.uml.Actor" labels="label_uml_namedelement_name" compartments="compartment_uml_property_as_list compartment_uml_operation_as_list"/>
-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_uml_datatype_as_classifier" label="DataType" viewFactory="org.eclipse.papyrus.uml.diagram.common.factory.ClassifierViewFactory" semanticType="org.eclipse.papyrus.uml.DataType" tag="datatype" labels="label_uml_namedelement_name" compartments="compartment_uml_property_as_list compartment_uml_operation_as_list" visibleCompartments="compartment_uml_property_as_list"/>
-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_uml_enumeration_as_classifier" label="Enumeration" semanticType="org.eclipse.papyrus.uml.Enumeration" labels="label_uml_namedelement_name" compartments="compartment_uml_enumerationliteral_as_list" visibleCompartments="compartment_uml_enumerationliteral_as_list"/>
-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_uml_interface_as_classifier" label="Interface" viewFactory="org.eclipse.papyrus.uml.diagram.common.factory.ClassifierViewFactory" semanticType="org.eclipse.papyrus.uml.Interface" tag="" labels="label_uml_namedelement_name" compartments="compartment_uml_property_as_list compartment_uml_operation_as_list" visibleCompartments="compartment_uml_property_as_list compartment_uml_operation_as_list"/>
-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_uml_primitivetype_as_classifier" label="PrimitiveType" semanticType="org.eclipse.papyrus.uml.PrimitiveType" tag="primitive" labels="label_uml_namedelement_name"/>
-  <customNodes xsi:type="idgen:CustomClassifierNode" id="shape_uml_signal_as_classifier" label="Signal" viewFactory="org.eclipse.papyrus.uml.diagram.common.factory.ClassifierViewFactory" semanticType="org.eclipse.papyrus.uml.Signal" tag="" labels="label_uml_namedelement_name" compartments="compartment_uml_property_as_list compartment_uml_operation_as_list"/>
-  <customNodes xsi:type="idgen:CustomAffixedNode" id="shape_uml_port_as_affixed" label="Port" semanticType="org.eclipse.papyrus.uml.Port" affixedLabels="affixedlabel_uml_port_label affixedlabel_uml_appliedstereotype" locator="org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator"/>
-  <customNodes xsi:type="idgen:CustomAffixedNode" id="shape_uml_property_as_affixed" label="Property" semanticType="org.eclipse.papyrus.uml.Property" affixedLabels="affixedlabel_uml_port_label affixedlabel_uml_appliedstereotype"/>
-  <customEdges xsi:type="idgen:CustomLink" id="link_uml_dependency" label="Dependency" semanticType="org.eclipse.papyrus.uml.Dependency" labels="linklabel_uml_namedelement_name" figure="org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure"/>
-  <customEdges xsi:type="idgen:CustomLink" id="link_uml_connector" label="Connector" semanticType="org.eclipse.papyrus.uml.Connector" labels="linklabel_uml_connector_label linklabel_uml_connector_source_multiplicity linklabel_uml_connector_target_multiplicity" figure="org.eclipse.papyrus.uml.diagram.common.figure.ConnectorEdgeFigure"/>
-  <customEdges xsi:type="idgen:CustomLink" id="link_uml_generalization" label="Generalization" semanticType="org.eclipse.papyrus.uml.Generalization" figure="org.eclipse.papyrus.uml.diagram.common.figure.GeneralizationFigure"/>
-  <customEdges xsi:type="idgen:CustomLink" id="link_uml_interfacerealization" label="InterfaceRealization" semanticType="org.eclipse.papyrus.uml.InterfaceRealization" labels="linklabel_uml_namedelement_name" figure="org.eclipse.papyrus.uml.diagram.common.figure.InterfaceRealizationFigure"/>
-  <customEdges xsi:type="idgen:CustomLink" id="link_uml_usage" label="Usage" semanticType="org.eclipse.papyrus.uml.Usage" tag="use" labels="linklabel_uml_namedelement_name" figure="org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure"/>
-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_uml_constraint_as_list" label="Constraint" title="constraints" children="shape_uml_constraint_as_label"/>
-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_uml_enumerationliteral_as_list" label="EnumerationLiteral" title="literals" children="shape_uml_enumerationliteral_as_label"/>
-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_uml_operation_as_list" label="Operation" title="operations" children="shape_uml_operation_as_label shape_uml_reception_as_label"/>
-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_uml_port_as_list" label="Port" title="standard ports" children="shape_uml_port_as_label"/>
-  <customDecorations xsi:type="idgen:CustomCompartment" id="compartment_uml_property_as_list" label="Property" title="properties" children="shape_uml_property_as_label shape_uml_port_as_label"/>
-  <customDecorations xsi:type="idgen:CustomAffixedLabel" id="affixedlabel_uml_appliedstereotype" label="CustomFlowPortAppliedStereotypeEditPart" editPart="org.eclipse.papyrus.sysml.diagram.common.edit.part.CustomFlowPortAppliedStereotypeEditPart" locator="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator" role="Stereotype"/>
-  <customDecorations xsi:type="idgen:CustomAffixedLabel" id="affixedlabel_uml_namedelement_name" label="NamedElementAffixedLabelName" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementAffixedLabelNameEditPart" locator="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator" role="Name"/>
-  <customDecorations xsi:type="idgen:CustomAffixedLabel" id="affixedlabel_uml_port_label" label="PortAffixedLabel" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedLabelNameEditPart" locator="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator" role="Label"/>
-  <customDecorations xsi:type="idgen:CustomInnerLabel" id="label_uml_namedelement_name" label="NamedElementNodeLabel" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart"/>
-  <customDecorations xsi:type="idgen:CustomInnerLabel" id="label_uml_property_label" label="PropertyNodeLabel" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyNodeLabelEditPart"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_connector_label" label="ConnectorLinkLabel" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelEditPart" role="Name"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_namedelement_name" label="NamedElementLinkLabelName" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementLinkLabelNameEditPart" role="Name"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_appliedstereotype" label="AppliedStereotypeLinkLabel" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeLinkLabelEditPart" role="Stereotype"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_association_source_role" label="AssociationLinkLabelSourceRole" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceRoleEditPart" role="SourceRole"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_association_source_multiplicity" label="AssociationLinkLabelSourceMultiplicity" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceMultiplicityEditPart" role="SourceMultiplicity"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_association_target_role" label="AssociationLinkLabelTargetRole" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetRoleEditPart" role="TargetRole"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_association_target_multiplicity" label="AssociationLinkLabelTargetMultiplicity" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetMultiplicityEditPart" role="TargetMultiplicity"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_connector_source_multiplicity" label="ConnectorLinkLabelSourceMultiplicity" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelSourceMultiplicityEditPart" role="SourceMultiplicity"/>
-  <customDecorations xsi:type="idgen:CustomLinkLabel" id="linklabel_uml_connector_target_multiplicity" label="ConnectorLinkLabelTargetMultiplicity" editPart="org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelTargetMultiplicityEditPart" role="TargetMultiplicity"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Actor" name="Actor" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Comment" name="Comment" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Connector" name="Connector" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Constraint" name="Constraint" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.DataType" name="DataType" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Dependency" name="Dependency" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Enumeration" name="Enumeration" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.EnumerationLiteral" name="EnumerationLiteral" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Generalization" name="Generalization" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.InstanceSpecification" name="InstanceSpecification" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Interface" name="Interface" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.InterfaceRealization" name="InterfaceRealization" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Model" name="Model" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Operation" name="Operation" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Package" name="Package" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Port" name="Port" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.PrimitiveType" name="PrimitiveType" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Property" name="Property" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Reception" name="Reception" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Signal" name="Signal" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Slot" name="Slot" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"/>
-  <semanticTypes id="org.eclipse.papyrus.uml.Usage" name="Usage" constantTypePackage="org.eclipse.papyrus.uml.service.types.element" constantTypeClass="UMLElementTypes" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeAffixedLabelEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeLinkLabelEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.DefaultChildLabelEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementAffixedLabelNameEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementLinkLabelNameEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyNodeLabelEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedLabelNameEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceRoleEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceMultiplicityEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetRoleEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetMultiplicityEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelSourceMultiplicityEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelTargetMultiplicityEditPart"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.factory.ClassifierViewFactory"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.factory.AssociationLinkViewFactory"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.figure.GeneralizationFigure"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.figure.InterfaceRealizationFigure"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.uml.diagram.common.figure.ConnectorEdgeFigure"/>
-  <javaClasses qualifiedName="org.eclipse.papyrus.gmf.diagram.common.figure.SelectableBorderedNodeFigure"/>
-</idgen:Diagram>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.properties
deleted file mode 100644
index c67df5eac36..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.properties
+++ /dev/null
@@ -1,12 +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:
-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
-##################################################################################
-pluginName=UML Common diagram for SysML
-providerName=Eclipse Modeling Project
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml
deleted file mode 100644
index af2a3173ee9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<extension point="org.eclipse.core.expressions.propertyTesters">
-	<propertyTester class="org.eclipse.papyrus.sysml.diagram.common.utils.SysMLSelectionTester" id="org.eclipse.papyrus.SysMLSelectionTester" namespace="org.eclipse.papyrus.SysMLSelectionTester" properties="isSysMLModel, isSysMLRequirementsModel, isSysMLBlocksModel" type="org.eclipse.jface.viewers.ISelection">
-	</propertyTester>
-</extension>
-
-<extension point="org.eclipse.core.expressions.definitions">
-	<definition id="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML">
-		<and>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor"></equals>
-			</with>
-			<with variable="selection">
-				<test forcePluginActivation="true" property="org.eclipse.papyrus.SysMLSelectionTester.isSysMLModel" value="true"></test>
-			</with>
-		</and>
-	</definition>
-	<definition id="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLBlocks">
-		<and>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor"></equals>
-			</with>
-			<with variable="selection">
-				<test forcePluginActivation="true" property="org.eclipse.papyrus.SysMLSelectionTester.isSysMLBlocksModel" value="true"></test>
-			</with>
-		</and>
-	</definition>
-	<definition id="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLRequirements">
-		<and>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor"></equals>
-			</with>
-			<with variable="selection">
-				<test forcePluginActivation="true" property="org.eclipse.papyrus.SysMLSelectionTester.isSysMLRequirementsModel" value="true"></test>
-			</with>
-		</and>
-	</definition>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.gmfdiag.common.pasteStrategy">
-   <strategy
-         strategy="org.eclipse.papyrus.sysml.diagram.common.strategy.paste.PartPasteStrategy">
-   </strategy>
-</extension>   
-
-</plugin>
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
deleted file mode 100644
index 1808d432e5f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-	    <artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.sysml.diagram.common</artifactId>

-	<version>2.0.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-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/CreateViewCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/CreateViewCommand.java
deleted file mode 100644
index 612d3c0d170..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/CreateViewCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.commands;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A replacement for CreateCommand that avoids that takes into account the incorrect
- * generation of ViewProvider by GMFTooling and modifies SemanticAdapter in call to {@link ViewService#provides(Class, org.eclipse.core.runtime.IAdaptable, View, String, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)} .
- */
-public class CreateViewCommand extends CreateCommand {
-
-	/** Constructor */
-	public CreateViewCommand(TransactionalEditingDomain editingDomain, ViewDescriptor viewDescriptor, View containerView) {
-		super(editingDomain, viewDescriptor, containerView);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean canExecute() {
-
-		// Warning the element adapter can possibly be null (see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=353129)
-		if (viewDescriptor.getElementAdapter() == null) {
-			return false;
-		}
-
-		// Try to adapt the descriptor ElementAdapter in EObject
-		EObject element = (EObject) viewDescriptor.getElementAdapter().getAdapter(EObject.class);
-		IElementType elementType = (IElementType) viewDescriptor.getElementAdapter().getAdapter(IElementType.class);
-
-		SemanticElementAdapter semanticAdapter = new SemanticElementAdapter(element, elementType);
-
-		// Use the semanticAdapter instead of view descriptor element adapter to avoid the use of provides(ViewForKind) method
-		// from ViewProvider which is incorrectly implemented in GMF Tooling generated editors (other editors may have undesired side-effect on each-other).
-
-		return ViewService.getInstance().provides(viewDescriptor.getViewKind(), semanticAdapter, containerView, viewDescriptor.getSemanticHint(), viewDescriptor.getIndex(), viewDescriptor.isPersisted(), viewDescriptor.getPreferencesHint());
-	}
-
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/ISemanticHintAdapter.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/ISemanticHintAdapter.java
deleted file mode 100644
index fba3a47663c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/ISemanticHintAdapter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.commands;
-
-
-/**
- * Interface for an adapter that can give a semantic hint
- */
-public interface ISemanticHintAdapter {
-
-	/**
-	 * Returns the semantic hint for this adapter
-	 *
-	 * @return the semantic hint for this adapter
-	 */
-	public String getSemanticHint();
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/IdentityCommandWithNotification.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/IdentityCommandWithNotification.java
deleted file mode 100644
index 5410455d754..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/IdentityCommandWithNotification.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.CombinedPopupAndViewBuilder;
-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
-
-/**
- * A command that is always executable, undoable and redoable, but does nothing.
- * It always returns the same OK command result.
- *
- * @author ldamus
- */
-public class IdentityCommandWithNotification extends AbstractCommand {
-
-	protected String title = "Papyrus notification";
-
-	protected String message = "No message.";
-
-	protected Type type = Type.INFO;
-
-	/**
-	 * Public constructor.
-	 */
-	public IdentityCommandWithNotification(String message) {
-		this();
-		this.message = message;
-	}
-
-	/**
-	 * Public constructor.
-	 */
-	public IdentityCommandWithNotification(String title, String message, Type type) {
-		this(message);
-		this.title = title;
-		this.type = type;
-	}
-
-	/**
-	 * Private constructor.
-	 */
-	private IdentityCommandWithNotification() {
-		super(StringStatics.BLANK, null);
-		setResult(CommandResult.newOKCommandResult());
-	}
-
-	/**
-	 * Does nothing and returns an OK command result.
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-		new NotificationBuilder().setBuilderClass(CombinedPopupAndViewBuilder.class).setType(type).setTitle(title).setMessage(message).run();
-
-		return getCommandResult();
-	}
-
-	/**
-	 * Does nothing and returns an OK command result.
-	 */
-	@Override
-	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-		return getCommandResult();
-	}
-
-	/**
-	 * Does nothing and returns an OK command result.
-	 */
-	@Override
-	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-		return getCommandResult();
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/SemanticElementAdapter.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/SemanticElementAdapter.java
deleted file mode 100644
index c7787e7c51e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/commands/SemanticElementAdapter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.commands;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-
-/**
- * An adapter for {@link IElementType}, {@link EObject} or {@link View}.
- */
-public class SemanticElementAdapter extends SemanticAdapter implements ISemanticHintAdapter {
-
-	/** The elementType. */
-	private Object elementType;
-
-	/** Constructor from EObject */
-	public SemanticElementAdapter(EObject element) {
-		super(element, null);
-		this.elementType = null;
-	}
-
-	/** Constructor from IElementType */
-	public SemanticElementAdapter(IElementType elementType) {
-		super(null, null);
-		this.elementType = elementType;
-	}
-
-	/** Constructor from EObject and IElementType */
-	public SemanticElementAdapter(EObject element, IElementType elementType) {
-		super(element, null);
-		this.elementType = elementType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IHintedType.class)) {
-			if (elementType instanceof IHintedType) {
-				return elementType;
-			}
-		}
-
-		if (adapter.equals(IElementType.class)) {
-			return elementType;
-		}
-		return super.getAdapter(adapter);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object getProxyClassID() {
-		if (elementType != null) {
-			return PackageUtil.getID(((IElementType) elementType).getEClass());
-		}
-		return super.getProxyClassID();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getSemanticHint() {
-		if (elementType instanceof IHintedType) {
-			return ((IHintedType) elementType).getSemanticHint();
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/DiagramVersioningUtils.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/DiagramVersioningUtils.java
deleted file mode 100644
index cd8cc7b790a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/DiagramVersioningUtils.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.compatibility;
-
-
-/**
- * @deprecated This class is repackaged as {@link org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils}, this old version is
- *             deprecated and left for binary compatibility only
- */
-@Deprecated
-public class DiagramVersioningUtils extends org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils {
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/IDiagramVersionUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/IDiagramVersionUpdater.java
deleted file mode 100644
index 35bc65af45d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/compatibility/IDiagramVersionUpdater.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.compatibility;
-
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * This interface provides an API for migration of diagram from a version to another.
- */
-public interface IDiagramVersionUpdater {
-
-	/**
-	 * Update a diagram to a new version.
-	 *
-	 * @param diagram
-	 *            the diagram to update
-	 * @param oldVersion
-	 *            the old version of the diagram
-	 * @param newVersion
-	 *            the new version of the diagram
-	 * @return TODO : should return a status, not int.
-	 */
-	public int update(Diagram diagram, String oldVersion, String newVersion);
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/part/ITextAwareEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/part/ITextAwareEditPart.java
deleted file mode 100644
index b532c971a63..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/part/ITextAwareEditPart.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.part;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-
-/**
- * Edit Part that contains editable text.
- */
-public interface ITextAwareEditPart extends org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart {
-
-	/**
-	 * Get the parser elements.
-	 *
-	 * @return the element being parsed.
-	 */
-	public EObject getParserElement();
-
-	/**
-	 * Gets the default parser options (meaning parser options stored in preferences).
-	 *
-	 * @return ParserOptions the parser options
-	 */
-	public ParserOptions getDefaultParserOptions();
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
deleted file mode 100644
index 16c87238cdf..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/CommonDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import static org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-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.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-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.editpolicies.DiagramDragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.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.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.CommandProxyWithResult;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.DeferredSnapToGridCommand;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;
-import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementBorderEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.helper.Element2IAdaptableRegistryHelper;
-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * Abstract DND edit policy delegating the choice of the view to create for an EObject to a local
- * graphical type registry.
- */
-public abstract class CommonDiagramDragDropEditPolicy extends DiagramDragDropEditPolicy {
-
-	private Element2IAdaptableRegistryHelper myElement2IAdaptableRegistryHelper;
-
-	/** The graphical type registry. */
-	protected IGraphicalTypeRegistry registry;
-
-	/** The list of element types that require a specific drop command. */
-	private Set<String> specificDropList = null;
-
-	/** The specified link mapping helper depending on the diagram */
-	protected ILinkMappingHelper linkMappingHelper;
-
-	/** Constructor */
-	public CommonDiagramDragDropEditPolicy(ILinkMappingHelper linkMappingHelper) {
-		this.linkMappingHelper = linkMappingHelper;
-	}
-
-	private Set<String> getSpecificDropList() {
-		if (specificDropList == null) {
-			specificDropList = getSpecificDropBehaviorTypes();
-		}
-		return specificDropList;
-	}
-
-	/**
-	 * Gets composite command adapters
-	 */
-	protected Element2IAdaptableRegistryHelper getElement2IAdaptableRegistryHelper() {
-		if (myElement2IAdaptableRegistryHelper == null) {
-			myElement2IAdaptableRegistryHelper = new Element2IAdaptableRegistryHelper();
-		}
-		return myElement2IAdaptableRegistryHelper;
-	}
-
-	protected abstract Set<String> getSpecificDropBehaviorTypes();
-
-	/**
-	 * <pre>
-	 * {@inheritedDoc}.
-	 * 
-	 * Overridden method to fix some exception occurring while moving affixed element (nodes or labels)
-	 * (https://bugs.eclipse.org/bugs/show_bug.cgi?id=350680).
-	 * </pre>
-	 */
-	@Override
-	protected Command getDropCommand(ChangeBoundsRequest request) {
-
-		Iterator<?> iter = request.getEditParts().iterator();
-		EObject graphicalParentObject = ((GraphicalEditPart) getHost()).resolveSemanticElement();
-		while ((graphicalParentObject != null) && (iter.hasNext())) {
-			EditPart droppedEditPart = (EditPart) iter.next();
-			if (droppedEditPart instanceof AbstractElementBorderEditPart) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			if (droppedEditPart instanceof AbstractElementLabelEditPart) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-		return super.getDropCommand(request);
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-
-		CompoundCommand completeDropCommand = new CompoundCommand("DropObjectsAndArrange"); //$NON-NLS-1$
-
-		// Detect file drop
-		if ((dropRequest.getObjects().size() > 0) && (dropRequest.getObjects().get(0) instanceof String)) {
-			return getDropFileCommand(dropRequest);
-		}
-
-		// Create the drop command by composite drop command for each dropped elements
-		CompositeCommand gmfDropCommand = new CompositeCommand("DropObjects"); //$NON-NLS-1$
-		Iterator<?> iter = dropRequest.getObjects().iterator();
-		while (iter.hasNext()) {
-			EObject droppedObject = (EObject) iter.next();
-			gmfDropCommand.add(getDropObjectCommand(dropRequest, droppedObject));
-		}
-
-		// Create the complete drop command by adding an arrange command after drop
-		if (!gmfDropCommand.isEmpty()) {
-
-			// Retrieve drop result (most probably created view but not necessarily) and update the request
-			CommandResult result = gmfDropCommand.getCommandResult();
-			List<?> newValues = (List<?>) result.getReturnValue();
-			dropRequest.setResult(newValues);
-
-			// Prepare refresh command
-			RefreshConnectionsRequest refreshRequest = new RefreshConnectionsRequest(newValues);
-			Command refreshCommand = getHost().getCommand(refreshRequest);
-
-			// Prepare an arrange command to avoid every dropped view to appear at the same location only if newValues contains at least one node, not when you just drag a link
-			boolean isOneNode = false;
-			for(Object o : newValues){
-				if(o instanceof Node){
-					isOneNode=true;
-					break;
-				}
-			}
-			
-			ArrangeRequest arrangeRequest = new ArrangeRequest(RequestConstants.REQ_ARRANGE_DEFERRED);
-			arrangeRequest.setViewAdaptersToArrange(newValues);
-			Command arrangeCommand = getHost().getCommand(arrangeRequest);
-
-			// Update the complete drop command (drop - refresh - arrange)
-			Command dropCommand = new ICommandProxy(gmfDropCommand);
-			completeDropCommand.add(dropCommand.chain(refreshCommand));
-			if(isOneNode){
-				completeDropCommand.add(arrangeCommand);
-			}
-
-			// add snap command if required
-			// 430099: [Diagram] Snap to Grid for elements dropped from the ModelExplorer is ignored
-			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=430099
-			final Object value = dropRequest.getExtendedData().get(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT);
-			if (value instanceof Boolean && Boolean.TRUE.equals(value)) {
-				DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), newValues, (IGraphicalEditPart) getHost());
-				completeDropCommand.add(new ICommandProxy(snapCommand));
-			}
-
-		}
-
-		return completeDropCommand;
-	}
-
-	protected ICommand getDropObjectCommand(DropObjectsRequest dropRequest, EObject droppedObject) {
-
-		Point location = dropRequest.getLocation().getCopy();
-
-		View dropTargetView = ((IGraphicalEditPart) getHost()).getNotationView();
-
-		String droppedNodeType = registry.getNodeGraphicalType(droppedObject, dropTargetView.getType());
-		String droppedEdgeType = registry.getEdgeGraphicalType(droppedObject);
-
-		// Test if a specific drop command should be used
-		if (getSpecificDropList().contains(droppedNodeType) || getSpecificDropList().contains(droppedEdgeType)) {
-			return getSpecificDropCommand(dropRequest, droppedObject, droppedNodeType, droppedEdgeType);
-		}
-
-		// Decide unknown type handling
-		if (UNDEFINED_TYPE.equals(droppedNodeType) && UNDEFINED_TYPE.equals(droppedEdgeType)) {
-			return getUnknownDropCommand(dropRequest, droppedObject);
-		}
-
-		// The dropped element is a node
-		if (!UNDEFINED_TYPE.equals(droppedNodeType)) {
-			return getDefaultDropNodeCommand(droppedNodeType, droppedObject, location);
-		}
-
-		// The dropped element is a edge
-		if (!UNDEFINED_TYPE.equals(droppedEdgeType)) {
-
-			Collection<?> sources = linkMappingHelper.getSource((Element) droppedObject);
-			Collection<?> targets = linkMappingHelper.getTarget((Element) droppedObject);
-
-			// Only manage binary link during drop
-			if ((sources.size() > 0) && (targets.size() > 0)) {
-				EObject source = (EObject) sources.toArray()[0];
-				EObject target = (EObject) targets.toArray()[0];
-				return getDefaultDropEdgeCommand(droppedObject, source, target, droppedEdgeType, location);
-			}
-
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-
-		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-	}
-
-	protected ICommand getDefaultDropNodeCommand(String droppedNodeType, EObject droppedObject, Point location) {
-		View dropTargetView = ((IGraphicalEditPart) getHost()).getNotationView();
-		EObject dropTargetElement = dropTargetView.getElement();
-		// Drop restriction:
-		// - no restriction when dropped on diagram
-		// - require containment when dropped on any other EObject
-		if ((dropTargetView instanceof Diagram) || dropTargetElement.eContents().contains(droppedObject)) {
-			return getDefaultDropNodeCommand(droppedNodeType, location, droppedObject);
-		}
-
-		// Allow drop for inherited elements
-		if (dropTargetElement instanceof Classifier && ((Classifier) dropTargetElement).getAllAttributes().contains(droppedObject)) {
-			return getDefaultDropNodeCommand(droppedNodeType, location, droppedObject);
-		}
-		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-	}
-
-	protected ICommand getDefaultDropNodeCommand(String droppedObjectGraphicalType, Point absoluteLocation, EObject droppedObject) {
-
-		IAdaptable elementAdapter = new EObjectAdapter(droppedObject);
-
-		ViewDescriptor descriptor = new ViewDescriptor(elementAdapter, Node.class, droppedObjectGraphicalType, ViewUtil.APPEND, ViewDescriptorUtil.PERSISTED, getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(absoluteLocation);
-
-		// Get view creation command for the dropped object
-		Command command = getHost().getCommand(createViewRequest);
-
-		// Use the ViewDescriptor as command result, it then can be used as an adaptable to retrieve the View
-		return new CommandProxyWithResult(command, descriptor);
-	}
-
-	protected ICommand getDefaultDropEdgeCommand(EObject droppedObject, EObject source, EObject target, String droppedEdgeType, Point absoluteLocation) {
-
-		CompositeCommand completeDropCommand = new CompositeCommand("CompleteDropEdge"); //$NON-NLS-1$
-
-		// Find views in current diagram representing source and target
-		Collection<View> sourceViews = getViews(source);
-		Collection<View> targetViews = getViews(target);
-
-		IAdaptable sourceViewAdapter = null;
-		IAdaptable targetViewAdapter = null;
-
-		// If either a source or target lacks create view for these elements
-		// - using defaultDrop command (assumed to be a view creation)
-		// - try to create view on host
-		if (sourceViews.isEmpty() || targetViews.isEmpty()) {
-
-			CompositeCommand createEndViewsCommand = new CompositeCommand("CreateSourceTargetViews"); //$NON-NLS-1$
-
-			View dropContainerView = ((IGraphicalEditPart) getHost()).getNotationView();
-			EObject dropContainerElement = dropContainerView.getElement();
-
-			if (sourceViews.isEmpty()) {
-				if (dropContainerElement.eContents().contains(source)) {
-					ICommand dropSourceCommand = getDefaultDropNodeCommand(registry.getNodeGraphicalType(source, dropContainerView.getType()), absoluteLocation.getCopy(), source);
-					CompositeCommand.compose(createEndViewsCommand, dropSourceCommand);
-					sourceViewAdapter = (IAdaptable) dropSourceCommand.getCommandResult().getReturnValue();
-				} else {
-					return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-				}
-			}
-
-			if (targetViews.isEmpty()) {
-				if (dropContainerElement.eContents().contains(target)) {
-					ICommand dropTargetCommand = getDefaultDropNodeCommand(registry.getNodeGraphicalType(target, dropContainerView.getType()), absoluteLocation.getCopy(), target);
-					CompositeCommand.compose(createEndViewsCommand, dropTargetCommand);
-					targetViewAdapter = (IAdaptable) dropTargetCommand.getCommandResult().getReturnValue();
-				} else {
-					return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-				}
-			}
-
-			CompositeCommand.compose(completeDropCommand, createEndViewsCommand);
-		}
-
-		// Create source adapter
-		if (!sourceViews.isEmpty()) { // sourceViewAdapter should still be null in this case
-			sourceViewAdapter = new SemanticAdapter(null, sourceViews.toArray()[0]);
-		}
-
-		// Create target adapter
-		if (!targetViews.isEmpty()) { // targetViewAdapter should still be null in this case
-			targetViewAdapter = new SemanticAdapter(null, targetViews.toArray()[0]);
-		}
-
-		// Create a view for the dropped link between the source and target view adapters
-		IAdaptable droppedObjectAdapter = new SemanticAdapter(droppedObject, null);
-
-		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(droppedObjectAdapter, droppedEdgeType, getDiagramPreferencesHint());
-
-		CommonDeferredCreateConnectionViewCommand createConnectionViewCommand = new CommonDeferredCreateConnectionViewCommand(getEditingDomain(), droppedEdgeType, sourceViewAdapter, targetViewAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor,
-				null);
-		createConnectionViewCommand.setElement(droppedObject);
-
-		CompositeCommand.compose(completeDropCommand, createConnectionViewCommand);
-
-		return completeDropCommand.reduce();
-	}
-
-	/**
-	 * <pre>
-	 * Sub-classes have to implement this method in order to provides specific drop command for
-	 * element which require a specific treatment.
-	 * 
-	 * @param dropRequest current drop request
-	 * @param droppedEObject the dropped object
-	 * @param nodeType the graphical type of the dropped element (node representation)
-	 * @param edgeType the graphical type of the dropped element (edge representation)
-	 * @return the drop command
-	 * </pre>
-	 */
-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
-		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * <pre>
-	 * Sub-classes have to implement this method in order to provides drop command for
-	 * elements that are not natively known by the diagram.
-	 * 
-	 * @param dropRequest current drop request
-	 * @param droppedEObject the dropped object
-	 * @return the drop command
-	 * </pre>
-	 */
-	protected ICommand getUnknownDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject) {
-		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-	}
-
-	protected EditPartViewer getViewer() {
-		return ((IGraphicalEditPart) getHost()).getViewer();
-	}
-
-	protected TransactionalEditingDomain getEditingDomain() {
-		return ((IGraphicalEditPart) getHost()).getEditingDomain();
-	}
-
-	protected PreferencesHint getDiagramPreferencesHint() {
-		return ((IGraphicalEditPart) getHost()).getDiagramPreferencesHint();
-	}
-
-	/**
-	 * This methods looks for views representing a given EObject in the host diagram.
-	 *
-	 * @param eObject
-	 *            the {@link EObject} to look for.
-	 * @return the list of {@link View} representing the eObject.
-	 */
-	private Set<View> getViews(EObject eObject) {
-		Set<View> views = new HashSet<View>();
-
-		// Retrieve host diagram
-		View hostView = ((IGraphicalEditPart) getHost()).getNotationView();
-		View hostDiagram = (hostView instanceof Diagram) ? hostView : hostView.getDiagram();
-
-		// Retrieve all views for the eObject
-		Collection<View> relatedViews = CrossReferencerUtil.getCrossReferencingViews(eObject, hostDiagram.getType());
-
-		// Parse and select views from host diagram only
-		Iterator<View> it = relatedViews.iterator();
-		while (it.hasNext()) {
-			View currentView = it.next();
-			if (!(currentView instanceof Diagram) && (currentView.getDiagram() == hostDiagram)) {
-				views.add(currentView);
-			}
-		}
-
-		return views;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultContainerNodeEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultContainerNodeEditPolicy.java
deleted file mode 100644
index 663d811f22b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultContainerNodeEditPolicy.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetConnectionAnchorsCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetConnectionEndsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.SetConnectionBendpointsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.commands.CreateViewCommand;
-
-/**
- * Default container node edit policy replacement used to replace {@link CreateCommand} by {@link CreateViewCommand},
- * different implementation of the canExecute() method.
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=346739.
- */
-public class DefaultContainerNodeEditPolicy extends ContainerNodeEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
-		if (!(request instanceof CreateConnectionViewRequest)) {
-			return null;
-		}
-		CreateConnectionViewRequest req = (CreateConnectionViewRequest) request;
-		CompositeCommand cc = new CompositeCommand(
-				DiagramUIMessages.Commands_CreateCommand_Connection_Label);
-		Diagram diagramView = ((View) getHost().getModel())
-				.getDiagram();
-
-		// TransactionalEditingDomain editingDomain = getEditingDomain();
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		CreateCommand createCommand = new CreateViewCommand(editingDomain, req
-				.getConnectionViewDescriptor(), diagramView.getDiagram());
-		//
-		setViewAdapter((IAdaptable) createCommand.getCommandResult()
-				.getReturnValue());
-
-
-		SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
-		sceCommand.setEdgeAdaptor(getViewAdapter());
-		sceCommand.setNewSourceAdaptor(new EObjectAdapter(getView()));
-		ConnectionAnchor sourceAnchor = getConnectableEditPart()
-				.getSourceConnectionAnchor(request);
-		SetConnectionAnchorsCommand scaCommand = new SetConnectionAnchorsCommand(editingDomain, StringStatics.BLANK);
-		scaCommand.setEdgeAdaptor(getViewAdapter());
-		scaCommand.setNewSourceTerminal(getConnectableEditPart()
-				.mapConnectionAnchorToTerminal(sourceAnchor));
-		SetConnectionBendpointsCommand sbbCommand = new SetConnectionBendpointsCommand(editingDomain);
-		sbbCommand.setEdgeAdapter(getViewAdapter());
-		cc.compose(createCommand);
-		cc.compose(sceCommand);
-		cc.compose(scaCommand);
-		cc.compose(sbbCommand);
-		Command c = new ICommandProxy(cc);
-		request.setStartCommand(c);
-		return c;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSnapBackEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSnapBackEditPolicy.java
deleted file mode 100644
index c84a050c2d6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultSnapBackEditPolicy.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * <pre>
- * EditPolicy which support the RequestConstants.REQ_SNAP_BACK request type.
- *
- * Returns a command to position a label's offset to it default set at creation.
- *
- * This edit policy is a copy of LabelSnapBackEditPolicy, which does not only use the label view type
- * to find the snap back position (also takes into account the diagram and parent view type).
- *
- * @see org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.LabelSnapBackEditPolicy
- * </pre>
- */
-@SuppressWarnings("restriction")
-public class DefaultSnapBackEditPolicy extends GraphicalNodeEditPolicy {
-
-
-	/**
-	 * Understands RequestConstants.REQ_SNAP_BACK request types
-	 *
-	 * @param request
-	 * @return boolean
-	 */
-	@Override
-	public boolean understandsRequest(Request request) {
-		return RequestConstants.REQ_SNAP_BACK.equals(request.getType());
-	}
-
-	/**
-	 * Returns a <code>Command</code> which sets the label's offset to its
-	 * original position.
-	 *
-	 * @param request
-	 *            the request
-	 * @return the command
-	 */
-	@Override
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_SNAP_BACK.equals(request.getType())) {
-			View view = (View) getHost().getModel();
-
-			// YT - Use a snap back hint that takes into account the diagram
-			// and parent view type.
-			String hint = getSnapBackHint(view);
-
-			Point offset = LabelEditPart.getSnapBackPosition(hint);
-			if (offset == null) {
-				return null;
-			}
-
-			TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-
-			ICommand moveCommand = new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, new EObjectAdapter(view), offset);
-			return new ICommandProxy(moveCommand);
-		}
-		return null;
-	}
-
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-		if (understandsRequest(request)) {
-			return getHost();
-		}
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * Get the snap back hint for the view.
-	 *
-	 * @param view
-	 *            the view to snap back.
-	 * @return the snap back hint.
-	 */
-	private String getSnapBackHint(View view) {
-
-		String diagramType = view.getDiagram().getType();
-		String parentType = ViewUtil.getViewContainer(view).getType();
-		String labelType = view.getType();
-
-		return diagramType + "_" + parentType + "-" + labelType;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
deleted file mode 100644
index 30aafed5da7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.LayoutHelper;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy;
-
-/**
- * Avoid forcing (-1, -1) dimension in set bounds command (let the view factories deal with
- * size initialization if needed).
- */
-public class DefaultXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEditPolicy {
-
-	/**
-	 * Called in response to a <tt>REQ_CREATE</tt> request. Returns a command
-	 * to set each created element bounds and auto-size properties.
-	 *
-	 * @param request
-	 *            a create request (understands instances of {@link CreateViewRequest}).
-	 * @return a command to satisfy the request; <tt>null</tt> if the request is not
-	 *         understood.
-	 */
-	@Override
-	protected Command getCreateCommand(CreateRequest request) {
-		CreateViewRequest req = (CreateViewRequest) request;
-
-
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-
-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
-		Iterator<?> iter = req.getViewDescriptors().iterator();
-		final Rectangle BOUNDS = (Rectangle) getConstraintFor(request);
-		boolean couldBeSnaped = request.getLocation().equals(LayoutHelper.UNDEFINED.getLocation()) && req.isSnapToEnabled();
-		while (iter.hasNext()) {
-			CreateViewRequest.ViewDescriptor viewDescriptor = (CreateViewRequest.ViewDescriptor) iter.next();
-			Rectangle rect = getBoundsOffest(req, BOUNDS, viewDescriptor);
-
-			// see bug 427129: Figures newly created via the palette should be snapped to grid if "snap to grid" is activated
-			if (couldBeSnaped) {
-				// this code fix the bug in some case...
-				int add = 0;
-				DiagramRootEditPart drep = (DiagramRootEditPart) getHost().getRoot();
-				double spacing = drep.getGridSpacing();
-				final double max_value = spacing * 20;
-				final SnapToHelper helper = (SnapToHelper) getHost().getAdapter(SnapToHelper.class);
-				if (helper != null) {
-					final LayoutHelper layoutHelper = new LayoutHelper();
-					while (add < max_value) {// we define a max value to do test
-						Rectangle LOCAL_BOUNDS = BOUNDS.getCopy();
-						LOCAL_BOUNDS.translate(add, add);
-						Rectangle tmp_rect = getBoundsOffest(req, LOCAL_BOUNDS, viewDescriptor);
-						final PrecisionRectangle resultRect = new PrecisionRectangle(tmp_rect);
-						resultRect.setWidth(-1);
-						resultRect.setHeight(-1);
-						PrecisionPoint res1 = new PrecisionPoint(tmp_rect.getLocation());
-						helper.snapPoint(request, PositionConstants.NORTH_WEST, res1.getPreciseCopy(), res1);
-						final Point pt = layoutHelper.validatePosition(getHostFigure(), resultRect.setLocation(res1));
-						if (couldBeSnaped) {
-							if (pt.equals(resultRect.getLocation())) {
-								rect.setLocation(resultRect.getLocation());
-								break;
-							} else {
-								add += spacing;
-								continue;
-							}
-						}
-					}
-				}
-			}
-			if (rect.getSize().isEmpty()) {
-				// Only set location and let the ViewFactory deal with dimension.
-				cc.compose(new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, viewDescriptor, rect.getLocation().getCopy()));
-
-			} else {
-				// Default set bounds command.
-				cc.compose(new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, viewDescriptor, rect));
-			}
-			break;
-
-		}
-
-		if (cc.reduce() == null) {
-			return null;
-		}
-		return chainGuideAttachmentCommands(request, new ICommandProxy(cc.reduce()));
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ExternalLabelPrimaryDragRoleEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ExternalLabelPrimaryDragRoleEditPolicy.java
deleted file mode 100644
index 0b305132f46..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ExternalLabelPrimaryDragRoleEditPolicy.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.handles.MoveHandle;
-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.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.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-
-/**
- * This policy provides the selection handles, feedback and move command for
- * external node label.
- * The expected behavior is to provide an external label that can freely move and with a link feedback
- * towards its parent figure during the move.
- */
-public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected List createSelectionHandles() {
-		MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-		mh.setBorder(null);
-		return Collections.singletonList(mh);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getMoveCommand(ChangeBoundsRequest request) {
-		LabelEditPart editPart = (LabelEditPart) getHost();
-
-		// FeedBack - Parent + Delta
-		Rectangle updatedRect = new Rectangle();
-		PrecisionRectangle initialRect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
-		updatedRect = initialRect.getTranslated(getHostFigure().getParent().getBounds().getLocation().getNegated());
-		updatedRect = updatedRect.getTranslated(request.getMoveDelta());
-
-		// translate the feedback figure
-		PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
-		getHostFigure().translateToAbsolute(rect);
-		rect.translate(request.getMoveDelta());
-		rect.resize(request.getSizeDelta());
-		getHostFigure().translateToRelative(rect);
-
-		// translate according to the text alignments
-		if (editPart instanceof PapyrusLabelEditPart) {
-			switch (((PapyrusLabelEditPart) editPart).getTextAlignment()) {
-			case PositionConstants.LEFT:
-				break;
-			case PositionConstants.CENTER:
-				updatedRect.translate(getHostFigure().getBounds().width / 2, 0);
-				break;
-			case PositionConstants.RIGHT:
-				updatedRect.translate(getHostFigure().getBounds().width, 0);
-				break;
-			default:
-				break;
-			}
-		}
-
-		ICommand moveCommand = new SetBoundsCommand(editPart.getEditingDomain(), DiagramUIMessages.MoveLabelCommand_Label_Location, new EObjectAdapter((View) editPart.getModel()), updatedRect);
-		return new ICommandProxy(moveCommand);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ILinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ILinkMappingHelper.java
deleted file mode 100644
index 445f0452530..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/ILinkMappingHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-/**
- * Interface to map links at semantic level.
- */
-@Deprecated
-public interface ILinkMappingHelper extends org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper {
-
-	// /**
-	// * Get the sources.
-	// *
-	// * @param link
-	// * the link.
-	// * @return the sources.
-	// */
-	// public Collection<?> getSource(EObject link);
-	//
-	// /**
-	// * Get the targets.
-	// *
-	// * @param link
-	// * the link.
-	// * @return the targets.
-	// */
-	// public Collection<?> getTarget(EObject link);
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDefaultSemanticEditPolicy.java
deleted file mode 100644
index 2eaea78bf56..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDefaultSemanticEditPolicy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-
-/**
- * Semantic edit policy for label (affixed labels mainly), that allow correct destroy,
- * but forbid other edit actions.
- */
-public class LabelDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
-
-	@Override
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return super.getDestroyElementCommand(req);
-	}
-
-	@Override
-	protected Command getConfigureCommand(ConfigureRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getSetCommand(SetRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getMoveCommand(MoveRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	@Override
-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDirectEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDirectEditPolicy.java
deleted file mode 100644
index 41e6046dfe3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LabelDirectEditPolicy.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.gef.ui.internal.parts.TextCellEditorEx;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.part.ITextAwareEditPart;
-
-/**
- * Overrides {@link org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy} in
- * order to pass parser options to the method that returns the modification command.
- * (always pass 0 - ParserOptions.NONE in the original class).
- *
- * Also this uses (or tries to) the EObject given by {@link org.eclipse.papyrus.gmf.diagram.common.edit.part.ITextAwareEditPart#getParserElement()} to
- * get the edit command instead of using the EObject associated to the edited edit part.
- */
-public class LabelDirectEditPolicy extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy {
-
-	/**
-	 * We need an adapter that will be able to hold both a model
-	 * and an view
-	 */
-	class EObjectAdapterEx extends EObjectAdapter {
-
-		private View view = null;
-
-		/**
-		 * constructor
-		 *
-		 * @param element
-		 *            element to be wrapped
-		 * @param view
-		 *            view to be wrapped
-		 */
-		public EObjectAdapterEx(EObject element, View view) {
-			super(element);
-			this.view = view;
-		}
-
-		@Override
-		@SuppressWarnings("rawtypes")
-		public Object getAdapter(Class adapter) {
-			Object o = super.getAdapter(adapter);
-			if (o != null) {
-				return o;
-			}
-			if (adapter.equals(View.class)) {
-				return view;
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * @see DirectEditPolicy#getDirectEditCommand(DirectEditRequest)
-	 */
-	@Override
-	protected Command getDirectEditCommand(DirectEditRequest edit) {
-		if (edit.getCellEditor() instanceof TextCellEditorEx) {
-			if (!((TextCellEditorEx) edit.getCellEditor()).hasValueChanged()) {
-				return null;
-			}
-		}
-
-		String labelText = (String) edit.getCellEditor().getValue();
-
-		// for CellEditor, null is always returned for invalid values
-		if (labelText == null) {
-			return null;
-		}
-
-		// Papyrus - using org.eclipse.papyrus.gmf.diagram.common.edit.part.ITextAwareEditPart here
-		ITextAwareEditPart compartment = (ITextAwareEditPart) getHost();
-		EObjectAdapter elementAdapter = new EObjectAdapterEx(compartment.getParserElement(), null);
-		//
-
-		// Papyrus - elementAdapter created with compartment.getParserElement(), no need to use the view here.
-		// EObject model = (EObject)compartment.getModel();
-		// EObjectAdapter elementAdapter = null;
-		// if(model instanceof View) {
-		// View view = (View)model;
-		// elementAdapter = new EObjectAdapterEx(ViewUtil.resolveSemanticElement(view), view);
-		// } else
-		// elementAdapter = new EObjectAdapterEx(model, null);
-
-		// check to make sure an edit has occurred before returning a command.
-		String prevText = compartment.getParser().getEditString(elementAdapter, compartment.getParserOptions().intValue());
-		if (!prevText.equals(labelText)) {
-			ICommand iCommand = compartment.getParser().getParseCommand(elementAdapter, labelText, compartment.getParserOptions().intValue());
-			// Papyrus - use parser options to build command
-			// compartment.getParser().getParseCommand(elementAdapter, labelText, 0);
-			return new ICommandProxy(iCommand);
-		}
-
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LinkLabelDragEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LinkLabelDragEditPolicy.java
deleted file mode 100644
index 3ba01b4790d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/LinkLabelDragEditPolicy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-
-/**
- * Abstract non-diagram specific drag edit policy for link labels.
- * This class is adapted from edit parts generated by GMF Tooling.
- * Deprecated: use {@link PapyrusLinkLabelDragPolicy} instead.
- */
-@Deprecated
-public class LinkLabelDragEditPolicy extends NonResizableLabelEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	@SuppressWarnings("rawtypes")
-	protected List createSelectionHandles() {
-		MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-		mh.setBorder(null);
-		return Collections.singletonList(mh);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextNonResizableEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextNonResizableEditPolicy.java
deleted file mode 100644
index 766f156d554..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextNonResizableEditPolicy.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class TextNonResizableEditPolicy extends NonResizableEditPolicyEx {
-
-	private IFigure selectionFeedbackFigure;
-
-	private IFigure focusFeedbackFigure;
-
-	private FigureListener hostPositionListener;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			getHostFigure().addFigureListener(getHostPositionListener());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(false);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				getHostFigure().removeFigureListener(getHostPositionListener());
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-
-			@Override
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
-			}
-		}
-	}
-
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-
-	private FigureListener getHostPositionListener() {
-		if (hostPositionListener == null) {
-			hostPositionListener = new FigureListener() {
-
-				@Override
-				public void figureMoved(IFigure source) {
-					refreshFeedback();
-				}
-			};
-		}
-		return hostPositionListener;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected List createSelectionHandles() {
-		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());
-		moveHandle.setBorder(null);
-		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));
-		return Collections.singletonList(moveHandle);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextSelectionEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextSelectionEditPolicy.java
deleted file mode 100644
index 9952e69dac6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/TextSelectionEditPolicy.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.edit.policy;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class TextSelectionEditPolicy extends SelectionEditPolicy {
-
-	private IFigure selectionFeedbackFigure;
-
-	private IFigure focusFeedbackFigure;
-
-	private FigureListener hostPositionListener;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			getHostFigure().addFigureListener(getHostPositionListener());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(false);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				getHostFigure().removeFigureListener(getHostPositionListener());
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-
-			@Override
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
-			}
-		}
-	}
-
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-
-	private FigureListener getHostPositionListener() {
-		if (hostPositionListener == null) {
-			hostPositionListener = new FigureListener() {
-
-				@Override
-				public void figureMoved(IFigure source) {
-					refreshFeedback();
-				}
-			};
-		}
-		return hostPositionListener;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AbstractLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AbstractLabelViewFactory.java
deleted file mode 100644
index 3ba18900adb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AbstractLabelViewFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.DecorationNodeViewFactory;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;
-
-/**
- * Default view Factory for Papyrus custom labels.
- */
-public abstract class AbstractLabelViewFactory extends DecorationNodeViewFactory {
-
-	@Override
-	protected void initializeFromPreferences(View view) {
-		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
-			super.initializeFromPreferences(view);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AffixedLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AffixedLabelViewFactory.java
deleted file mode 100644
index 1a458a7c7c8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/AffixedLabelViewFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-
-/**
- * Default view Factory for Papyrus custom affixed labels.
- */
-public class AffixedLabelViewFactory extends AbstractLabelViewFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected LayoutConstraint createLayoutConstraint() {
-		return NotationFactory.eINSTANCE.createLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeFromPreferences(View view) {
-
-		super.initializeFromPreferences(view);
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-
-		String preferenceKey = ViewUtil.getViewContainer(view).getType() + "-" + view.getType();
-		PreferenceInitializerForElementHelper.initLabelLocationFromPrefs(view, store, preferenceKey);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentListViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentListViewFactory.java
deleted file mode 100644
index cd231398b00..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentListViewFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ListCompartmentViewFactory;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Default compartment view Factory for custom list compartments.
- */
-public class CompartmentListViewFactory extends ListCompartmentViewFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Node createNode() {
-		return NotationFactory.eINSTANCE.createListCompartment();
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentShapeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentShapeViewFactory.java
deleted file mode 100644
index 9fd448a1a0a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/CompartmentShapeViewFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.BasicCompartmentViewFactory;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Default compartment view Factory for custom shape compartments.
- */
-public class CompartmentShapeViewFactory extends BasicCompartmentViewFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		styles.add(NotationFactory.eINSTANCE.createTitleStyle());
-		return styles;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorLabelViewFactory.java
deleted file mode 100644
index eb1e0ea9e60..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorLabelViewFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-
-/**
- * Default view Factory for Papyrus custom affixed labels.
- */
-public class ConnectorLabelViewFactory extends AbstractLabelViewFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected LayoutConstraint createLayoutConstraint() {
-		return NotationFactory.eINSTANCE.createLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeFromPreferences(View view) {
-
-		super.initializeFromPreferences(view);
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-
-		String preferenceKey = ViewUtil.getViewContainer(view).getType() + "-" + view.getType();
-		PreferenceInitializerForElementHelper.initLabelLocationFromPrefs(view, store, preferenceKey);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorViewFactory.java
deleted file mode 100644
index 7386f3f82c4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ConnectorViewFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-
-/**
- * Default connector view Factory for Papyrus custom edges.
- */
-public class ConnectorViewFactory extends org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ConnectorViewFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected List createStyles(View view) {
-		return Arrays.asList(new Style[] { NotationFactory.eINSTANCE.createFontStyle() });
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeFromPreferences(View view) {
-		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
-			super.initializeFromPreferences(view);
-		}
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-
-		// The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
-		String elementName = view.getType();
-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(view, store, elementName);
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(view, store, elementName);
-		PreferenceInitializerForElementHelper.initRoutingFromPrefs(view, store, elementName);
-		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(view, store, elementName);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/InnerLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/InnerLabelViewFactory.java
deleted file mode 100644
index c4d0a29492b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/InnerLabelViewFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-/**
- * Default label view Factory for Papyrus custom inner labels.
- */
-public class InnerLabelViewFactory extends AbstractLabelViewFactory {
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeChildLabelViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeChildLabelViewFactory.java
deleted file mode 100644
index 3a2c5a7da35..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeChildLabelViewFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-
-/**
- * Default Shape view Factory for Papyrus custom child label nodes.
- */
-public class ShapeChildLabelViewFactory extends AbstractShapeViewFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected LayoutConstraint createLayoutConstraint() {
-		return NotationFactory.eINSTANCE.createLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeFromPreferences(View view) {
-		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
-			super.initializeFromPreferences(view);
-		}
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-
-		// The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
-		String preferenceKey = view.getType();
-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(view, store, preferenceKey);
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(view, store, preferenceKey);
-
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(view, store, preferenceKey);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeViewFactory.java
deleted file mode 100644
index 78669c3ce1e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/factory/ShapeViewFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.factory;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-
-/**
- * Default Shape view Factory for Papyrus custom nodes.
- */
-public class ShapeViewFactory extends org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Shape createNode() {
-		return NotationFactory.eINSTANCE.createShape();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeFromPreferences(View view) {
-		// Do not call initializeFromPreferences when the preference initializer is disabled (Typical use case: CSS are installed)
-		if (ThemeInitializerManager.instance.usePreferenceInitializer(view)) {
-			super.initializeFromPreferences(view);
-		}
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-
-		// The PreferenceInitializerForElementHelper already checks for usePreferenceInitializer() (When required)
-		String elementName = view.getType();
-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(view, store, elementName);
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(view, store, elementName);
-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(view, store, elementName);
-
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(view, store, elementName);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/CellEditorLocatorUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/CellEditorLocatorUtil.java
deleted file mode 100644
index f057c8cf0b4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/CellEditorLocatorUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.locator;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class CellEditorLocatorUtil {
-
-	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {
-		if (source.getFigure() instanceof IMultilineEditableFigure) {
-			return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure());
-		} else if (source.getFigure() instanceof WrappingLabel) {
-			return new TextCellEditorLocator((WrappingLabel) source.getFigure());
-		} else {
-			return new LabelCellEditorLocator((Label) source.getFigure());
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/LabelCellEditorLocator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/LabelCellEditorLocator.java
deleted file mode 100644
index 410406f59e2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/LabelCellEditorLocator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.locator;
-
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class LabelCellEditorLocator implements CellEditorLocator {
-
-	private Label label;
-
-	public LabelCellEditorLocator(Label label) {
-		this.label = label;
-	}
-
-	public Label getLabel() {
-		return label;
-	}
-
-	@Override
-	public void relocate(CellEditor celleditor) {
-		Text text = (Text) celleditor.getControl();
-		Rectangle rect = getLabel().getTextBounds().getCopy();
-		getLabel().translateToAbsolute(rect);
-		if (!text.getFont().isDisposed()) {
-			int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
-			rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));
-		}
-		if (!rect.equals(new Rectangle(text.getBounds()))) {
-			text.setBounds(rect.x, rect.y, rect.width, rect.height);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/MultilineCellEditorLocator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/MultilineCellEditorLocator.java
deleted file mode 100644
index c3cb6a6040e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/MultilineCellEditorLocator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.locator;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class MultilineCellEditorLocator implements CellEditorLocator {
-
-	private IMultilineEditableFigure multilineEditableFigure;
-
-	public MultilineCellEditorLocator(IMultilineEditableFigure figure) {
-		this.multilineEditableFigure = figure;
-	}
-
-	public IMultilineEditableFigure getMultilineEditableFigure() {
-		return multilineEditableFigure;
-	}
-
-	@Override
-	public void relocate(CellEditor celleditor) {
-		Text text = (Text) celleditor.getControl();
-		Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();
-		rect.x = getMultilineEditableFigure().getEditionLocation().x;
-		rect.y = getMultilineEditableFigure().getEditionLocation().y;
-		getMultilineEditableFigure().translateToAbsolute(rect);
-		if (getMultilineEditableFigure().getText().length() > 0) {
-			rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));
-		}
-		if (!rect.equals(new Rectangle(text.getBounds()))) {
-			text.setBounds(rect.x, rect.y, rect.width, rect.height);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/TextCellEditorLocator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/TextCellEditorLocator.java
deleted file mode 100644
index 1a4a7d56fc8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/locator/TextCellEditorLocator.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.locator;
-
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class TextCellEditorLocator implements CellEditorLocator {
-
-	private WrappingLabel wrapLabel;
-
-	public TextCellEditorLocator(WrappingLabel wrapLabel) {
-		this.wrapLabel = wrapLabel;
-	}
-
-	public WrappingLabel getWrapLabel() {
-		return wrapLabel;
-	}
-
-	@Override
-	public void relocate(CellEditor celleditor) {
-		Text text = (Text) celleditor.getControl();
-		Rectangle rect = getWrapLabel().getTextBounds().getCopy();
-		getWrapLabel().translateToAbsolute(rect);
-		if (!text.getFont().isDisposed()) {
-			if (getWrapLabel().isTextWrapOn() && getWrapLabel().getText().length() > 0) {
-				rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));
-			} else {
-				int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
-				rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));
-			}
-		}
-		if (!rect.equals(new Rectangle(text.getBounds()))) {
-			text.setBounds(rect.x, rect.y, rect.width, rect.height);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/parser/IMaskManagedSemanticParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/parser/IMaskManagedSemanticParser.java
deleted file mode 100644
index 6513381901e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/parser/IMaskManagedSemanticParser.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.parser;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-
-/**
- * Interface for semantic parsers that support mask options.
- * 
- * @deprecated since Eclipse Mars SR1. Use {@link org.eclipse.papyrus.uml.diagram.common.parser.IMaskManagedSemanticParser} instead
- */
-@Deprecated
-public interface IMaskManagedSemanticParser extends ISemanticParser {
-
-	/** The label to show in case ParserOptions.None is passed as flag (avoid a fully masked label) */
-	public static final String MaskedLabel = "<empty label>"; 
-
-	/**
-	 * Get the {@link Map} of masks
-	 *
-	 * @return the {@link Map} of masks
-	 */
-	public Map<String, String> getMasks();
-
-	/**
-	 * Gets the default mask configuration for this parser
-	 *
-	 * @return
-	 *         The default mask configuration for this parser
-	 */
-	public Collection<String> getDefaultValue(IAdaptable element);
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/AbstractViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/AbstractViewProvider.java
deleted file mode 100644
index 3c3d811738a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/AbstractViewProvider.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramStatusCodes;
-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Implements of the <code>IViewProvider</code> interface. This
- * implementations invokes the appropriate factory method by inspecting the
- * supplied operation and provides the actual view creation functionality.
- */
-public class AbstractViewProvider extends AbstractProvider implements IViewProvider {
-
-	private static String viewCreationMethodName = "createView"; //$NON-NLS-1$
-
-	private static String diagramCreationMethodName = "createDiagram"; //$NON-NLS-1$
-
-	static protected class ClassToCreationMethodMap extends HashMap {
-
-		static final long serialVersionUID = 1;
-
-		public void addMethod(Class clazz, Method method) {
-			if (get(clazz) == null) {
-				put(clazz, method);
-			}
-		}
-
-		public Method getCreationMethod(Class clazz) {
-			return (Method) get(clazz);
-		}
-	}
-
-	public static ClassToCreationMethodMap classToCreateMethod = new ClassToCreationMethodMap();
-
-	/**
-	 * Determines whether this view provider can provide for the required
-	 * operation It inspects the type of view operation and calls the
-	 * corresponding <code>provides</code> method.
-	 *
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(IOperation)
-	 */
-	@Override
-	public final boolean provides(IOperation operation) {
-		/* if this is the CreateViewForKindOperation operation */
-		if (operation instanceof CreateViewForKindOperation) {
-			return provides((CreateViewForKindOperation) operation);
-		}
-
-		/* Make sure it is a view operation */
-		assert operation instanceof CreateViewOperation : "operation is not CreateViewOperation in AbstractViewProvider";//$NON-NLS-1$
-
-		/* call the specific provides method */
-		if (operation instanceof CreateDiagramViewOperation) {
-			return provides((CreateDiagramViewOperation) operation);
-		} else if (operation instanceof CreateEdgeViewOperation) {
-			return provides((CreateEdgeViewOperation) operation);
-		} else if (operation instanceof CreateNodeViewOperation) {
-			return provides((CreateNodeViewOperation) operation);
-		}
-		return false;
-	}
-
-	@Override
-	public final Diagram createDiagram(IAdaptable contextElement, String diagramKind, PreferencesHint preferencesHint) {
-		return (Diagram) createNewView(getDiagramViewClass(contextElement, diagramKind), new Object[] { contextElement, diagramKind, preferencesHint });
-	}
-
-	// Papyrus - final statement removed
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-
-		return (Edge) createNewView(getEdgeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
-	}
-
-	// Papyrus - final statement removed
-	@Override
-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-
-		return (Node) createNewView(getNodeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified view
-	 * creation operation
-	 *
-	 * @param operation
-	 *            Contains a semantic kind and a containerView
-	 * @return boolean
-	 */
-	protected boolean provides(CreateViewForKindOperation op) {
-		if (op.getViewKind() == Node.class) {
-			return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
-		}
-		if (op.getViewKind() == Edge.class) {
-			return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
-		}
-		return true;
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified diagram
-	 * view operation
-	 *
-	 * @param operation
-	 * @return boolean
-	 */
-	protected boolean provides(CreateDiagramViewOperation operation) {
-		return getDiagramViewClass(operation.getSemanticAdapter(), operation.getSemanticHint()) != null;
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified edge view
-	 * operation
-	 *
-	 * @param operation
-	 * @return boolean
-	 */
-	protected boolean provides(CreateEdgeViewOperation operation) {
-		return (getEdgeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint()) != null);
-	}
-
-	/**
-	 * Determines whether this provider can provide for the specified node view
-	 * operation
-	 *
-	 * @param operation
-	 * @return boolean
-	 */
-	protected boolean provides(CreateNodeViewOperation operation) {
-		return (getNodeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint()) != null);
-	}
-
-	/**
-	 * Returns the diagram view class to instantiate based on the passed params
-	 *
-	 * @param semanticAdapter
-	 *            TODO
-	 * @param semanticAdapter
-	 * @return Class
-	 */
-	protected Class getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		return null;
-	}
-
-	/**
-	 * Returns the edge view class to instantiate based on the passed params
-	 *
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getEdgeViewClass(IAdaptable semanticAdapter, View containerView, String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * Returns the node view class to instantiate based on the passed params
-	 *
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @param semanticHint
-	 * @return Class
-	 */
-	protected Class getNodeViewClass(IAdaptable semanticAdapter, View containerView, String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * creates a view instance via reflection.
-	 *
-	 * @param constructorParams
-	 *            the view's constructor parameters.
-	 */
-	private View createNewView(Class viewClass, Object[] constructorParams) {
-		try {
-			assert null != viewClass : "Null viewClass in AbstractProvider";//$NON-NLS-1$
-			assert null != constructorParams : "Null constructorParams in AbstractProvider";//$NON-NLS-1$
-
-			Constructor constructor = getFactoryConstructor(viewClass);
-			if (constructor == null) {
-				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
-				return null;
-			}
-
-			Object factory = constructor.newInstance(new Object[] {});
-			Method method = getCreationMethod(viewClass, constructorParams);
-			if (method == null) {
-				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
-				return null;
-			}
-			return (View) method.invoke(factory, constructorParams);
-		} catch (Throwable e) {
-			String eMsg = NLS.bind(DiagramCoreMessages.AbstractViewProvider_create_view_failed_ERROR_, viewClass.getName());
-			Log.warning(DiagramPlugin.getInstance(), IStatus.WARNING, eMsg, e);
-			return null;
-		}
-	}
-
-	private Constructor getFactoryConstructor(Class viewClass) {
-		if (viewClass != null) {
-			Constructor[] ctors = viewClass.getConstructors();
-			for (int i = 0; i < ctors.length; i++) {
-				if (ctors[i].getParameterTypes().length == 0) {
-					return ctors[i];
-				}
-			}
-		}
-		return null;
-	}
-
-	/** Return the <i>creation</i> constructor for the cached view class. */
-	private Method getCreationMethod(Class viewClass, Object[] params) {
-		if (viewClass != null) {
-			Method method = classToCreateMethod.getCreationMethod(viewClass);
-			if (method != null) {
-				return method;
-			}
-
-			Method[] methods = viewClass.getMethods();
-			for (int i = 0; i < methods.length; i++) {
-				method = methods[i];
-				String methodName = method.getName();
-				if (methodName.equals(viewCreationMethodName) || methodName.equals(diagramCreationMethodName)) {
-					classToCreateMethod.addMethod(viewClass, method);
-					return method;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the EClass associated with the semantic adapter
-	 *
-	 * @param semanticAdapter
-	 * @return EClass
-	 */
-	protected EClass getSemanticEClass(IAdaptable semanticAdapter) {
-		if (semanticAdapter == null) {
-			return null;
-		}
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null) {
-			return EMFCoreUtil.getProxyClass(eObject);
-		}
-		IElementType type = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-		if (type != null) {
-			return type.getEClass();
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the semantic element associated with the semantic adapter
-	 *
-	 * @param semanticAdapter
-	 * @return EClass
-	 */
-	protected EObject getSemanticElement(IAdaptable semanticAdapter) {
-		if (semanticAdapter == null) {
-			return null;
-		}
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null) {
-			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the semantic element associated with the semantic adapter
-	 *
-	 * @param semanticAdapter
-	 * @return EClass
-	 */
-	protected EObject getSemanticElement(IAdaptable semanticAdapter, TransactionalEditingDomain domain) {
-		if (semanticAdapter == null) {
-			return null;
-		}
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null) {
-			return EMFCoreUtil.resolve(domain, eObject);
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractEditPartProvider.java
deleted file mode 100644
index bea81c411ed..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractEditPartProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
-
-/**
- * This abstract edit part provider restricts its contribution to view that are owned by
- * a given type of diagram.
- */
-public abstract class CustomAbstractEditPartProvider extends AbstractEditPartProvider {
-
-	/** The provides only provides for this diagram type */
-	protected String diagramType= org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart.MODEL_ID;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			String currentDiagramType = ((IEditPartOperation) operation).getView().getDiagram().getType();
-
-			if ((diagramType == null) || (!diagramType.equals(currentDiagramType))) {
-				return false;
-			}
-		}
-
-		return super.provides(operation);
-	}
-
-
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractViewProvider.java
deleted file mode 100644
index 8958a363c7e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/CustomAbstractViewProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This abstract view provider retrieve the view type from the graphical type
- * registry and use it in edge and node view creation.
- */
-public abstract class CustomAbstractViewProvider extends AbstractViewProvider {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry;
-
-	/** The provides only provides for this diagram type */
-	protected String diagramType;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		String graphicalType = getEdgeGraphicalType(semanticAdapter, containerView, semanticHint);
-		return super.createEdge(semanticAdapter, containerView, graphicalType, index, persisted, preferencesHint);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		String graphicalType = getNodeGraphicalType(semanticAdapter, containerView, semanticHint);
-		return super.createNode(semanticAdapter, containerView, graphicalType, index, persisted, preferencesHint);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean provides(CreateViewForKindOperation op) {
-
-		// This method should generally not be called (https://bugs.eclipse.org/bugs/show_bug.cgi?id=346739).
-
-		if ((diagramType == null) || (!diagramType.equals(op.getContainerView().getDiagram().getType()))) {
-			return false;
-		}
-
-		// if(op.getViewKind() == Node.class) {
-		// String graphicalType = getNodeGraphicalType(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint());
-		// return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), graphicalType) != null;
-		// }
-		//
-		// if(op.getViewKind() == Edge.class) {
-		// String graphicalType = getEdgeGraphicalType(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint());
-		// return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), graphicalType) != null;
-		// }
-
-		throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean provides(CreateEdgeViewOperation operation) {
-
-		if ((diagramType == null) || (!diagramType.equals(operation.getContainerView().getDiagram().getType()))) {
-			return false;
-		}
-
-		String graphicalType = getEdgeGraphicalType(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint());
-		return (getEdgeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), graphicalType) != null);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean provides(CreateNodeViewOperation operation) {
-
-		if ((diagramType == null) || (!diagramType.equals(operation.getContainerView().getDiagram().getType()))) {
-			return false;
-		}
-
-		String graphicalType = getNodeGraphicalType(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint());
-		return (getNodeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), graphicalType) != null);
-	}
-
-	private String getNodeGraphicalType(IAdaptable semanticAdapter, View containerView, String semanticHint) {
-		String graphicalType = null;
-
-		// Some ViewDescriptor constructors initialize unspecified semanticHint with ""
-		if ((semanticHint != null) && (!"".equals(semanticHint))) {
-			graphicalType = registry.getNodeGraphicalType(semanticHint, containerView.getType());
-
-		} else if (semanticAdapter != null) {
-
-			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
-			if (domainElement != null) {
-				graphicalType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-			}
-
-			IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-			if (elementType != null) {
-				graphicalType = registry.getNodeGraphicalType(elementType, containerView.getType());
-
-			}
-		}
-		return graphicalType;
-	}
-
-	private String getEdgeGraphicalType(IAdaptable semanticAdapter, View containerView, String semanticHint) {
-		String graphicalType = null;
-		// Some ViewDescriptor constructors initialize unspecified semanticHint with ""
-		if ((semanticHint != null) && (!"".equals(semanticHint))) {
-			graphicalType = registry.getEdgeGraphicalType(semanticHint);
-
-		} else {
-
-			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
-			if (domainElement != null) {
-				graphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-
-			IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-			if (elementType != null) {
-				graphicalType = registry.getEdgeGraphicalType(elementType);
-
-			}
-		}
-		return graphicalType;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/DiagramEditorUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/DiagramEditorUtil.java
deleted file mode 100644
index 948e40ffabd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/DiagramEditorUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class DiagramEditorUtil {
-
-	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {
-		diagramPart.getDiagramGraphicalViewer().deselectAll();
-
-		EditPart firstPrimary = null;
-		for (EditPart nextPart : editParts) {
-			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);
-			if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {
-				firstPrimary = nextPart;
-			}
-		}
-
-		if (!editParts.isEmpty()) {
-			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/ElementTypeLabelProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/ElementTypeLabelProvider.java
deleted file mode 100644
index 421bcc182e7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/ElementTypeLabelProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * A label provider that provides the name and image for <code>IElementType</code> objects.
- *
- * @author cmahoney
- */
-public class ElementTypeLabelProvider extends LabelProvider {
-
-	/**
-	 * Retrieves the image for <code>IElementType</code> objects using
-	 * the <code>IconService</code>.
-	 *
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	@Override
-	public Image getImage(Object object) {
-		if (object instanceof IElementType) {
-			return IconService.getInstance().getIcon((IElementType) object);
-		}
-		return null;
-	}
-
-	/**
-	 * Uses <code>IElementType.getDisplayName()</code> for the text.
-	 *
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	@Override
-	public String getText(Object object) {
-		if (object instanceof IElementType) {
-			return ((IElementType) object).getDisplayName();
-		} else {
-			return object.toString();
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/IGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/IGraphicalTypeRegistry.java
deleted file mode 100644
index 4f7b043b64b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/IGraphicalTypeRegistry.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-
-/**
- * This interface provides an API for accessing the local graphical type registry.
- * This registry provides a graphical type for existing model elements.
- */
-public interface IGraphicalTypeRegistry extends org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry {
-
-	// /** Constant for undefined graphical type */
-	// public static final String UNDEFINED_TYPE = "undefined_type";
-	//
-	// /**
-	// * Get a valid edge graphical type for the domain element.
-	// *
-	// * @param domainElement
-	// * the domain element.
-	// * @return the domain element graphical type.
-	// */
-	// public String getEdgeGraphicalType(EObject domainElement);
-	//
-	// /**
-	// * Get a valid edge graphical type for the element type.
-	// *
-	// * @param elementType
-	// * the element type.
-	// * @param containerType
-	// * the type of the graphical owner of the domain element.
-	// * @return the domain element graphical type.
-	// */
-	// public String getEdgeGraphicalType(IElementType elementType);
-	//
-	// /**
-	// * Get a valid edge graphical type for the proposed type.
-	// *
-	// * @param proposedType
-	// * the proposed type.
-	// * @param containerType
-	// * the type of the graphical owner of the domain element.
-	// * @return the domain element graphical type.
-	// */
-	// public String getEdgeGraphicalType(String proposedType);
-	//
-	// /**
-	// * Get a valid node graphical type for the domain element.
-	// *
-	// * @param domainElement
-	// * the domain element.
-	// * @param containerType
-	// * the type of the graphical owner of the domain element.
-	// * @return the domain element graphical type.
-	// */
-	// public String getNodeGraphicalType(EObject domainElement, String containerType);
-	//
-	// /**
-	// * Get a valid node graphical type for the element type.
-	// *
-	// * @param elementType
-	// * the element type.
-	// * @param containerType
-	// * the type of the graphical owner of the domain element.
-	// * @return the domain element graphical type.
-	// */
-	// public String getNodeGraphicalType(IElementType elementType, String containerType);
-	//
-	// /**
-	// * Get a valid node graphical type for the proposed type.
-	// *
-	// * @param proposedType
-	// * the proposed type.
-	// * @param containerType
-	// * the type of the graphical owner of the domain element.
-	// * @return the domain element graphical type.
-	// */
-	// public String getNodeGraphicalType(String proposedType, String containerType);
-	//
-	// /**
-	// * Test if the type is a known edge graphical type in this diagram
-	// *
-	// * @param type
-	// * the type to test
-	// * @return true if the type is known
-	// */
-	// public boolean isKnownEdgeType(String type);
-	//
-	// /**
-	// * Test if the type is a known node graphical type in this diagram
-	// *
-	// * @param type
-	// * the type to test
-	// * @return true if the type is known
-	// */
-	// public boolean isKnownNodeType(String type);
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/MarkerNavigationProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/MarkerNavigationProvider.java
deleted file mode 100644
index 8ad96a32158..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/MarkerNavigationProvider.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-
-/**
- * Non diagram-specific class generated by GMF Tooling.
- */
-public class MarkerNavigationProvider extends AbstractModelMarkerNavigationProvider {
-
-	public static final String MARKER_TYPE = Activator.PLUGIN_ID + ".diagnostic"; //$NON-NLS-1$
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void doGotoMarker(IMarker marker) {
-		String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null);
-		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {
-			return;
-		}
-		DiagramEditor editor = (DiagramEditor) getEditor();
-		Map editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();
-		EObject targetView = editor.getDiagram().eResource().getEObject(elementId);
-		if (targetView == null) {
-			return;
-		}
-		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);
-		if (targetEditPart != null) {
-			DiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart }));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public static void deleteMarkers(IResource resource) {
-		try {
-			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);
-		} catch (CoreException e) {
-			Activator.log.error("Failed to delete validation markers", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public static IMarker addMarker(IFile file, String elementId, String location, String message, int statusSeverity) {
-		IMarker marker = null;
-		try {
-			marker = file.createMarker(MARKER_TYPE);
-			marker.setAttribute(IMarker.MESSAGE, message);
-			marker.setAttribute(IMarker.LOCATION, location);
-			marker.setAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, elementId);
-			int markerSeverity = IMarker.SEVERITY_INFO;
-			if (statusSeverity == IStatus.WARNING) {
-				markerSeverity = IMarker.SEVERITY_WARNING;
-			} else if (statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) {
-				markerSeverity = IMarker.SEVERITY_ERROR;
-			}
-			marker.setAttribute(IMarker.SEVERITY, markerSeverity);
-		} catch (CoreException e) {
-			Activator.log.error("Failed to create validation marker", e); //$NON-NLS-1$
-		}
-		return marker;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/SysMLVisualTypeProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/SysMLVisualTypeProvider.java
deleted file mode 100644
index 302adcbd319..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/provider/SysMLVisualTypeProvider.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.diagram.common.provider;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype.AbstractVisualTypeProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype.IVisualTypeProvider;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Generic visual type provider for SysML diagrams that, for the most part, delegates
- * to the diagram's specific {@link IGraphicalTypeRegistry} and the {@link IVisualTypeProvider}
- * of the UML diagram that it extends.
- */
-public class SysMLVisualTypeProvider extends AbstractVisualTypeProvider {
-
-	private final IGraphicalTypeRegistry types;
-	private final IVisualTypeProvider uml;
-
-	/**
-	 * Initializes me with my delegates.
-	 *
-	 * @param types
-	 *            the graphical type registry to which I delegate SysML-specific queries
-	 * @param uml
-	 *            the visual type provider of the UML diagram that the SysML diagram extends
-	 */
-	protected SysMLVisualTypeProvider(IGraphicalTypeRegistry types, IVisualTypeProvider uml) {
-		super();
-
-		this.types = types;
-		this.uml = uml;
-	}
-
-	@Override
-	public IElementType getElementType(Diagram diagram, String viewType) {
-		IElementType result = getCustomElementType(viewType);
-
-		if ((result == null) && (viewType != null)) {
-			// Look for a standard SysML element type
-			for (Field field : SysMLElementTypes.class.getDeclaredFields()) {
-				if (IElementType.class.isAssignableFrom(field.getType()) && Modifier.isStatic(field.getModifiers()) && Modifier.isPublic(field.getModifiers())) {
-					try {
-						IElementType candidate = (IElementType) field.get(null);
-						if ((candidate instanceof IHintedType) && viewType.equals(((IHintedType) candidate).getSemanticHint())) {
-							result = candidate;
-							break;
-						}
-					} catch (Exception e) {
-						// Reflection problems on this class shouldn't happen
-						Activator.log.error(e);
-					}
-				}
-			}
-
-			if (result == null) {
-				// Still null? Try the UML diagram
-				result = uml.getElementType(diagram, viewType);
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Overridden by subclasses in diagrams that provide custom SysML visual element types
-	 * in their {@code ElementTypes} enumerations.
-	 * 
-	 * @param viewType
-	 *            the view type to look up
-	 * @return the corresponding element type, or {@code null} if none
-	 */
-	protected IElementType getCustomElementType(String viewType) {
-		return null;
-	}
-
-	@Override
-	public String getNodeType(View parentView, EObject element) {
-		String result = types.getNodeGraphicalType(element, parentView.getType());
-
-		if (result == null) {
-			// Try the UML diagram
-			result = uml.getNodeType(parentView, element);
-		}
-
-		return result;
-	}
-
-	@Override
-	public String getLinkType(Diagram diagram, EObject element) {
-		String result = types.getEdgeGraphicalType(element);
-
-		if (result == null) {
-			// Try the UML diagram
-			result = uml.getLinkType(diagram, element);
-		}
-
-		return result;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/ConstraintExtendedDirectEditionDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/ConstraintExtendedDirectEditionDialog.java
deleted file mode 100644
index 828b17e4c63..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/ConstraintExtendedDirectEditionDialog.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.swt.widgets.Shell;
-
-public class ConstraintExtendedDirectEditionDialog extends ExtendedDirectEditionDialog {
-
-	public ConstraintExtendedDirectEditionDialog(Shell parentShell,
-			Object object, String initialValue,
-			IDirectEditorConfiguration configuration) {
-		super(parentShell, object, initialValue, configuration);
-		this.title = "Edit Constraint specification";
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateActorPartWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateActorPartWithTypeConfigureCommandFactory.java
deleted file mode 100644
index 149116b6c6d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateActorPartWithTypeConfigureCommandFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectActorPartTypeDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * This command factory provides a command that enable ActorPart type to be selected or created during creation.
- */
-public class CreateActorPartWithTypeConfigureCommandFactory extends AbstractConfigureCommandFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand create(ConfigureRequest request) {
-
-		ICommand configureCommand = null;
-
-		Shell shell = Display.getDefault().getActiveShell();
-		// Start dialog to identify the new part type
-		Property part = (Property) request.getElementToConfigure();
-		Package partPkg = part.getNearestPackage();
-
-		CreateOrSelectActorPartTypeDialog dialog = new CreateOrSelectActorPartTypeDialog(shell, partPkg);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-
-			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type actorPartType = (Type) dialog.getExistingType();
-
-			// Abort if type creation command exists but is not executable
-			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
-				return cancelCommand(request);
-			} else {
-				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
-			}
-
-			// Create the configure command that will set the ActorPart type
-			ICommand setTypeCommand = new ConfigureElementCommand(request) {
-
-				@Override
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-					Property actorPart = (Property) getElementToEdit();
-					if (actorPartType != null) {
-						actorPart.setType(actorPartType);
-					} else {
-						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
-						actorPart.setType(newType);
-					}
-
-					return CommandResult.newOKCommandResult(actorPart);
-				}
-
-			};
-
-			configureCommand = CompositeCommand.compose(configureCommand, setTypeCommand);
-			return configureCommand;
-		}
-
-		return cancelCommand(request);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java
deleted file mode 100644
index 27fa06ed5f1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectConstraintPropertyTypeDialog;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * This command factory provides a command that enable Part type to be selected or created during creation.
- */
-public class CreateConstraintPropertyWithTypeConfigureCommandFactory extends AbstractConfigureCommandFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand create(ConfigureRequest request) {
-
-		ICommand configureCommand = null;
-
-		Shell shell = Display.getDefault().getActiveShell();
-		// Start dialog to identify the new part type
-		Property part = (Property) request.getElementToConfigure();
-		Package partPkg = part.getNearestPackage();
-
-		CreateOrSelectConstraintPropertyTypeDialog dialog = new CreateOrSelectConstraintPropertyTypeDialog(shell, partPkg);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-
-			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type) dialog.getExistingType();
-
-			// Abort if type creation command exists but is not executable
-			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
-				return cancelCommand(request);
-			} else {
-				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
-			}
-
-			// Create the configure command that will set the constraint property type
-			ICommand setTypeCommand = new ConfigureElementCommand(request) {
-
-				@Override
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-					Property part = (Property) getElementToEdit();
-					if (partType != null) {
-						part.setType(partType);
-					} else {
-						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
-						createConstraintBlockConstraint(newType, monitor, info);
-						part.setType(newType);
-					}
-					return CommandResult.newOKCommandResult(part);
-				}
-
-				private void createConstraintBlockConstraint(Type newType, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-					// Create the constraint attached to the ConstraintBlock
-					IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(newType);
-					if (commandService != null) {
-						CreateElementRequest createTypeRequest = new CreateElementRequest(newType, UMLElementTypes.CONSTRAINT);
-						createTypeRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID,
-								new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), newType.getName() + "Specification"));
-						ICommand newConstraintCreateCommand = commandService.getEditCommand(createTypeRequest);
-						if (newConstraintCreateCommand.canExecute()) {
-							newConstraintCreateCommand.execute(monitor, info);
-						}
-					}
-				}
-			};
-
-			configureCommand = CompositeCommand.compose(configureCommand, setTypeCommand);
-			return configureCommand;
-		}
-
-		return cancelCommand(request);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java.rej b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java.rej
deleted file mode 100644
index b38fb2c614a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateConstraintPropertyWithTypeConfigureCommandFactory.java.rej
+++ /dev/null
@@ -1,30 +0,0 @@
-@@ -105,29 +99,6 @@
- 						ICommand newConstraintCreateCommand = commandService.getEditCommand(createTypeRequest);
- 						if (newConstraintCreateCommand.canExecute()) {
- 							newConstraintCreateCommand.execute(monitor, info);
--							Object newObject = newConstraintCreateCommand.getCommandResult().getReturnValue();
--							// Create the constraint specification
--							if (newObject instanceof EObject) {
--								final EObject newElement = (EObject)newObject;
--								final IDirectEditorConfiguration configuration = initExtendedEditorConfiguration(newElement);
--								try {
--									Dialog dialog = new ConstraintExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), newElement, configuration.getTextToEdit(newElement), configuration);
--									final Dialog finalDialog = dialog;
--									if(Window.OK == dialog.open()) {
--										TransactionalEditingDomain domain = getEditingDomain();
--										RecordingCommand command = new RecordingCommand(domain, "Edit Constraint specification") {
--											@Override
--											protected void doExecute() {
--												configuration.postEditAction(newElement, ((ILabelEditorDialog)finalDialog).getValue());
--											}
--										};
--										domain.getCommandStack().execute(command);
--									}							
--								} catch (Exception e) {
--									Activator.log.error("Problem during editing Constaint", e);
--								}
--							}
--
- 						}
- 					}
- 				}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateFlowPortWithFlowSpecificationConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateFlowPortWithFlowSpecificationConfigureCommandFactory.java
deleted file mode 100644
index afb8cff0a8f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateFlowPortWithFlowSpecificationConfigureCommandFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectNonAtomicFlowPortTypeDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * This command factory provides a command that enable FlowPort type (FlowSpecification) to be selected or created during creation.
- */
-public class CreateFlowPortWithFlowSpecificationConfigureCommandFactory extends AbstractConfigureCommandFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand create(ConfigureRequest request) {
-
-		ICommand configureCommand = null;
-
-		Shell shell = Display.getDefault().getActiveShell();
-		// Start dialog to identify the new port type
-		Port port = (Port) request.getElementToConfigure();
-		Package partPkg = port.getNearestPackage();
-
-		CreateOrSelectNonAtomicFlowPortTypeDialog dialog = new CreateOrSelectNonAtomicFlowPortTypeDialog(shell, partPkg);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-
-			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type portType = (Type) dialog.getExistingType();
-
-			// Abort if type creation command exists but is not executable
-			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
-				return cancelCommand(request);
-			} else {
-				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
-			}
-
-			// Create the configure command that will set the part type
-			ICommand setTypeCommand = new ConfigureElementCommand(request) {
-
-				@Override
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-					Port port = (Port) getElementToEdit();
-					if (portType != null) {
-						port.setType(portType);
-					} else {
-						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
-						port.setType(newType);
-					}
-					return CommandResult.newOKCommandResult(port);
-				}
-
-			};
-
-			configureCommand = CompositeCommand.compose(configureCommand, setTypeCommand);
-			return configureCommand;
-		}
-
-		return cancelCommand(request);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreatePartWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreatePartWithTypeConfigureCommandFactory.java
deleted file mode 100644
index f0d0c85cdbe..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreatePartWithTypeConfigureCommandFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectBlockPropertyTypeDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * This command factory provides a command that enable Part type to be selected or created during creation.
- */
-public class CreatePartWithTypeConfigureCommandFactory extends AbstractConfigureCommandFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand create(ConfigureRequest request) {
-
-		ICommand configureCommand = null;
-
-		Shell shell = Display.getDefault().getActiveShell();
-		// Start dialog to identify the new part type
-		Property part = (Property) request.getElementToConfigure();
-		Package partPkg = part.getNearestPackage();
-
-		CreateOrSelectBlockPropertyTypeDialog dialog = new CreateOrSelectBlockPropertyTypeDialog(shell, partPkg);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-
-			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type) dialog.getExistingType();
-
-			// Abort if type creation command exists but is not executable
-			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
-				return cancelCommand(request);
-			} else {
-				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
-			}
-
-			// Create the configure command that will set the part type
-			ICommand setTypeCommand = new ConfigureElementCommand(request) {
-
-				@Override
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-					Property part = (Property) getElementToEdit();
-					if (partType != null) {
-						part.setType(partType);
-					} else {
-						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
-						part.setType(newType);
-					}
-					return CommandResult.newOKCommandResult(part);
-				}
-
-			};
-
-			configureCommand = CompositeCommand.compose(configureCommand, setTypeCommand);
-			return configureCommand;
-		}
-
-		return cancelCommand(request);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateReferenceWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateReferenceWithTypeConfigureCommandFactory.java
deleted file mode 100644
index 646689f789a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateReferenceWithTypeConfigureCommandFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectBlockPropertyTypeDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * This command factory provides a command that enable Reference type to be selected or created during creation.
- */
-public class CreateReferenceWithTypeConfigureCommandFactory extends AbstractConfigureCommandFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand create(ConfigureRequest request) {
-
-		ICommand configureCommand = null;
-
-		Shell shell = Display.getDefault().getActiveShell();
-		// Start dialog to identify the new part type
-		Property part = (Property) request.getElementToConfigure();
-		Package partPkg = part.getNearestPackage();
-
-		CreateOrSelectBlockPropertyTypeDialog dialog = new CreateOrSelectBlockPropertyTypeDialog(shell, partPkg);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-
-			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type) dialog.getExistingType();
-
-			// Abort if type creation command exists but is not executable
-			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
-				return cancelCommand(request);
-			} else {
-				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
-			}
-
-			// Create the configure command that will set the part type
-			ICommand setTypeCommand = new ConfigureElementCommand(request) {
-
-				@Override
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-					Property part = (Property) getElementToEdit();
-					if (partType != null) {
-						part.setType(partType);
-					} else {
-						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
-						part.setType(newType);
-					}
-					return CommandResult.newOKCommandResult(part);
-				}
-
-			};
-
-			configureCommand = CompositeCommand.compose(configureCommand, setTypeCommand);
-			return configureCommand;
-		}
-
-		return cancelCommand(request);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateValueWithTypeConfigureCommandFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateValueWithTypeConfigureCommandFactory.java
deleted file mode 100644
index 46a2c3db47c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/commands/CreateValueWithTypeConfigureCommandFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.infra.services.edit.commands.AbstractConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.sysml.diagram.common.dialogs.CreateOrSelectValuePropertyTypeDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * This command factory provides a command that enable Value type to be selected or created during creation.
- */
-public class CreateValueWithTypeConfigureCommandFactory extends AbstractConfigureCommandFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand create(ConfigureRequest request) {
-
-		ICommand configureCommand = null;
-
-		Shell shell = Display.getDefault().getActiveShell();
-		// Start dialog to identify the new part type
-		Property part = (Property) request.getElementToConfigure();
-		Package partPkg = part.getNearestPackage();
-
-		CreateOrSelectValuePropertyTypeDialog dialog = new CreateOrSelectValuePropertyTypeDialog(shell, partPkg);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-
-			final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
-			final Type partType = (Type) dialog.getExistingType();
-
-			// Abort if type creation command exists but is not executable
-			if ((typeCreationCommand != null) && (!typeCreationCommand.canExecute())) {
-				return cancelCommand(request);
-			} else {
-				configureCommand = CompositeCommand.compose(configureCommand, typeCreationCommand);
-			}
-
-			// Create the configure command that will set the part type
-			ICommand setTypeCommand = new ConfigureElementCommand(request) {
-
-				@Override
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-					Property part = (Property) getElementToEdit();
-					if (partType != null) {
-						part.setType(partType);
-					} else {
-						Type newType = (Type) GMFCommandUtils.getCommandEObjectResult(typeCreationCommand);
-						part.setType(newType);
-					}
-					return CommandResult.newOKCommandResult(part);
-				}
-
-			};
-
-			configureCommand = CompositeCommand.compose(configureCommand, setTypeCommand);
-			return configureCommand;
-		}
-
-		return cancelCommand(request);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectActorPartTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectActorPartTypeDialog.java
deleted file mode 100644
index 8e0340d194b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectActorPartTypeDialog.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.dialogs;
-
-import org.eclipse.papyrus.sysml.diagram.common.messages.Messages;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Dialog for initialization of ActorPart (Property) type (the type is either selected or created).
- */
-public class CreateOrSelectActorPartTypeDialog extends CreateOrSelectTypeDialog {
-
-	/** Constructor */
-	public CreateOrSelectActorPartTypeDialog(Shell shell, NamedElement owner) {
-		super(shell, owner, UMLElementTypes.ACTOR, UMLPackage.eINSTANCE.getTypedElement_Type(), UMLPackage.eINSTANCE.getActor(), UMLElementTypes.PACKAGE, UMLPackage.eINSTANCE.getPackage_PackagedElement(), null);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDialogTitle() {
-		return Messages.CreateOrSelectActorPartTypeDialog_DialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionTitle() {
-		return Messages.CreateOrSelectActorPartTypeDialog_SelectionSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionRadioLabel() {
-		return Messages.CreateOrSelectActorPartTypeDialog_SelectionSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionTitle() {
-		return Messages.CreateOrSelectActorPartTypeDialog_CreationSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionRadioLabel() {
-		return Messages.CreateOrSelectActorPartTypeDialog_CreationSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeNameLabel() {
-		return Messages.CreateOrSelectActorPartTypeDialog_NewTypeNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerNameLabel() {
-		return Messages.CreateOrSelectActorPartTypeDialog_NewTypeContainerNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogTitle() {
-		return Messages.CreateOrSelectActorPartTypeDialog_SelectNewTypeContainerDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogMessage() {
-		return Messages.CreateOrSelectActorPartTypeDialog_SelectNewTypeContainerDialogMessage;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogTitle() {
-		return Messages.CreateOrSelectActorPartTypeDialog_SelectTypeDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogMessage() {
-		return Messages.CreateOrSelectActorPartTypeDialog_SelectTypeDialogMessage;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectBlockPropertyTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectBlockPropertyTypeDialog.java
deleted file mode 100644
index a7a541d4415..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectBlockPropertyTypeDialog.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.dialogs;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.sysml.diagram.common.messages.Messages;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Dialog for initialization of Part (Property) type (the type is either selected or created).
- */
-public class CreateOrSelectBlockPropertyTypeDialog extends CreateOrSelectTypeDialog {
-
-	/** Constructor */
-	public CreateOrSelectBlockPropertyTypeDialog(Shell shell, NamedElement owner) {
-		super(shell, owner, SysMLElementTypes.BLOCK, UMLPackage.eINSTANCE.getTypedElement_Type(), BlocksPackage.eINSTANCE.getBlock(), UMLElementTypes.PACKAGE, UMLPackage.eINSTANCE.getPackage_PackagedElement(), null, getConstraintBlockAsStereotype());
-	}
-
-	/**
-	 * If we create a Part type by a ConstraintBlock, thisPart will become a ConstraintProperty and representation will immediately disappear.
-	 * So we filter ConstraintBlock type => Only strict Block are allowed
-	 *
-	 * @return
-	 */
-	@SuppressWarnings("deprecation")
-	private static List<?> getConstraintBlockAsStereotype() {
-		// We create a mock Stereotype to pass in the good code section of SemanticUMLContentProvider.isCompatibleMetaclass (bad gestion of static stereotypes)
-		Stereotype mockStereotype = UMLFactory.eINSTANCE.createStereotype();
-		// We use this stereotype with namespace instead of ConstraintsPackage.eINSTANCE.getConstraintBlock()
-		mockStereotype.setName(SysmlResource.CONSTRAINT_BLOCK_ID);
-		return Arrays.asList(mockStereotype);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDialogTitle() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_DialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionTitle() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_SelectionSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionRadioLabel() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_SelectionSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionTitle() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_CreationSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionRadioLabel() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_CreationSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeNameLabel() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_NewTypeNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerNameLabel() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_NewTypeContainerNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogTitle() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_SelectNewTypeContainerDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogMessage() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_SelectNewTypeContainerDialogMessage;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogTitle() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_SelectTypeDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogMessage() {
-		return Messages.CreateOrSelectBlockPropertyTypeDialog_SelectTypeDialogMessage;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectConstraintPropertyTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectConstraintPropertyTypeDialog.java
deleted file mode 100644
index 48f950103ee..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectConstraintPropertyTypeDialog.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.dialogs;
-
-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.sysml.diagram.common.messages.Messages;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Dialog for initialization of Part (Property) type (the type is either selected or created).
- */
-public class CreateOrSelectConstraintPropertyTypeDialog extends CreateOrSelectTypeDialog {
-
-	/** Constructor */
-	public CreateOrSelectConstraintPropertyTypeDialog(Shell shell, NamedElement owner) {
-		super(shell, owner, SysMLElementTypes.CONSTRAINT_BLOCK, UMLPackage.eINSTANCE.getTypedElement_Type(), ConstraintsPackage.eINSTANCE.getConstraintBlock(), UMLElementTypes.PACKAGE, UMLPackage.eINSTANCE.getPackage_PackagedElement(), null);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDialogTitle() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_DialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionTitle() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_SelectionSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionRadioLabel() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_SelectionSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionTitle() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_CreationSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionRadioLabel() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_CreationSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeNameLabel() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_NewTypeNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerNameLabel() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_NewTypeContainerNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogTitle() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_SelectNewTypeContainerDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogMessage() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_SelectNewTypeContainerDialogMessage;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogTitle() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_SelectTypeDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogMessage() {
-		return Messages.CreateOrSelectConstraintPropertyTypeDialog_SelectTypeDialogMessage;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectNonAtomicFlowPortTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectNonAtomicFlowPortTypeDialog.java
deleted file mode 100644
index 50fa0e189d7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectNonAtomicFlowPortTypeDialog.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.dialogs;
-
-import org.eclipse.papyrus.sysml.diagram.common.messages.Messages;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Dialog for initialization of non atomic FlowPort type (the type is a FlowSpecification either selected or created).
- */
-public class CreateOrSelectNonAtomicFlowPortTypeDialog extends CreateOrSelectTypeDialog {
-
-	/** Constructor */
-	public CreateOrSelectNonAtomicFlowPortTypeDialog(Shell shell, NamedElement owner) {
-		super(shell, owner, SysMLElementTypes.FLOW_SPECIFICATION, UMLPackage.eINSTANCE.getTypedElement_Type(), PortandflowsPackage.eINSTANCE.getFlowSpecification(), UMLElementTypes.PACKAGE, UMLPackage.eINSTANCE.getPackage_PackagedElement(), null);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDialogTitle() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_DialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionTitle() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_SelectionSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionRadioLabel() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_SelectionSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionTitle() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_CreationSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionRadioLabel() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_CreationSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeNameLabel() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_NewTypeNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerNameLabel() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_NewTypeContainerNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogTitle() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogMessage() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogMessage;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogTitle() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_SelectTypeDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogMessage() {
-		return Messages.CreateOrSelectNonAtomicFlowPortTypeDialog_SelectTypeDialogMessage;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
deleted file mode 100644
index 79a4e924431..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.dialogs;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-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.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.sysml.diagram.common.messages.Messages;
-import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.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.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.FormDialog;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Dialog for initialization of Property type (the type is either selected or created).
- */
-public class CreateOrSelectTypeDialog extends FormDialog {
-
-	protected Button creationRadio;
-
-	protected Button selectionRadio;
-
-	protected Text newTypeNameText;
-
-	protected Text newTypeContainerNameText;
-
-	protected Button newTypeContainerButton;
-
-	protected String newTypeName = null;
-
-	protected ICommand newTypeCreateCommand = null;
-
-	protected EObject newTypeContainer = null;
-
-	protected Text existingTypeNameText;
-
-	protected Button existingTypeButton;
-
-	protected EObject existingType = null;
-
-	protected EObject defaultContainer;
-
-	protected ILabelProvider labelProvider;
-
-	protected IElementType elementType;
-
-	protected EStructuralFeature editedFeature;
-
-	protected EClass elementEClass;
-
-	protected IElementType containerType;
-
-	protected EStructuralFeature containerFeature;
-
-	protected EClass containerEClass;
-
-	protected List<?> notWantedMetaclasses;
-
-	/**
-	 * Create a new dialog to initialize an ActivityParameterNode.
-	 *
-	 * @param shell
-	 *            parent shell
-	 * @param owner
-	 *            the activity that owns the action
-	 */
-	public CreateOrSelectTypeDialog(Shell shell, EObject defaultContainer, IElementType elementType, EStructuralFeature editedFeature, EClass elementEClass, IElementType containerType, EStructuralFeature containerFeature, EClass containerEClass) {
-		super(shell);
-		this.defaultContainer = defaultContainer;
-		this.elementType = elementType;
-		this.editedFeature = editedFeature;
-		this.elementEClass = elementEClass;
-		this.containerType = containerType;
-		this.containerFeature = containerFeature;
-		this.containerEClass = containerEClass;
-		this.labelProvider = new UMLLabelProvider();
-		this.notWantedMetaclasses = new LinkedList<Object>();
-	}
-
-	/**
-	 * Create a new dialog to initialize an ActivityParameterNode.
-	 * This dialog will filter certain Stereotypes
-	 *
-	 * @param shell
-	 *            parent shell
-	 * @param owner
-	 *            the activity that owns the action
-	 */
-	public CreateOrSelectTypeDialog(Shell shell, EObject defaultContainer, IElementType elementType, EStructuralFeature editedFeature, EClass elementEClass, IElementType containerType, EStructuralFeature containerFeature, EClass containerEClass,
-			List<?> notWantedMetaclasses) {
-		this(shell, defaultContainer, elementType, editedFeature, elementEClass, containerType, containerFeature, containerEClass);
-		this.notWantedMetaclasses = notWantedMetaclasses;
-	}
-
-	protected String getDialogTitle() {
-		return Messages.CreateOrSelectTypeDialog_DialogTitle;
-	}
-
-	protected String getSelectionSectionTitle() {
-		return Messages.CreateOrSelectTypeDialog_SelectionSectionTitle;
-	}
-
-	protected String getSelectionSectionRadioLabel() {
-		return Messages.CreateOrSelectTypeDialog_SelectionSectionRadioLabel;
-	}
-
-	protected String getCreationSectionTitle() {
-		return Messages.CreateOrSelectTypeDialog_CreationSectionTitle;
-	}
-
-	protected String getCreationSectionRadioLabel() {
-		return Messages.CreateOrSelectTypeDialog_CreationSectionRadioLabel;
-	}
-
-	protected String getNewTypeNameLabel() {
-		return Messages.CreateOrSelectTypeDialog_NewTypeNameLabel;
-	}
-
-	protected String getNewTypeContainerNameLabel() {
-		return Messages.CreateOrSelectTypeDialog_NewTypeContainerNameLabel;
-	}
-
-	protected String getNewTypeContainerDialogTitle() {
-		return Messages.CreateOrSelectTypeDialog_SelectNewTypeContainerDialogTitle;
-	}
-
-	protected String getNewTypeContainerDialogMessage() {
-		return Messages.CreateOrSelectTypeDialog_SelectNewTypeContainerDialogMessage;
-	}
-
-	protected String getTypeDialogTitle() {
-		return Messages.CreateOrSelectTypeDialog_SelectTypeDialogTitle;
-	}
-
-	protected String getTypeDialogMessage() {
-		return Messages.CreateOrSelectTypeDialog_SelectTypeDialogMessage;
-	}
-
-	/**
-	 * Create the form to :
-	 *
-	 * - ask the user to choose or create an existing element.
-	 *
-	 * @see org.eclipse.ui.forms.FormDialog#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	@Override
-	protected void createFormContent(IManagedForm pForm) {
-		pForm.getForm().setText(getDialogTitle());
-		ScrolledForm scrolledForm = pForm.getForm();
-		FormToolkit toolkit = pForm.getToolkit();
-		Composite parent = scrolledForm.getBody();
-		parent.setLayout(new GridLayout());
-
-		createFormCreationSection(scrolledForm.getBody(), toolkit);
-		createFormSelectionSection(scrolledForm.getBody(), toolkit);
-
-		refreshSectionsEnable(false);
-		hookListeners();
-		// invoked name is set after listeners, since we count on listener to update it properly
-		setNewTypeContainer(defaultContainer);
-		setNewTypeName(null);
-
-		scrolledForm.reflow(true);
-	}
-
-	/**
-	 * Adds buttons to this dialog's button bar.
-	 *
-	 * @param parent
-	 *            the button bar composite
-	 */
-	@Override
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		refreshOkButton();
-	}
-
-	/**
-	 * Create the section to ask the user to choose an existing element.
-	 *
-	 * @param pParent
-	 *            the section's parent widget
-	 * @param pToolkit
-	 *            the form toolkit
-	 */
-	protected void createFormSelectionSection(Composite pParent, FormToolkit pToolkit) {
-		// create the section
-		String lSectionTitle = getSelectionSectionTitle();
-		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);
-		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		if (lSectionTitle != null) {
-			lSection.setText(lSectionTitle);
-		}
-
-		ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
-		lInsideScrolledForm.setExpandHorizontal(true);
-		lInsideScrolledForm.setExpandVertical(true);
-		Composite lBody = lInsideScrolledForm.getBody();
-
-		GridLayout lLayout = new GridLayout();
-		lLayout.numColumns = 3;
-		lBody.setLayout(lLayout);
-
-		// content of the section
-		selectionRadio = pToolkit.createButton(lBody, getSelectionSectionRadioLabel(), SWT.RADIO);
-		selectionRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-
-		// manage elementType selection
-		pToolkit.createLabel(lBody, elementType.getDisplayName(), SWT.NONE);
-		existingTypeNameText = pToolkit.createText(lBody, "", SWT.BORDER | SWT.READ_ONLY);
-		existingTypeNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		existingTypeButton = pToolkit.createButton(lBody, "...", SWT.FLAT);
-
-		Image image = Activator.getInstance().getImage(elementType.getEClass());
-		if (elementEClass != null) {
-			image = Activator.getInstance().getImage(elementEClass);
-		}
-
-		existingTypeButton.setImage(image);
-		existingTypeButton.setLayoutData(new GridData(SWT.NONE));
-
-		lInsideScrolledForm.reflow(true);
-		lSection.setClient(lInsideScrolledForm);
-	}
-
-	/**
-	 * Create the section to ask the user to create an invoked element.
-	 *
-	 * @param pParent
-	 *            the section's parent widget
-	 * @param pToolkit
-	 *            the form toolkit
-	 */
-	protected void createFormCreationSection(Composite pParent, FormToolkit pToolkit) {
-		// create the section
-		String lSectionTitle = getCreationSectionTitle();
-		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);
-		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		if (lSectionTitle != null) {
-			lSection.setText(lSectionTitle);
-		}
-
-		ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
-		lInsideScrolledForm.setExpandHorizontal(true);
-		lInsideScrolledForm.setExpandVertical(true);
-		Composite lBody = lInsideScrolledForm.getBody();
-
-		GridLayout lLayout = new GridLayout();
-		lLayout.numColumns = 3;
-		lBody.setLayout(lLayout);
-
-		// content of the section
-		creationRadio = pToolkit.createButton(lBody, getCreationSectionRadioLabel(), SWT.RADIO);
-		creationRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-
-		pToolkit.createLabel(lBody, getNewTypeNameLabel(), SWT.NONE);
-		newTypeNameText = pToolkit.createText(lBody, "", SWT.BORDER);
-		newTypeNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-		newTypeNameText.setFocus();
-
-		// manage type selection
-		pToolkit.createLabel(lBody, getNewTypeContainerNameLabel(), SWT.NONE);
-		newTypeContainerNameText = pToolkit.createText(lBody, labelProvider.getText(newTypeContainer), SWT.BORDER | SWT.READ_ONLY);
-		newTypeContainerNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		newTypeContainerButton = pToolkit.createButton(lBody, "...", SWT.FLAT);
-		Image image = Activator.getInstance().getImage(containerType.getEClass());
-		if (containerEClass != null) {
-			image = Activator.getInstance().getImage(containerEClass);
-		}
-		newTypeContainerButton.setImage(image);
-		newTypeContainerButton.setLayoutData(new GridData(SWT.NONE));
-
-		lInsideScrolledForm.reflow(true);
-		lSection.setClient(lInsideScrolledForm);
-	}
-
-
-	@Override
-	protected void okPressed() {
-
-		// Build type creation command if needed
-		boolean isSelectionMode = selectionRadio.getSelection();
-		if (!isSelectionMode) {
-			// Creation mode - Prepare type creation command and set existing type to null.
-			existingType = null;
-			buildNewTypeCreateCommand();
-
-		} else {
-			// Selection mode - Set the type creation command to null.
-			newTypeCreateCommand = null;
-		}
-
-		super.okPressed();
-	}
-
-	protected void buildNewTypeCreateCommand() {
-		// The new element is expected to be a NamedElement.
-		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(newTypeContainer);
-		if (commandService != null) {
-			CreateElementRequest createTypeRequest = new CreateElementRequest(newTypeContainer, elementType);
-			createTypeRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), newTypeNameText.getText()));
-			newTypeCreateCommand = commandService.getEditCommand(createTypeRequest);
-		}
-	}
-
-	public ICommand getNewTypeCreateCommand() {
-		return newTypeCreateCommand;
-	}
-
-	public String getNewTypeName() {
-		return newTypeNameText.getText();
-	}
-
-	public EObject getExistingType() {
-		return existingType;
-	}
-
-	/**
-	 * Add listeners to widgets
-	 */
-	protected void hookListeners() {
-		// listener to choose active section
-		SelectionListener selectCreateListener = new SelectionAdapter() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (creationRadio.equals(e.getSource())) {
-					refreshSectionsEnable(false);
-				} else {
-					refreshSectionsEnable(true);
-				}
-				refreshOkButton();
-			}
-		};
-		selectionRadio.addSelectionListener(selectCreateListener);
-		creationRadio.addSelectionListener(selectCreateListener);
-
-		// listener to select existing element
-		SelectionListener selectBtnListener = new SelectionAdapter() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleChooseType();
-				refreshOkButton();
-			}
-		};
-		existingTypeButton.addSelectionListener(selectBtnListener);
-
-		// listener to existing element name
-		ModifyListener lNameListener = new ModifyListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-			 */
-			@Override
-			public void modifyText(ModifyEvent e) {
-				setNewTypeName(existingTypeNameText.getText());
-			}
-		};
-		existingTypeNameText.addModifyListener(lNameListener);
-
-		// listener to select new element type container
-		SelectionListener selectTypeBtnListener = new SelectionAdapter() {
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleChooseNewTypeContainer();
-				// reset name if not set
-				if (newTypeName == null) {
-					setNewTypeName(null);
-				}
-				refreshOkButton();
-			}
-		};
-		newTypeContainerButton.addSelectionListener(selectTypeBtnListener);
-
-		// listener to new element name
-		ModifyListener lNewNameListener = new ModifyListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-			 */
-			@Override
-			public void modifyText(ModifyEvent e) {
-				validateNewTypeName();
-				refreshOkButton();
-			}
-		};
-		newTypeNameText.addModifyListener(lNewNameListener);
-	}
-
-	/**
-	 * Set the name of the new type
-	 *
-	 * @param text
-	 *            the text string or null for auto-initialization
-	 */
-	protected void setNewTypeName(String text) {
-		String name = text;
-		if (text == null) {
-			name = NamedElementUtil.getDefaultNameWithIncrementFromBase(elementType.getEClass().getName(), newTypeContainer.eContents());
-			if (elementEClass != null) {
-				name = NamedElementUtil.getDefaultNameWithIncrementFromBase(elementEClass.getName(), newTypeContainer.eContents());
-			}
-			newTypeNameText.setText(name);
-
-		} else {
-			newTypeNameText.setText(name);
-			newTypeName = name;
-		}
-
-		validateNewTypeName();
-		refreshOkButton();
-	}
-
-	protected void validateNewTypeName() {
-		if (isValidName(newTypeContainer, newTypeNameText.getText())) {
-			Color black = newTypeNameText.getDisplay().getSystemColor(SWT.COLOR_BLACK);
-			newTypeNameText.setForeground(black);
-
-		} else {
-			Color red = newTypeNameText.getDisplay().getSystemColor(SWT.COLOR_RED);
-			newTypeNameText.setForeground(red);
-		}
-	}
-
-	protected boolean isValidName(EObject container, String newName) {
-		boolean isValid = true;
-		if (container instanceof Namespace) {
-			if (((Namespace) container).getOwnedMember(newName) != null) {
-				isValid = false;
-			}
-		}
-
-		return isValid;
-	}
-
-	/** Open the dialog to choose an existing type */
-	protected void handleChooseType() {
-
-		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());
-
-		dialog.setMessage(getTypeDialogMessage());
-		dialog.setTitle(getTypeDialogTitle());
-		dialog.setInput(EcoreUtil.getRootContainer(defaultContainer));
-
-		ServiceEditContentProvider provider = new ServiceEditContentProvider(elementType, editedFeature, EcoreUtil.getRootContainer(defaultContainer));
-		provider.setNotWantedMetaclasses(notWantedMetaclasses);
-
-		dialog.setContentProvider(provider);
-		dialog.setLabelProvider(labelProvider);
-
-		if (dialog.open() == Window.OK) {
-			Object result = dialog.getResult()[0];
-			if (result instanceof IAdaptable) {
-				result = EMFHelper.getEObject(result);
-			}
-
-			if (result instanceof EObject) {
-				setExistingTypeSelection((EObject) result);
-			} else {
-				setExistingTypeSelection(null);
-			}
-		}
-	}
-
-	/**
-	 * Set the existing type selected (if selection mode is chosen)
-	 *
-	 * @param invokedElement
-	 *            the selected element
-	 */
-	protected void setExistingTypeSelection(EObject type) {
-		if (type == null) {
-			existingTypeNameText.setText("");
-		} else {
-			existingType = type;
-			existingTypeNameText.setText(labelProvider.getText(existingType));
-		}
-	}
-
-	/** Open the dialog to choose new type container */
-	protected void handleChooseNewTypeContainer() {
-
-		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());
-
-		dialog.setMessage(getNewTypeContainerDialogMessage());
-		dialog.setTitle(getNewTypeContainerDialogTitle());
-		dialog.setInput(EcoreUtil.getRootContainer(defaultContainer));
-
-		ServiceEditContentProvider provider = new ServiceEditContentProvider(containerType, containerFeature, EcoreUtil.getRootContainer(defaultContainer));
-		dialog.setContentProvider(provider);
-		dialog.setLabelProvider(labelProvider);
-
-		if (dialog.open() == Window.OK) {
-			Object result = dialog.getResult()[0];
-			if (result instanceof IAdaptable) {
-				result = EMFHelper.getEObject(result);
-			}
-
-			if (result instanceof EObject) {
-				setNewTypeContainer((EObject) result);
-			} else {
-				setNewTypeContainer(null);
-			}
-		}
-	}
-
-	/**
-	 * Define the type of the object that will be created (if creation mode is chosen)
-	 *
-	 * @param the
-	 *            selected parent
-	 */
-	protected void setNewTypeContainer(EObject container) {
-
-		if ((containerType instanceof ISpecializationType) && ((ISpecializationType) containerType).getMatcher().matches(container)) {
-			newTypeContainer = container;
-			newTypeContainerNameText.setText(labelProvider.getText(newTypeContainer));
-
-		} else if (containerType.getEClass().isInstance(container)) {
-			newTypeContainer = container;
-			newTypeContainerNameText.setText(labelProvider.getText(newTypeContainer));
-
-		} else {
-			newTypeContainer = null;
-			newTypeContainerNameText.setText("");
-		}
-	}
-
-	/**
-	 * Refresh the enabled and disabled elements in various sections
-	 *
-	 * @param isSelectionSelected
-	 *            true if we choose to select an existing element, false if we choose to create an element
-	 */
-	private void refreshSectionsEnable(boolean isSelectionSelected) {
-		// handle radio button value
-		if (isSelectionSelected) {
-			creationRadio.setSelection(false);
-			if (!selectionRadio.getSelection()) {
-				selectionRadio.setSelection(true);
-			}
-		} else {
-			selectionRadio.setSelection(false);
-			if (!creationRadio.getSelection()) {
-				creationRadio.setSelection(true);
-			}
-		}
-		// handle disabled section
-		existingTypeNameText.setEnabled(isSelectionSelected);
-		existingTypeButton.setEnabled(isSelectionSelected);
-		newTypeNameText.setEnabled(!isSelectionSelected);
-		newTypeNameText.setFocus();
-		newTypeContainerNameText.setEnabled(!isSelectionSelected);
-		newTypeContainerButton.setEnabled(!isSelectionSelected);
-	}
-
-
-	/** Refresh the OK button activation */
-	protected void refreshOkButton() {
-		boolean isSelectionSelected = selectionRadio.getSelection();
-		if (getButton(IDialogConstants.OK_ID) != null && !getButton(IDialogConstants.OK_ID).isDisposed()) {
-			if (isSelectionSelected) {
-				getButton(IDialogConstants.OK_ID).setEnabled(existingType != null);
-			} else {
-				getButton(IDialogConstants.OK_ID).setEnabled((newTypeContainer != null) && (isValidName(newTypeContainer, newTypeNameText.getText())));
-			}
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectValuePropertyTypeDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectValuePropertyTypeDialog.java
deleted file mode 100644
index 16503d2da56..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/CreateOrSelectValuePropertyTypeDialog.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.dialogs;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.gmf.diagram.common.provider.ElementTypeLabelProvider;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.sysml.diagram.common.messages.Messages;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-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.Shell;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Dialog for initialization of Value (Property) type (the type is either selected or created).
- */
-public class CreateOrSelectValuePropertyTypeDialog extends CreateOrSelectTypeDialog {
-
-	protected ComboViewer newTypeKindComboViewer = null;
-
-	protected Combo newTypeKindCombo = null;
-
-	protected IElementType[] valueTypeKind = { UMLElementTypes.DATA_TYPE, SysMLElementTypes.VALUE_TYPE, UMLElementTypes.PRIMITIVE_TYPE, UMLElementTypes.ENUMERATION };
-
-	protected IElementType newTypeKind = UMLElementTypes.DATA_TYPE;
-
-	/** Constructor */
-	public CreateOrSelectValuePropertyTypeDialog(Shell shell, NamedElement owner) {
-		super(shell, owner, UMLElementTypes.DATA_TYPE, UMLPackage.eINSTANCE.getTypedElement_Type(), null, UMLElementTypes.PACKAGE, UMLPackage.eINSTANCE.getPackage_PackagedElement(), null);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createFormCreationSection(Composite pParent, FormToolkit pToolkit) {
-		// create the section
-		String lSectionTitle = getCreationSectionTitle();
-		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);
-		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		if (lSectionTitle != null) {
-			lSection.setText(lSectionTitle);
-		}
-
-		ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);
-		lInsideScrolledForm.setExpandHorizontal(true);
-		lInsideScrolledForm.setExpandVertical(true);
-		Composite lBody = lInsideScrolledForm.getBody();
-
-		GridLayout lLayout = new GridLayout();
-		lLayout.numColumns = 3;
-		lBody.setLayout(lLayout);
-
-		// content of the section
-		creationRadio = pToolkit.createButton(lBody, getCreationSectionRadioLabel(), SWT.RADIO);
-		creationRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-
-		pToolkit.createLabel(lBody, getNewTypeNameLabel(), SWT.NONE);
-		newTypeNameText = pToolkit.createText(lBody, "", SWT.BORDER);
-		newTypeNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-		newTypeNameText.setFocus();
-
-		// manage type selection
-		pToolkit.createLabel(lBody, getNewTypeContainerNameLabel(), SWT.NONE);
-		newTypeContainerNameText = pToolkit.createText(lBody, labelProvider.getText(newTypeContainer), SWT.BORDER | SWT.READ_ONLY);
-		newTypeContainerNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		newTypeContainerButton = pToolkit.createButton(lBody, "...", SWT.FLAT);
-		Image image = Activator.getInstance().getImage(containerType.getEClass());
-		if (containerEClass != null) {
-			image = Activator.getInstance().getImage(containerEClass);
-		}
-		newTypeContainerButton.setImage(image);
-		newTypeContainerButton.setLayoutData(new GridData(SWT.NONE));
-
-		pToolkit.createLabel(lBody, getNewTypeKindLabel(), SWT.NONE);
-		newTypeKindCombo = new Combo(lBody, SWT.DROP_DOWN | SWT.READ_ONLY);
-		newTypeKindComboViewer = new ComboViewer(newTypeKindCombo);
-		pToolkit.adapt(newTypeKindCombo);
-		newTypeKindCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-		newTypeKindComboViewer.setLabelProvider(new ElementTypeLabelProvider());
-		newTypeKindComboViewer.add(valueTypeKind);
-		newTypeKindComboViewer.setSelection(new StructuredSelection(valueTypeKind[0]));
-
-		lInsideScrolledForm.reflow(true);
-		lSection.setClient(lInsideScrolledForm);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void buildNewTypeCreateCommand() {
-		// The new element is expected to be a NamedElement.
-		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(newTypeContainer);
-		if (commandService != null) {
-			CreateElementRequest createTypeRequest = new CreateElementRequest(newTypeContainer, newTypeKind);
-			createTypeRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), newTypeNameText.getText()));
-			newTypeCreateCommand = commandService.getEditCommand(createTypeRequest);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void hookListeners() {
-		super.hookListeners();
-
-		// listener to select invocation type
-		ModifyListener newTypeKindListener = new ModifyListener() {
-
-			/**
-			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-			 */
-			@Override
-			public void modifyText(ModifyEvent e) {
-				ISelection sel = newTypeKindComboViewer.getSelection();
-				if (sel instanceof StructuredSelection) {
-					Object type = ((StructuredSelection) sel).getFirstElement();
-					if (type instanceof IElementType) {
-						newTypeKind = (IElementType) type;
-					} else {
-						newTypeKind = null;
-					}
-
-					// reset name
-					setNewTypeName(null);
-				}
-			}
-		};
-		newTypeKindCombo.addModifyListener(newTypeKindListener);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void setNewTypeName(String text) {
-		String name = text;
-		if (text == null) {
-			name = NamedElementUtil.getDefaultNameWithIncrementFromBase(newTypeKind.getEClass().getName(), newTypeContainer.eContents());
-			if (newTypeKind == SysMLElementTypes.VALUE_TYPE) {
-				name = NamedElementUtil.getDefaultNameWithIncrementFromBase(BlocksPackage.eINSTANCE.getValueType().getName(), newTypeContainer.eContents());
-			}
-			newTypeNameText.setText(name);
-
-		} else {
-			newTypeNameText.setText(name);
-			newTypeName = name;
-		}
-
-		validateNewTypeName();
-		refreshOkButton();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDialogTitle() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_DialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionTitle() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_SelectionSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSelectionSectionRadioLabel() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_SelectionSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionTitle() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_CreationSectionTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getCreationSectionRadioLabel() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_CreationSectionRadioLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeNameLabel() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_NewTypeNameLabel;
-	}
-
-	/**
-	 * Get the newTypeKind label.
-	 *
-	 * @return the label
-	 */
-	protected String getNewTypeKindLabel() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_NewTypeKindLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerNameLabel() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_NewTypeContainerNameLabel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogTitle() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_SelectNewTypeContainerDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getNewTypeContainerDialogMessage() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_SelectNewTypeContainerDialogMessage;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogTitle() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_SelectTypeDialogTitle;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getTypeDialogMessage() {
-		return Messages.CreateOrSelectValuePropertyTypeDialog_SelectTypeDialogMessage;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/ServiceEditContentProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/ServiceEditContentProvider.java
deleted file mode 100644
index 7a6975c35e0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/dialogs/ServiceEditContentProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.dialogs;
-
-import java.util.Collections;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.services.edit.ui.dialogs.ElementTypeValidator;
-import org.eclipse.papyrus.uml.tools.providers.SemanticUMLContentProvider;
-
-/**
- * A content provider that takes into account the nature of the searched element
- * (org.eclipse.papyrus.uml.tools.providers.ServiceEditFilteredContentProvider).
- */
-public class ServiceEditContentProvider extends SemanticUMLContentProvider {
-
-	private ElementTypeValidator validator;
-
-	public ServiceEditContentProvider(IElementType elementType, EStructuralFeature feature, EObject semanticRoot) {
-		super(semanticRoot.eResource().getResourceSet());
-		setWantedMetaclasses(Collections.singletonList(feature.getEType()));
-		validator = new ElementTypeValidator(elementType);
-	}
-
-	@Override
-	public boolean isValidValue(Object element) {
-		return super.isValidValue(element) && validator.validate(new Object[] { getAdaptedValue(element) }).isOK();
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/AssociationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/AssociationEditPart.java
deleted file mode 100644
index aa80e04945d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/AssociationEditPart.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.AssociationFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLinkEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelSourceRoleEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AssociationLinkLabelTargetRoleEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementLinkLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
-import org.eclipse.papyrus.uml.diagram.common.utils.AssociationViewUtils;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * Edit Part for SysML {@link Association}
- */
-public class AssociationEditPart extends AbstractElementLinkEditPart {
-
-	protected static final String ASSOCIATION_END_LISTENERS_SOURCE = "AssociationEndListenersSource";
-
-	protected static final String ASSOCIATION_END_LISTENERS_TARGET = "AssociationEndListenersTarget";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addAssociationEndListeners();
-	}
-
-	/**
-	 * this methods add listeners on targets and sources
-	 */
-	protected void addAssociationEndListeners() {
-		EObject semanticElement = resolveSemanticElement();
-		if (semanticElement instanceof Association) {
-
-			Association association = (Association) semanticElement;
-
-			if (association.getMemberEnds().size() >= 2) {
-
-				EObject sourceEnd = AssociationViewUtils.getSourceSemanticEnd(getNotationView());
-				EObject targetEnd = AssociationViewUtils.getTargetSemanticEnd(getNotationView());
-
-				addListenerFilter(ASSOCIATION_END_LISTENERS_SOURCE, this, sourceEnd);
-				addListenerFilter(ASSOCIATION_END_LISTENERS_TARGET, this, targetEnd);
-
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void deactivate() {
-		removeAssociationEndListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-		// Set association ends appearance (aggregation diamond, navigable arrow, etc...)
-		if (resolveSemanticElement() != null) {
-			refreshVisuals();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-
-		if (resolveSemanticElement() != null) {
-			if (getSource() == null || getTarget() == null) {
-				return;
-			}
-			if (((GraphicalEditPart) getSource()).resolveSemanticElement() == null || ((GraphicalEditPart) getTarget()).resolveSemanticElement() == null) {
-				return;
-			}
-
-			Property source = AssociationViewUtils.getSourceSemanticEnd(getNotationView());
-			Property target = AssociationViewUtils.getTargetSemanticEnd(getNotationView());
-			if (source == null || target == null) {
-				return;
-			}
-
-			// Get the association
-			Element umlElement = getUMLElement();
-			if (umlElement instanceof Association) {
-				Association association = (Association) getUMLElement();
-
-				// Show navigable arrow if either source or target is navigable
-				// not when both are navigable.
-				if (isNavigable(association, source) && isNavigable(association, target)) {
-
-					// No navigable mark shown on figure.
-					if (source.getAggregation() == AggregationKind.NONE_LITERAL) {
-						setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
-					}
-					if (target.getAggregation() == AggregationKind.NONE_LITERAL) {
-						setArrowTarget(getArrowDecoration(EdgeDecorationType.NONE));
-					}
-
-				} else {
-
-					if (isNavigable(association, source)) {
-						setArrowTarget(getArrowDecoration(EdgeDecorationType.OPEN_ARROW));
-						if (source.getAggregation() == AggregationKind.NONE_LITERAL) {
-							setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
-						}
-					}
-
-					if (isNavigable(association, target)) {
-						setArrowSource(getArrowDecoration(EdgeDecorationType.OPEN_ARROW));
-						if (target.getAggregation() == AggregationKind.NONE_LITERAL) {
-							setArrowTarget(getArrowDecoration(EdgeDecorationType.NONE));
-						}
-					}
-
-				}
-
-				if (source.getAggregation() == AggregationKind.SHARED_LITERAL) {
-					setArrowSource(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_EMPTY));
-				}
-				if (target.getAggregation() == AggregationKind.SHARED_LITERAL) {
-					setArrowTarget(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_EMPTY));
-				}
-
-				if (source.getAggregation() == AggregationKind.COMPOSITE_LITERAL) {
-					setArrowSource(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_FILLED));
-				}
-				if (target.getAggregation() == AggregationKind.COMPOSITE_LITERAL) {
-					setArrowTarget(getArrowDecoration(EdgeDecorationType.SOLID_DIAMOND_FILLED));
-				}
-
-			}
-		}
-	}
-
-	/**
-	 * SysML implementation for isNavigable.
-	 *
-	 * @param end
-	 * @return
-	 */
-	private boolean isNavigable(Association association, Property end) {
-		boolean isNavigable = false;
-
-		if (association.getOwnedEnds().contains(end)) {
-			isNavigable = false;
-		} else {
-			isNavigable = true;
-		}
-
-		return isNavigable;
-	}
-
-	/**
-	 * this method is used to remove listener on ends
-	 */
-	protected void removeAssociationEndListeners() {
-		removeListenerFilter(ASSOCIATION_END_LISTENERS_SOURCE);
-		removeListenerFilter(ASSOCIATION_END_LISTENERS_TARGET);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public AssociationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelSourceRoleEditPart) {
-			((AssociationLinkLabelSourceRoleEditPart) childEditPart).setLabel(getPrimaryShape().getSourceRoleLabel());
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelSourceMultiplicityEditPart) {
-			((AssociationLinkLabelSourceMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getSourceMultiplicityLabel());
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelTargetRoleEditPart) {
-			((AssociationLinkLabelTargetRoleEditPart) childEditPart).setLabel(getPrimaryShape().getTargetRoleLabel());
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelTargetMultiplicityEditPart) {
-			((AssociationLinkLabelTargetMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getTargetMultiplicityLabel());
-			return true;
-		}
-		return super.addFixedChild(childEditPart);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelSourceRoleEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelSourceMultiplicityEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelTargetRoleEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof AssociationLinkLabelTargetMultiplicityEditPart) {
-			return true;
-		}
-		return super.removeFixedChild(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new AssociationFigure();
-	}
-
-	/**
-	 * Creates primary shape for this edit part.
-	 */
-	@Override
-	public AssociationFigure getPrimaryShape() {
-		return (AssociationFigure) getFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshLineType() {
-		setLineType(Graphics.LINE_SOLID);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowSource() {
-		// Not implemented, refreshVisuals currently implements this.
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowTarget() {
-		// Not implemented, refreshVisuals currently implements this.
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompositeEditPart.java
deleted file mode 100644
index 55524864cc9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompositeEditPart.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockPropertyCompositeSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.BlockPropertyCompositeFigure;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyNodeLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.EncapsulatedClassifierResizableShapeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-
-public class BlockPropertyCompositeEditPart extends AbstractElementEditPart {
-
-	public BlockPropertyCompositeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new BlockPropertyCompositeSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new StructuredClassifierCreationEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new EncapsulatedClassifierResizableShapeEditPolicy());
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) {
-					return new BorderItemResizableEditPolicy();
-				}
-
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-
-		if (childEditPart instanceof PropertyNodeLabelEditPart) {
-			((PropertyNodeLabelEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((FlowPortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-
-		if (childEditPart instanceof BlockPropertyStructureCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockPropertyStructureCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((BlockPropertyStructureCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-
-		if (childEditPart instanceof PropertyNodeLabelEditPart) {
-			return true;
-		}
-
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((FlowPortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		if (childEditPart instanceof BlockPropertyStructureCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockPropertyStructureCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((BlockPropertyStructureCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof BlockPropertyStructureCompartmentEditPart) {
-			return getPrimaryShape().getBlockPropertyStructureCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-
-	@Override
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigure());
-	}
-
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new BlockPropertyCompositeFigure();
-	}
-
-	@Override
-	public BlockPropertyCompositeFigure getPrimaryShape() {
-		return (BlockPropertyCompositeFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);
-	}
-
-	/**
-	 * <pre>
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-
-		// A visual refresh may also be needed when the following properties are changing : aggregation, type, or the related association.
-		if (resolveSemanticElement() != null) {
-			EObject element = resolveSemanticElement();
-
-			if ((element != null) && (element.equals(event.getNotifier())) && (element instanceof Property)) {
-
-				if (UMLPackage.eINSTANCE.getProperty_Aggregation().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-
-				if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-
-				if (UMLPackage.eINSTANCE.getProperty_Association().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * <pre>
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-
-		String tag = "property";
-		int borderStyle = Graphics.LINE_SOLID;
-
-		if (resolveSemanticElement() != null) {
-			EObject eObject = resolveSemanticElement();
-			if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "part";
-
-			} else if (((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "reference";
-				borderStyle = Graphics.LINE_CUSTOM;
-
-			} else if (((ISpecializationType) SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "actor part";
-
-			} else if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "value";
-
-			} else {
-				// Consider the element is a Property...
-			}
-		}
-
-		getPrimaryShape().setFigureTag(tag);
-		getPrimaryShape().setBorderStyle(borderStyle);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockPropertyCompositeEditPart.java
deleted file mode 100644
index 56f04e795ad..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockPropertyCompositeEditPart.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.StringValueStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockPropertyCompositeSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.ConstraintBlockPropertyCompositeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintNodeLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintParameterAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyNodeLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.EncapsulatedClassifierResizableShapeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.FullInsidePortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-
-public class ConstraintBlockPropertyCompositeEditPart extends AbstractElementEditPart {
-
-	public static final String REPRESENTATION_MODE_STYLE = "representation_mode_style";
-	public static final String ROUNDED_REPRESENTATION = "rounded_representation";
-	public static final String SQUARE_REPRESENTATION_WITH_STRUCTURE = "square_representation_with_structure";
-
-	public Map<EditPart, FullInsidePortPositionLocator> constraintParameter2FullInsidePortPositionLocator = new HashMap<EditPart, FullInsidePortPositionLocator>();
-
-	public static String lastRepresentationKind;
-
-	public ConstraintBlockPropertyCompositeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new BlockPropertyCompositeSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new StructuredClassifierCreationEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new EncapsulatedClassifierResizableShapeEditPolicy());
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) {
-					return new BorderItemResizableEditPolicy();
-				}
-
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-
-		if (childEditPart instanceof PropertyNodeLabelEditPart) {
-			((PropertyNodeLabelEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConstraintNodeLabelEditPart) {
-			((ConstraintNodeLabelEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
-			FullInsidePortPositionLocator locator = new FullInsidePortPositionLocator(getMainFigure(), PositionConstants.NONE, getPrimaryShape().getCorner());
-			constraintParameter2FullInsidePortPositionLocator.put(childEditPart, locator); // register the locator in order to reset the corner when changing ConstraintProeprty representation
-			getBorderedFigure().getBorderItemContainer().add(((ConstraintParameterAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-
-		if (childEditPart instanceof PropertyNodeLabelEditPart) {
-			return true;
-		}
-
-		if (childEditPart instanceof ConstraintNodeLabelEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ConstraintParameterAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected void removeChild(EditPart child) {
-		if (child instanceof ConstraintNodeLabelEditPart) {
-			return; // When hiding constraint expression, we want to keep the edit part in order to re-show it
-		}
-		super.removeChild(child);
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-
-		return getContentPane();
-	}
-
-	@Override
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigure());
-	}
-
-	@Override
-	protected IFigure createNodeShape() {
-		if (isSquareRepresentationWithStructure()) {
-			primaryShape = new ConstraintBlockPropertyCompositeFigure(SQUARE_REPRESENTATION_WITH_STRUCTURE);
-		}
-		else if (isRoundedRepresentation()) {
-			primaryShape = new ConstraintBlockPropertyCompositeFigure(ROUNDED_REPRESENTATION);
-		}
-		else {
-			if (lastRepresentationIsSquareWithStructure()) {
-				primaryShape = new ConstraintBlockPropertyCompositeFigure(SQUARE_REPRESENTATION_WITH_STRUCTURE);
-			}
-			else {
-				// default
-				if (this.getChildViewBySemanticHint(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID) != null) {
-					// no style => if structure then square else rounded
-					primaryShape = new ConstraintBlockPropertyCompositeFigure(SQUARE_REPRESENTATION_WITH_STRUCTURE);
-				}
-				else {
-					primaryShape = new ConstraintBlockPropertyCompositeFigure(ROUNDED_REPRESENTATION);
-				}
-			}
-		}
-		return primaryShape;
-	}
-
-	@Override
-	public ConstraintBlockPropertyCompositeFigure getPrimaryShape() {
-		return (ConstraintBlockPropertyCompositeFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);
-	}
-
-	@SuppressWarnings("rawtypes")
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-
-		List children = getChildren();
-		for (Object editPart : children) {
-			if (editPart instanceof EditPart) {
-				((EditPart) editPart).refresh();
-			}
-		}
-	}
-
-	public boolean isSquareRepresentationWithStructure() {
-		StringValueStyle style = (StringValueStyle) ((View) this.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());
-		if (style == null) {
-			return false;
-		}
-		return SQUARE_REPRESENTATION_WITH_STRUCTURE.equals(style.getStringValue());
-	}
-
-	public boolean isRoundedRepresentation() {
-		StringValueStyle style = (StringValueStyle) ((View) this.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());
-		if (style == null) {
-			return false;
-		}
-		return ROUNDED_REPRESENTATION.equals(style.getStringValue());
-	}
-
-	/**
-	 * <pre>
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-
-		// A visual refresh may also be needed when the following properties are changing : aggregation, type, or the related association.
-		if (resolveSemanticElement() != null) {
-			EObject element = resolveSemanticElement();
-
-			if ((element != null) && (element.equals(event.getNotifier())) && (element instanceof Property)) {
-
-				if (UMLPackage.eINSTANCE.getProperty_Aggregation().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-
-				if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-
-				if (UMLPackage.eINSTANCE.getProperty_Association().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-		refresh();
-	}
-
-	public static boolean lastRepresentationIsSquareWithStructure() {
-		return ConstraintBlockPropertyCompositeEditPart.SQUARE_REPRESENTATION_WITH_STRUCTURE.equals(ConstraintBlockPropertyCompositeEditPart.lastRepresentationKind);
-	}
-
-	public static void setLastRepresentation(String representationKind) {
-		ConstraintBlockPropertyCompositeEditPart.lastRepresentationKind = representationKind;
-	}
-
-	public void setCornerLocators(int corner) {
-		for (EditPart editPart : constraintParameter2FullInsidePortPositionLocator.keySet()) {
-			FullInsidePortPositionLocator locator = constraintParameter2FullInsidePortPositionLocator.get(editPart);
-			locator.setCorner(corner);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintPropertyChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintPropertyChildLabelEditPart.java
deleted file mode 100644
index f75e5edcfd2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintPropertyChildLabelEditPart.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementChildLabelEditPart;
-
-/**
- * Edit part for {@link ConstraintProperty} used as Child label node.
- */
-public class ConstraintPropertyChildLabelEditPart extends AbstractElementChildLabelEditPart {
-
-	/** Constructor */
-	public ConstraintPropertyChildLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	// /**
-	// * {@inheritDoc}
-	// */
-	// @Override
-	// protected Image getLabelIcon() {
-	// EObject parserElement = getParserElement();
-	// if(parserElement == null) {
-	// return null;
-	// }
-	//
-	// List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-	// for(View view : views) {
-	// if(NameLabelIconHelper.showLabelIcon(view)) {
-	// return Activator.getInstance().getLabelProvider().getImage(parserElement);
-	// }
-	// }
-	//
-	// return null;
-	// }
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/CustomFlowPortAppliedStereotypeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/CustomFlowPortAppliedStereotypeEditPart.java
deleted file mode 100644
index 0063f30ce2f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/CustomFlowPortAppliedStereotypeEditPart.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) 2015 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 472932
- */
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-
-/**
- * The custom edit policy for the port applied stereotype.
- */
-public class CustomFlowPortAppliedStereotypeEditPart extends PortAppliedStereotypeEditPart {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param view
-	 *            The view
-	 */
-	public CustomFlowPortAppliedStereotypeEditPart(final View view) {
-		super(view);
-	}
-
-	/**
-	 * Redefine the refresh label to get the STEREOTYPE_LABEL_POLICY if exist and don't recalculate the text.
-	 * 
-	 * @see org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart#refreshLabel()
-	 */
-	@Override
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
-		}
-		// Bug 472932 : Stereotype is always displayed
-		if (maskLabelPolicy == null) {
-			maskLabelPolicy = getEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY);
-		}
-		if (maskLabelPolicy == null) {
-			final View view = (View) getModel();
-			if (view.isVisible()) {
-				setLabelTextHelper(getFigure(), getLabelText());
-				setLabelIconHelper(getFigure(), getLabelIcon());
-			} else {
-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
-				setLabelIconHelper(getFigure(), null);
-			}
-		}
-		final Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		final Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-}
-
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java
deleted file mode 100644
index f21cb9de9ad..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedLabelNameEditPart.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This class implements a FlowPort affixed label edit part.
- */
-public class FlowPortAffixedLabelNameEditPart extends AbstractElementLabelEditPart implements IBorderItemEditPart {
-
-	/** label provider for icons */
-	private final ILabelProvider labelProvider;
-
-	/** Constructor */
-	public FlowPortAffixedLabelNameEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-		labelProvider = Activator.getInstance().getLabelProvider();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return constraint instanceof IBorderItemLocator ? (IBorderItemLocator) constraint : null;
-		}
-		return null;
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return labelProvider.getImage(parserElement);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart#getDefaultTextAlignment()
-	 *
-	 * @return
-	 */
-	@Override
-	protected int getDefaultTextAlignment() {
-		return PositionConstants.LEFT;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Label"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedNodeEditPart.java
deleted file mode 100644
index ce77cd91c3b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortAffixedNodeEditPart.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutListener;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.sysml.diagram.common.figure.FlowPortFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementBorderEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * This class implements an edit part for FlowPort represented as border items.
- */
-public class FlowPortAffixedNodeEditPart extends AbstractElementBorderEditPart {
-
-	private LayoutListener.Stub layoutInitializationListener;
-
-	public FlowPortAffixedNodeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy() {
-
-			/**
-			 * <pre>
-			 * {@inheritDoc}
-			 *
-			 * This modifies the edit policy in order to call refreshVisuals() whenever the stereotype image to show is null.
-			 * (required to show the FlowPort default image correctly).
-			 * </pre>
-			 */
-			@Override
-			protected void refreshStereotypeDisplay() {
-				if (getHost() instanceof IPapyrusEditPart) {
-					IFigure figure = ((IPapyrusEditPart) getHost()).getPrimaryShape();
-
-					if ((figure instanceof IPapyrusUMLElementFigure) && (stereotypeIconToDisplay() != null)) {
-						((IPapyrusUMLElementFigure) figure).setStereotypeDisplay(null, stereotypeIconToDisplay());
-					} else {
-						refreshVisuals();
-					}
-				}
-			}
-
-		});
-
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) { // External labels
-					return new ExternalLabelPrimaryDragRoleEditPolicy() {
-
-						@Override
-						@SuppressWarnings("rawtypes")
-						protected List createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-							mh.setBorder(null);
-							return Collections.singletonList(mh);
-						}
-					};
-				}
-
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-		borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		return;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);
-	}
-
-	@Override
-	protected void addSemanticListeners() {
-
-		if (resolveSemanticElement() != null) {
-
-			FlowPort flowPort = UMLUtil.getStereotypeApplication((Element) resolveSemanticElement(), FlowPort.class);
-			if (flowPort != null) {
-				addListenerFilter("FlowPort", this, flowPort); //$NON-NLS-1$
-			}
-		}
-
-		super.addSemanticListeners();
-	}
-
-	@Override
-	protected void removeSemanticListeners() {
-		removeListenerFilter("FlowPort"); //$NON-NLS-1$
-		super.removeSemanticListeners();
-	}
-
-	/**
-	 * <pre>
-	 * Calls the figure refresh when a change event is detected on
-	 * UMLPackage.eINSTANCE.getProperty_Aggregation().
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-
-		// When the flow port position changes, its position on parent side may change and requires a visual refresh.
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshVisuals();
-		}
-
-		// A visual refresh may also be needed when the following properties are changing : isAtomic (depend on the type), direction, isConjugated.
-		if (resolveSemanticElement() != null) {
-			Element element = (Element) resolveSemanticElement();
-			FlowPort flowPort = UMLUtil.getStereotypeApplication(element, FlowPort.class);
-
-			if ((flowPort != null) && (flowPort.equals(event.getNotifier()))) {
-				if (PortandflowsPackage.eINSTANCE.getFlowPort_Direction().equals(event.getFeature())
-						// || PortandflowsPackage.eINSTANCE.getFlowPort_IsAtomic().equals(event.getFeature())
-						|| PortandflowsPackage.eINSTANCE.getFlowPort_IsConjugated().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-			}
-
-			// IsAtomic change is triggered by a type change
-			if (resolveSemanticElement().equals(event.getNotifier())) {
-				if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new FlowPortFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public FlowPortFigure getPrimaryShape() {
-		return (FlowPortFigure) primaryShape;
-	}
-
-	/**
-	 * <pre>
-	 * Refresh the figure with the flow port image.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-
-		int side = getBorderItemLocator().getCurrentSideOfParent();
-		if (side == 0) {
-			getBorderItemLocator().getCurrentSideOfParent();
-		}
-
-		Element element = (Element) resolveSemanticElement();
-		FlowPort flowPort = UMLUtil.getStereotypeApplication(element, FlowPort.class);
-
-		Image image = Activator.getInstance().getFlowPortImage(flowPort, side);
-		getPrimaryShape().setImage(image);
-	}
-
-	/**
-	 * <pre>
-	 * A post layout listener is added during activate and remove the first time the layout occurs.
-	 * This is required in order to be able to find the side of this border item on its parent when opening the model.
-	 * Without this, the locator is unable to guess the parent side because the parent constraint is not set yet.
-	 *
-	 * Once the initialization is done, the listener become useless and can be removed.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	public void activate() {
-
-		layoutInitializationListener = new LayoutListener.Stub() {
-
-			@Override
-			public void postLayout(IFigure container) {
-				refreshVisuals();
-				// getBorderedFigure().getBorderItemContainer().removeLayoutListener(layoutInitializationListener);
-				layoutInitializationListener = null;
-			}
-		};
-		getBorderedFigure().getBorderItemContainer().addLayoutListener(layoutInitializationListener);
-
-		super.activate();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FlowPortAffixedLabelNameEditPart) {
-			((FlowPortAffixedLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			IFigure borderItemContainer = getContentPaneFor((IGraphicalEditPart) childEditPart);
-			addBorderItem(borderItemContainer, (IBorderItemEditPart) childEditPart);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FlowPortAffixedLabelNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void removeChild(EditPart child) {
-		if (child instanceof AbstractElementLabelEditPart) {
-			return;
-		}
-		super.removeChild(child);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortChildLabelEditPart.java
deleted file mode 100644
index 707b7904284..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortChildLabelEditPart.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementChildLabelEditPart;
-
-/**
- * Edit part for {@link FlowPort} used as Child label node.
- */
-public class FlowPortChildLabelEditPart extends AbstractElementChildLabelEditPart {
-
-	/** Constructor */
-	public FlowPortChildLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	// /**
-	// * {@inheritDoc}
-	// */
-	// @Override
-	// protected Image getLabelIcon() {
-	// EObject parserElement = getParserElement();
-	// if(parserElement == null) {
-	// return null;
-	// }
-	//
-	// List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-	// for(View view : views) {
-	// if(NameLabelIconHelper.showLabelIcon(view)) {
-	// return labelProvider.getImage(parserElement);
-	// }
-	// }
-	//
-	// return null;
-	// }
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyChildLabelEditPart.java
deleted file mode 100644
index 31435690d48..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyChildLabelEditPart.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementChildLabelEditPart;
-
-/**
- * Edit part for {@link FlowProperty} used as Child label node.
- */
-public class FlowPropertyChildLabelEditPart extends AbstractElementChildLabelEditPart {
-
-	/** Constructor */
-	public FlowPropertyChildLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	// /**
-	// * {@inheritDoc}
-	// */
-	// @Override
-	// protected Image getLabelIcon() {
-	// EObject parserElement = getParserElement();
-	// if(parserElement == null) {
-	// return null;
-	// }
-	//
-	// List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-	// for(View view : views) {
-	// if(NameLabelIconHelper.showLabelIcon(view)) {
-	// return labelProvider.getImage(parserElement);
-	// }
-	// }
-	//
-	// return null;
-	// }
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/NestedBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/NestedBlockPropertyCompositeEditPart.java
deleted file mode 100644
index 366ca2198c6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/part/NestedBlockPropertyCompositeEditPart.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.NestedBlockPropertyCompositeSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.NestedBlockPropertyCompositeFigure;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyNodeLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.EncapsulatedClassifierResizableShapeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Edit part for nested Block property shown as composite.
- */
-@Deprecated
-public class NestedBlockPropertyCompositeEditPart extends AbstractElementEditPart {
-
-	public NestedBlockPropertyCompositeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NestedBlockPropertyCompositeSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new StructuredClassifierCreationEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new EncapsulatedClassifierResizableShapeEditPolicy());
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) {
-					return new BorderItemResizableEditPolicy();
-				}
-
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-
-		if (childEditPart instanceof PropertyNodeLabelEditPart) {
-			((PropertyNodeLabelEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((FlowPortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-
-		if (childEditPart instanceof PropertyNodeLabelEditPart) {
-			return true;
-		}
-
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((FlowPortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-
-	@Override
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigure());
-	}
-
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new NestedBlockPropertyCompositeFigure();
-	}
-
-	@Override
-	public NestedBlockPropertyCompositeFigure getPrimaryShape() {
-		return (NestedBlockPropertyCompositeFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);
-	}
-
-	/**
-	 * <pre>
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-
-		// A visual refresh may also be needed when the following properties are changing : aggregation, type, or the related association.
-		if (resolveSemanticElement() != null) {
-			EObject element = resolveSemanticElement();
-
-			if ((element != null) && (element.equals(event.getNotifier())) && (element instanceof Property)) {
-
-				if (UMLPackage.eINSTANCE.getProperty_Aggregation().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-
-				if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-
-				if (UMLPackage.eINSTANCE.getProperty_Association().equals(event.getFeature())) {
-					refreshVisuals();
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * <pre>
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-
-		String tag = "property";
-		int lineStyle = Graphics.LINE_SOLID;
-
-		if (resolveSemanticElement() != null) {
-			EObject eObject = resolveSemanticElement();
-			if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "part";
-
-			} else if (((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "reference";
-				lineStyle = Graphics.LINE_CUSTOM;
-
-			} else if (((ISpecializationType) SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "actor part";
-
-			} else if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(eObject)) {
-				tag = "value";
-
-			} else {
-				// Consider the element is a Property...
-			}
-		}
-
-		getPrimaryShape().setFigureTag(tag);
-		getPrimaryShape().setLineStyle(lineStyle);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
deleted file mode 100644
index 79e002153f3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Semantic edit policy for {@link Block} structure compartment.
- */
-public class BlockCompositeSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
deleted file mode 100644
index 617b70b972a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * Semantic edit policy for Property owned by a Block (Part or Reference especially).
- */
-public class BlockPropertyCompositeSemanticEditPolicy extends DefaultSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		// Port - FlowPort creation is allowed if the semantic element is
-		// a Property typed by a Block, the new Port - FlowPort is created on this Block.
-		EObject eObject = req.getContainer();
-		if ((eObject != null) && (eObject instanceof Property)) {
-			Type type = ((Property) eObject).getType();
-			if ((type != null) && (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
-
-				IElementType elementTypeToCreate = req.getElementType();
-				IElementType baseType = elementTypeToCreate;
-
-				if ((SysMLElementTypes.FLOW_PORT == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_OUT == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_IN_OUT == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_NA == baseType)
-						|| (UMLElementTypes.PORT == baseType)) {
-
-					req.setContainer(type);
-				}
-
-				if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
-					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
-				}
-			}
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
deleted file mode 100644
index ddd9bde7798..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import java.util.Arrays;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateActorPartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateConstraintPropertyWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateReferenceWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateValueWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * Semantic edit policy for {@link Block} structure compartment.
- */
-public class BlockPropertyStructureCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		// Property (and variants) creation is allowed if the semantic element is
-		// a Property typed by a Block, the Property is created on this Block.
-		EObject eObject = req.getContainer();
-		if ((eObject != null) && (eObject instanceof Property)) {
-			Type type = ((Property) eObject).getType();
-			if ((type != null) && (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
-
-				IElementType elementTypeToCreate = req.getElementType();
-				IElementType baseType = elementTypeToCreate;
-
-				if (SysMLElementTypes.PART_PROPERTY == baseType) {
-					req.setContainer(type);
-					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
-				} else if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
-					req.setContainer(type);
-					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
-				} else if (SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
-					req.setContainer(type);
-					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());
-				} else if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
-					req.setContainer(type);
-					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
-				} else if (UMLElementTypes.PROPERTY == baseType) {
-					req.setContainer(type);
-				} else if (SysMLElementTypes.CONSTRAINT_PROPERTY == req.getElementType()) {
-					req.setContainer(type);
-					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
-				}
-			} else if ((UMLElementTypes.PROPERTY == req.getElementType()) || (Arrays.asList(req.getElementType().getAllSuperTypes()).contains(UMLElementTypes.PROPERTY))) {
-				// Forbid Property::qualifier creation
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 8f025885fa7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Semantic edit policy for {@link ConstraintBlock} parameters (Property) compartment.
- */
-public class ConstraintParameterCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (UMLElementTypes.PROPERTY == baseType) {
-			String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", req.getContainer().eContents()); //$NON-NLS-1$
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), name));
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/CustomDuplicatePasteEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/CustomDuplicatePasteEditPolicy.java
deleted file mode 100644
index 7e7c8304d80..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/CustomDuplicatePasteEditPolicy.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-
-/**
- * Specific edit policy for compartment, to forbid the duplication of ports as affixed children.
- *
- * @see bug 375041
- */
-public class CustomDuplicatePasteEditPolicy extends PasteEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command constructDuplicationCommand(List notationViewsToDuplicate, Set elementsToDuplicate, DuplicateRequest request, TransactionalEditingDomain editingDomain) {
-		if (notationViewsToDuplicate != null && !notationViewsToDuplicate.isEmpty()) {
-			for (Object o : notationViewsToDuplicate) {
-				if (o instanceof View) {
-					String type = ((View) o).getType();
-					if (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(type) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(type)) {
-						return UnexecutableCommand.INSTANCE;
-					}
-				}
-			}
-		}
-
-
-		return super.constructDuplicationCommand(notationViewsToDuplicate, elementsToDuplicate, request, editingDomain);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 32d56b25ccd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Semantic edit policy for {@link Block} structure compartment.
- */
-public class FlowPortCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
deleted file mode 100644
index 0e66162a1eb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-
-/**
- * Semantic edit policy for Property owned by a Block (Part or Reference especially).
- */
-@Deprecated
-public class NestedBlockPropertyCompositeSemanticEditPolicy extends DefaultSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		// Port - FlowPort creation is allowed if the semantic element is
-		// a Property typed by a Block, the new Port - FlowPort is created on this Block.
-		EObject eObject = req.getContainer();
-		if ((eObject != null) && (eObject instanceof Property)) {
-			Type type = ((Property) eObject).getType();
-			if ((type != null) && (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type))) {
-
-
-				IElementType elementTypeToCreate = req.getElementType();
-				IElementType baseType = elementTypeToCreate;
-
-				if ((SysMLElementTypes.FLOW_PORT == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_OUT == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_IN_OUT == baseType)
-						|| (SysMLElementTypes.FLOW_PORT_NA == baseType)
-						|| (UMLElementTypes.PORT == baseType)) {
-
-					req.setContainer(type);
-				}
-
-				if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
-					req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
-				}
-			}
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 0e4c2c9e8c6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateConstraintPropertyWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Semantic edit policy for {@link Block} part (Property) compartment.
- */
-public class PartCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (SysMLElementTypes.PART_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
-		}
-
-		if (SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 13d12c9bb21..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateActorPartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateConstraintPropertyWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateReferenceWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateValueWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Semantic edit policy for {@link Block} property compartment.
- */
-public class PropertyCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (SysMLElementTypes.PART_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
-		}
-		if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
-		}
-		if (SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());
-		}
-		if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
-		}
-		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
-		}
-		if (SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 27d3bdde8f2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateReferenceWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Semantic edit policy for {@link Block} reference (Property) compartment.
- */
-public class ReferenceCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 7eaf6b6f49e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateActorPartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateConstraintPropertyWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateReferenceWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateValueWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Semantic edit policy for {@link Block} structure compartment.
- */
-public class StructureCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (SysMLElementTypes.PART_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
-		}
-
-		if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
-		}
-
-		if (SysMLElementTypes.ACTOR_PART_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());
-		}
-
-		if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
-		}
-
-		if (SysMLElementTypes.CONSTRAINT_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 35e42a9121d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateValueWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * Semantic edit policy for {@link Block} value (Property) compartment.
- */
-public class ValueCompartmentSemanticEditPolicy extends DefaultCompartmentSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateCommand(CreateElementRequest req) {
-
-		IElementType elementTypeToCreate = req.getElementType();
-		IElementType baseType = elementTypeToCreate;
-
-		if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
-			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
-		}
-
-		return super.getCreateCommand(req);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
deleted file mode 100644
index 9cd742a3cde..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/AssociationFigure.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.uml2.uml.Association;
-
-/**
- * This figure is used to represent {@link Association} in SysML diagrams.
- */
-public class AssociationFigure extends NamedElementEdgeFigure {
-
-	/** The multiplicity source label. */
-	private WrappingLabel fSourceMultiplicityLabel;
-
-	/** The multiplicity target label. */
-	private WrappingLabel fTargetMultiplicityLabel;
-
-	/** The role source label. */
-	private WrappingLabel fSourceRoleLabel;
-
-	/** The role target label. */
-	private WrappingLabel fTargetRoleLabel;
-
-	/**
-	 * Instantiates a new association figure.
-	 */
-	public AssociationFigure() {
-		super();
-		createContents();
-	}
-
-	/**
-	 * Creates the contents.
-	 */
-	@Override
-	protected void createContents() {
-		super.createContents();
-
-		fSourceRoleLabel = new PapyrusWrappingLabel();
-		fSourceRoleLabel.setText("");
-
-		this.add(fSourceRoleLabel);
-
-		fSourceMultiplicityLabel = new PapyrusWrappingLabel();
-		fSourceMultiplicityLabel.setText("");
-
-		this.add(fSourceMultiplicityLabel);
-
-		fTargetRoleLabel = new PapyrusWrappingLabel();
-		fTargetRoleLabel.setText("");
-
-		this.add(fTargetRoleLabel);
-
-		fTargetMultiplicityLabel = new PapyrusWrappingLabel();
-		fTargetMultiplicityLabel.setText("");
-
-		this.add(fTargetMultiplicityLabel);
-
-	}
-
-	/**
-	 * Gets the applied stereotype association label.
-	 *
-	 * @return the applied stereotype association label
-	 */
-	@Override
-	public WrappingLabel getAppliedStereotypeLabel() {
-		return appliedStereotypeLabel;
-	}
-
-	/**
-	 * Gets the multiplicity source label.
-	 *
-	 * @return the multiplicity source label
-	 */
-	public WrappingLabel getSourceMultiplicityLabel() {
-		return fSourceMultiplicityLabel;
-	}
-
-	/**
-	 * Gets the multiplicity target label.
-	 *
-	 * @return the multiplicity target label
-	 */
-	public WrappingLabel getTargetMultiplicityLabel() {
-		return fTargetMultiplicityLabel;
-	}
-
-	/**
-	 * Gets the role source label.
-	 *
-	 * @return the role source label
-	 */
-	public WrappingLabel getSourceRoleLabel() {
-		return fSourceRoleLabel;
-	}
-
-	/**
-	 * Gets the role target label.
-	 *
-	 * @return the role target label
-	 */
-	public WrappingLabel getTargetRoleLabel() {
-		return fTargetRoleLabel;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/FlowPortFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/FlowPortFigure.java
deleted file mode 100644
index f26fbec1536..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/figure/FlowPortFigure.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFigure;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Figure for Port representation.
- */
-public class FlowPortFigure extends AffixedNamedElementFigure {
-
-	/**
-	 * Set the image in FlowPort figure.
-	 *
-	 * @param image
-	 *            the image to show in the FlowPort
-	 */
-	public void setImage(Image image) {
-		setIcon(image);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/Messages.java
deleted file mode 100644
index 2f69592839b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/Messages.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	public static String CreateOrSelectTypeDialog_DialogTitle;
-
-	public static String CreateOrSelectTypeDialog_SelectionSectionTitle;
-
-	public static String CreateOrSelectTypeDialog_SelectionSectionRadioLabel;
-
-	public static String CreateOrSelectTypeDialog_CreationSectionTitle;
-
-	public static String CreateOrSelectTypeDialog_CreationSectionRadioLabel;
-
-	public static String CreateOrSelectTypeDialog_NewTypeNameLabel;
-
-	public static String CreateOrSelectTypeDialog_NewTypeContainerNameLabel;
-
-	public static String CreateOrSelectTypeDialog_SelectTypeDialogTitle;
-
-	public static String CreateOrSelectTypeDialog_SelectTypeDialogMessage;
-
-	public static String CreateOrSelectTypeDialog_SelectNewTypeContainerDialogTitle;
-
-	public static String CreateOrSelectTypeDialog_SelectNewTypeContainerDialogMessage;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_DialogTitle;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_SelectionSectionTitle;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_SelectionSectionRadioLabel;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_CreationSectionTitle;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_CreationSectionRadioLabel;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_NewTypeNameLabel;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_NewTypeContainerNameLabel;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_SelectTypeDialogTitle;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_SelectTypeDialogMessage;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_SelectNewTypeContainerDialogTitle;
-
-	public static String CreateOrSelectBlockPropertyTypeDialog_SelectNewTypeContainerDialogMessage;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_DialogTitle;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_SelectionSectionTitle;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_SelectionSectionRadioLabel;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_CreationSectionTitle;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_CreationSectionRadioLabel;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_NewTypeNameLabel;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_NewTypeContainerNameLabel;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_SelectTypeDialogTitle;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_SelectTypeDialogMessage;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_SelectNewTypeContainerDialogTitle;
-
-	public static String CreateOrSelectConstraintPropertyTypeDialog_SelectNewTypeContainerDialogMessage;
-
-	public static String CreateOrSelectActorPartTypeDialog_DialogTitle;
-
-	public static String CreateOrSelectActorPartTypeDialog_SelectionSectionTitle;
-
-	public static String CreateOrSelectActorPartTypeDialog_SelectionSectionRadioLabel;
-
-	public static String CreateOrSelectActorPartTypeDialog_CreationSectionTitle;
-
-	public static String CreateOrSelectActorPartTypeDialog_CreationSectionRadioLabel;
-
-	public static String CreateOrSelectActorPartTypeDialog_NewTypeNameLabel;
-
-	public static String CreateOrSelectActorPartTypeDialog_NewTypeContainerNameLabel;
-
-	public static String CreateOrSelectActorPartTypeDialog_SelectTypeDialogTitle;
-
-	public static String CreateOrSelectActorPartTypeDialog_SelectTypeDialogMessage;
-
-	public static String CreateOrSelectActorPartTypeDialog_SelectNewTypeContainerDialogTitle;
-
-	public static String CreateOrSelectActorPartTypeDialog_SelectNewTypeContainerDialogMessage;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_DialogTitle;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_SelectionSectionTitle;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_SelectionSectionRadioLabel;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_CreationSectionTitle;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_CreationSectionRadioLabel;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_NewTypeNameLabel;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_NewTypeContainerNameLabel;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_SelectTypeDialogTitle;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_SelectTypeDialogMessage;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_SelectNewTypeContainerDialogTitle;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_SelectNewTypeContainerDialogMessage;
-
-	public static String CreateOrSelectValuePropertyTypeDialog_NewTypeKindLabel;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_DialogTitle;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectionSectionTitle;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectionSectionRadioLabel;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_CreationSectionTitle;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_CreationSectionRadioLabel;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_NewTypeNameLabel;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_NewTypeContainerNameLabel;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectTypeDialogTitle;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectTypeDialogMessage;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogTitle;
-
-	public static String CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogMessage;
-
-	static {
-		NLS.initializeMessages("org.eclipse.papyrus.sysml.diagram.common.messages.messages", Messages.class); //$NON-NLS-1$
-	}
-
-	private Messages() {
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/messages.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/messages.properties
deleted file mode 100644
index a5d917ce35c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/messages/messages.properties
+++ /dev/null
@@ -1,92 +0,0 @@
-
-CreateOrSelectTypeDialog_DialogTitle=Type initialization
-CreateOrSelectTypeDialog_SelectionSectionTitle=Select an existing type
-CreateOrSelectTypeDialog_SelectionSectionRadioLabel=Type selection mode
-
-CreateOrSelectTypeDialog_CreationSectionTitle=Create a new type
-CreateOrSelectTypeDialog_CreationSectionRadioLabel=Type creation mode
-CreateOrSelectTypeDialog_NewTypeNameLabel=Select new type name
-CreateOrSelectTypeDialog_NewTypeContainerNameLabel=Select new type container
-
-CreateOrSelectTypeDialog_SelectTypeDialogTitle=Type selection
-CreateOrSelectTypeDialog_SelectTypeDialogMessage=Select a type
-
-CreateOrSelectTypeDialog_SelectNewTypeContainerDialogTitle=Type container selection
-CreateOrSelectTypeDialog_SelectNewTypeContainerDialogMessage=Select the container for the new type
-
-CreateOrSelectBlockPropertyTypeDialog_DialogTitle=Part or Reference type initialization
-CreateOrSelectBlockPropertyTypeDialog_SelectionSectionTitle=Select an existing type (Block)
-CreateOrSelectBlockPropertyTypeDialog_SelectionSectionRadioLabel=Block (type) selection mode
-
-CreateOrSelectBlockPropertyTypeDialog_CreationSectionTitle=Create a new type (Block)
-CreateOrSelectBlockPropertyTypeDialog_CreationSectionRadioLabel=Block (type) creation mode
-CreateOrSelectBlockPropertyTypeDialog_NewTypeNameLabel=Select new Block name
-CreateOrSelectBlockPropertyTypeDialog_NewTypeContainerNameLabel=Select new Block container
-
-CreateOrSelectBlockPropertyTypeDialog_SelectTypeDialogTitle=Type selection
-CreateOrSelectBlockPropertyTypeDialog_SelectTypeDialogMessage=Select a Block to use as new element type
-
-CreateOrSelectBlockPropertyTypeDialog_SelectNewTypeContainerDialogTitle=Type container selection
-CreateOrSelectBlockPropertyTypeDialog_SelectNewTypeContainerDialogMessage=Select the container for the new Block
-
-CreateOrSelectConstraintPropertyTypeDialog_DialogTitle=ConstraintProperty type initialization
-CreateOrSelectConstraintPropertyTypeDialog_SelectionSectionTitle=Select an existing type (ConstraintBlock)
-CreateOrSelectConstraintPropertyTypeDialog_SelectionSectionRadioLabel=ConstraintBlock (type) selection mode
-
-CreateOrSelectConstraintPropertyTypeDialog_CreationSectionTitle=Create a new type (ConstraintBlock)
-CreateOrSelectConstraintPropertyTypeDialog_CreationSectionRadioLabel=ConstraintBlock (type) creation mode
-CreateOrSelectConstraintPropertyTypeDialog_NewTypeNameLabel=Select new ConstraintBlock name
-CreateOrSelectConstraintPropertyTypeDialog_NewTypeContainerNameLabel=Select new ConstraintBlock container
-
-CreateOrSelectConstraintPropertyTypeDialog_SelectTypeDialogTitle=Type selection
-CreateOrSelectConstraintPropertyTypeDialog_SelectTypeDialogMessage=Select a ConstraintBlock to use as new element type
-
-CreateOrSelectConstraintPropertyTypeDialog_SelectNewTypeContainerDialogTitle=Type container selection
-CreateOrSelectConstraintPropertyTypeDialog_SelectNewTypeContainerDialogMessage=Select the container for the new ConstraintBlock
-
-
-CreateOrSelectActorPartTypeDialog_DialogTitle=ActorPart type initialization
-CreateOrSelectActorPartTypeDialog_SelectionSectionTitle=Select an existing type (Actor)
-CreateOrSelectActorPartTypeDialog_SelectionSectionRadioLabel=Actor (type) selection mode
-
-CreateOrSelectActorPartTypeDialog_CreationSectionTitle=Create a new type (Actor)
-CreateOrSelectActorPartTypeDialog_CreationSectionRadioLabel=Actor (type) creation mode
-CreateOrSelectActorPartTypeDialog_NewTypeNameLabel=Select new Actor name
-CreateOrSelectActorPartTypeDialog_NewTypeContainerNameLabel=Select new Actor container
-
-CreateOrSelectActorPartTypeDialog_SelectTypeDialogTitle=Type selection
-CreateOrSelectActorPartTypeDialog_SelectTypeDialogMessage=Select a Actor to use as new element type
-
-CreateOrSelectActorPartTypeDialog_SelectNewTypeContainerDialogTitle=Type container selection
-CreateOrSelectActorPartTypeDialog_SelectNewTypeContainerDialogMessage=Select the container for the new Actor
-
-CreateOrSelectValuePropertyTypeDialog_DialogTitle=Value type initialization
-CreateOrSelectValuePropertyTypeDialog_SelectionSectionTitle=Select an existing type (ValueType or DataType)
-CreateOrSelectValuePropertyTypeDialog_SelectionSectionRadioLabel=Type selection mode
-
-CreateOrSelectValuePropertyTypeDialog_CreationSectionTitle=Create a new type ((ValueType or DataType)
-CreateOrSelectValuePropertyTypeDialog_CreationSectionRadioLabel=Type creation mode
-CreateOrSelectValuePropertyTypeDialog_NewTypeNameLabel=Select new type name
-CreateOrSelectValuePropertyTypeDialog_NewTypeKindLabel=Select new type kind
-CreateOrSelectValuePropertyTypeDialog_NewTypeContainerNameLabel=Select new type container
-
-CreateOrSelectValuePropertyTypeDialog_SelectTypeDialogTitle=Type selection
-CreateOrSelectValuePropertyTypeDialog_SelectTypeDialogMessage=Select a DataType or Value type to use as new element type
-
-CreateOrSelectValuePropertyTypeDialog_SelectNewTypeContainerDialogTitle=Type container selection
-CreateOrSelectValuePropertyTypeDialog_SelectNewTypeContainerDialogMessage=Select the container for the new type
-
-CreateOrSelectNonAtomicFlowPortTypeDialog_DialogTitle=Non atomic FlowPort type initialization
-CreateOrSelectNonAtomicFlowPortTypeDialog_SelectionSectionTitle=Select an existing FlowSpecification
-CreateOrSelectNonAtomicFlowPortTypeDialog_SelectionSectionRadioLabel=FlowSpecification (type) selection mode
-
-CreateOrSelectNonAtomicFlowPortTypeDialog_CreationSectionTitle=Create a new FlowSpecification
-CreateOrSelectNonAtomicFlowPortTypeDialog_CreationSectionRadioLabel=FlowSpecification (type) creation mode
-CreateOrSelectNonAtomicFlowPortTypeDialog_NewTypeNameLabel=Select new FlowSpecification name
-CreateOrSelectNonAtomicFlowPortTypeDialog_NewTypeContainerNameLabel=Select new FlowSpecification container
-
-CreateOrSelectNonAtomicFlowPortTypeDialog_SelectTypeDialogTitle=Type selection
-CreateOrSelectNonAtomicFlowPortTypeDialog_SelectTypeDialogMessage=Select a FlowSpecification to use as new element type
-
-CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogTitle=Type container selection
-CreateOrSelectNonAtomicFlowPortTypeDialog_SelectNewTypeContainerDialogMessage=Select the container for the new FlowSpecification
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
deleted file mode 100644
index f332eb80329..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPortLabelParser.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.parser;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.diagram.common.parser.PropertyLabelParser;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.ValueSpecification;
-import org.eclipse.uml2.uml.VisibilityKind;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Semantic Parser for {@link FlowPort}
- */
-public class FlowPortLabelParser extends PropertyLabelParser {
-
-	/** The String format for displaying a FlowProperty with direction */
-	protected static final String DIRECTION_FORMAT = "%s %s";
-
-	/** The String format for displaying a FlowProperty with direction */
-	protected static final String CONJUGATED_FORMAT = "~%s";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Port)) {
-
-			Property property = (Property) eObject;
-
-			FlowPort flowPort = UMLUtil.getStereotypeApplication(property, FlowPort.class);
-			if (flowPort != null) {
-
-				// manage direction only if the FlowPort is type and type is not a FlowSpecification
-				if (maskValues.contains(ICustomAppearance.DISP_DIRECTION)) {
-					String direction;
-					switch (flowPort.getDirection().getValue()) {
-					case FlowDirection.IN_VALUE:
-						direction = "in";
-						break;
-					case FlowDirection.OUT_VALUE:
-						direction = "out";
-						break;
-					case FlowDirection.INOUT_VALUE:
-						direction = "inout";
-						break;
-					default:
-						direction = "inout";
-						break;
-					}
-
-					// manage direction only if the FlowPort is not a FlowSpecification
-					if ((property.getType() == null) || ((property.getType() != null) && (UMLUtil.getStereotypeApplication(property.getType(), FlowSpecification.class) == null))) {
-						result = String.format(DIRECTION_FORMAT, direction, result);
-					}
-				}
-			}
-
-			// manage visibility
-			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
-				String visibility;
-				switch (property.getVisibility().getValue()) {
-				case VisibilityKind.PACKAGE:
-					visibility = "~";
-					break;
-				case VisibilityKind.PUBLIC:
-					visibility = "+";
-					break;
-				case VisibilityKind.PROTECTED:
-					visibility = "#";
-					break;
-				case VisibilityKind.PRIVATE:
-					visibility = "-";
-					break;
-				default:
-					visibility = "+";
-					break;
-				}
-				result = String.format(VISIBILITY_FORMAT, visibility, result);
-			}
-
-			// manage derived modifier
-			if ((maskValues.contains(ICustomAppearance.DISP_DERIVE)) && (property.isDerived())) {
-				result = String.format(DERIVED_FORMAT, result);
-			}
-
-			// manage name
-			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (property.isSetName())) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(property);
-				result = String.format(NAME_FORMAT, result, name);
-			}
-
-			// manage type and conjugated property
-			if ((maskValues.contains(ICustomAppearance.DISP_TYPE))) {
-
-				String type = "<Undefined>";
-				if (property.getType() != null) {
-					type = UMLLabelInternationalization.getInstance().getLabel(property.getType());
-				}
-
-				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if ((maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE)) || (!"<Undefined>".equals(type))) {
-					if ((flowPort != null) && (flowPort.isConjugated())) {
-						type = String.format(CONJUGATED_FORMAT, type);
-					}
-					result = String.format(TYPE_FORMAT, result, type);
-				}
-			}
-
-			// manage multiplicity
-			if ((maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY))) {
-
-				// TODO : add a case for default with multiplicity not set.
-				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(property, maskValues);
-				if (multiplicity != null && !multiplicity.isEmpty()) {
-					result += " " + multiplicity;
-				}
-			}
-
-			// manage default value
-			if ((maskValues.contains(ICustomAppearance.DISP_DEFAULT_VALUE)) && ((property.getDefaultValue() != null))) {
-				ValueSpecification valueSpecification = property.getDefaultValue();
-				if (valueSpecification instanceof InstanceValue) {
-					result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification, true));
-				}
-			}
-
-			// manage modifier
-			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
-				StringBuffer sb = new StringBuffer();
-				if (property.isReadOnly()) {
-					sb.append(sb.length() == 0 ? "readOnly" : ", readOnly");
-				}
-				if (property.isOrdered()) {
-					sb.append(sb.length() == 0 ? "ordered" : ", ordered");
-				}
-				if (property.isUnique()) {
-					sb.append(sb.length() == 0 ? "unique" : ", unique");
-				}
-				if (property.isDerivedUnion()) {
-					sb.append(sb.length() == 0 ? "union" : ", union");
-				}
-				EList<Property> redefinedProperties = property.getRedefinedProperties();
-				if (redefinedProperties != null && !redefinedProperties.isEmpty()) {
-					for (Property p : redefinedProperties) {
-						sb.append(sb.length() == 0 ? UMLLabelInternationalization.getInstance().getLabel(p) : ", redefines " + UMLLabelInternationalization.getInstance().getLabel(p));
-					}
-				}
-				if (sb.length() != 0) {
-					result = String.format(MODIFIER_FORMAT, result, sb.toString());
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return PortandflowsPackage.eINSTANCE.getFlowPort_Direction().equals(feature) || PortandflowsPackage.eINSTANCE.getFlowPort_IsConjugated().equals(feature) || super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = super.getSemanticElementsBeingParsed(element);
-
-		if ((element != null) && (element instanceof Port)) {
-			Port semElement = (Port) element;
-
-			FlowPort flowPort = UMLUtil.getStereotypeApplication(semElement, FlowPort.class);
-			if (flowPort != null) {
-				semanticElementsBeingParsed.add(flowPort);
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_DIRECTION, "Direction");
-		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
-		masks.put(ICustomAppearance.DISP_DERIVE, "Is Derived");
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ICustomAppearance.DISP_TYPE, "Type");
-		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
-		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default Value");
-		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_DIRECTION, ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPropertyLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPropertyLabelParser.java
deleted file mode 100644
index 5c6240773ba..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/FlowPropertyLabelParser.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.parser;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.diagram.common.parser.PropertyLabelParser;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Semantic Parser for {@link FlowProperty}
- */
-public class FlowPropertyLabelParser extends PropertyLabelParser {
-
-	/** The String format for displaying a FlowProperty with direction */
-	protected static final String DIRECTION_FORMAT = "%s %s";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = super.getPrintString(element, flags);
-
-		EObject eObject = EMFHelper.getEObject(element);
-		if ((eObject != null) && (eObject instanceof Property)) {
-
-			Property property = (Property) eObject;
-			FlowProperty flowProperty = UMLUtil.getStereotypeApplication(property, FlowProperty.class);
-			if (flowProperty != null) {
-
-				// manage direction
-				if (maskValues.contains(ICustomAppearance.DISP_DIRECTION)) {
-					String direction;
-					switch (flowProperty.getDirection().getValue()) {
-					case FlowDirection.IN_VALUE:
-						direction = "in";
-						break;
-					case FlowDirection.OUT_VALUE:
-						direction = "out";
-						break;
-					case FlowDirection.INOUT_VALUE:
-						direction = "inout";
-						break;
-					default:
-						direction = "inout";
-						break;
-					}
-					result = String.format(DIRECTION_FORMAT, direction, result);
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return PortandflowsPackage.eINSTANCE.getFlowProperty_Direction().equals(feature) || super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = super.getSemanticElementsBeingParsed(element);
-
-		if ((element != null) && (element instanceof Property)) {
-			Property semElement = (Property) element;
-
-			FlowProperty flowProperty = UMLUtil.getStereotypeApplication(semElement, FlowProperty.class);
-			if (flowProperty != null) {
-				semanticElementsBeingParsed.add(flowProperty);
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>(10);
-		masks.put(ICustomAppearance.DISP_DIRECTION, "Direction");
-		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
-		masks.put(ICustomAppearance.DISP_DERIVE, "Is Derived");
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ICustomAppearance.DISP_TYPE, "Type");
-		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
-		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default Value");
-		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_DIRECTION, ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/RequirementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/RequirementLabelParser.java
deleted file mode 100644
index c7984cb850b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/RequirementLabelParser.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.requirements.Requirement;
-import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Semantic Parser for {@link Requirement}
- */
-public class RequirementLabelParser extends NamedElementLabelParser {
-
-	/** The String format for displaying a Requirement name */
-	protected static final String NAME_FORMAT = "%s";
-
-	/** The String format for displaying a FlowProperty with direction */
-	protected static final String ID_FORMAT = "%s{id = %s}";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Class)) {
-
-			Class clazz = (Class) eObject;
-			Requirement requirement = UMLUtil.getStereotypeApplication(clazz, Requirement.class);
-
-			// manage name
-			if (maskValues.contains(ICustomAppearance.DISP_NAME)) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(clazz);
-				result = String.format(NAME_FORMAT, name);
-			}
-
-
-			if (requirement != null) {
-
-				// manage id
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_ID)) {
-					String id = requirement.getId();
-					result = String.format(ID_FORMAT, result, id);
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof Class)) {
-			Class semElement = (Class) element;
-
-			semanticElementsBeingParsed.add(semElement);
-
-			Requirement requirement = UMLUtil.getStereotypeApplication(semElement, Requirement.class);
-			if (requirement != null) {
-				semanticElementsBeingParsed.add(requirement);
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_ID, "Id");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_NAME, ILabelPreferenceConstants.DISP_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/UnitLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/UnitLabelParser.java
deleted file mode 100644
index 10242f87699..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/parser/UnitLabelParser.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.sysml.blocks.Dimension;
-import org.eclipse.papyrus.sysml.blocks.Unit;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Semantic Parser for {@link Unit}
- */
-public class UnitLabelParser extends NamedElementLabelParser {
-
-	/** The String format for displaying a {@link Unit} label with its name */
-	protected static final String NAME_FORMAT = "%s";
-
-	/** The String format for displaying a {@link Unit} with direction */
-	protected static final String DIMENSION_FORMAT = "%s {%s}";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof InstanceSpecification)) {
-
-			InstanceSpecification iSpec = (InstanceSpecification) eObject;
-
-			Unit unit = UMLUtil.getStereotypeApplication(iSpec, Unit.class);
-
-			// manage name
-			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (iSpec.isSetName())) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(iSpec);
-				result = String.format(NAME_FORMAT, name);
-			}
-
-			// manage dimension
-			if ((maskValues.contains(ILabelPreferenceConstants.DISP_DIMENSION))) {
-				String dimensionName = "<Undefined>";
-				if ((unit != null) && (unit.getDimension() != null)) {
-					Dimension dim = unit.getDimension();
-					if ((dim.getBase_InstanceSpecification() != null) && (dim.getBase_InstanceSpecification().isSetName())) {
-						dimensionName = UMLLabelInternationalization.getInstance().getLabel(dim.getBase_InstanceSpecification());
-					}
-				}
-				result = String.format(DIMENSION_FORMAT, result, dimensionName);
-			}
-
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return BlocksPackage.eINSTANCE.getUnit_Dimension().equals(feature) || super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof InstanceSpecification)) {
-			InstanceSpecification semElement = (InstanceSpecification) element;
-
-			semanticElementsBeingParsed.add(semElement);
-
-			Unit unit = UMLUtil.getStereotypeApplication(semElement, Unit.class);
-			if (unit != null) {
-				semanticElementsBeingParsed.add(unit);
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_DIMENSION, "Dimension");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_NAME, ILabelPreferenceConstants.DISP_DIMENSION);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/ILabelPreferenceConstants.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/ILabelPreferenceConstants.java
deleted file mode 100644
index 051fb3a681c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/ILabelPreferenceConstants.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.preferences;
-
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-
-/**
- * Label constants for label mask preferences.
- */
-public interface ILabelPreferenceConstants extends ICustomAppearance {
-
-	/** preference id for display labels */
-	public String LABEL_DISPLAY_PREFERENCE = "label.display"; //$NON-NLS-1$
-
-	/** Style constant for id info display in labels. */
-	public final static String DISP_ID = "id"; //$NON-NLS-1$
-
-	/** Style constant for dimension info display in labels. */
-	public final static String DISP_DIMENSION = "dimension"; //$NON-NLS-1$
-
-	/** Style constant for specification info display in labels. */
-	public final static String DISP_SPECIFICATION = "specification"; //$NON-NLS-1$
-
-	/** Style constant for signal info display in labels. */
-	public final static String DISP_SIGNAL = "signal"; //$NON-NLS-1$
-
-	/** Style constant forcing multiplicity display in labels. */
-	public final static String DISP_DEFAULT_MULTIPLICITY = "defaultMultiplicity"; //$NON-NLS-1$
-
-	/** Style constant forcing type display in labels. */
-	public final static String DISP_UNDEFINED_TYPE = "undefinedType"; //$NON-NLS-1$
-
-	/** Style constant forcing name display in labels. */
-	public final static String DISP_NON_NAVIGABLE_ROLE = "nonNavigableRole"; //$NON-NLS-1$
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/LabelPreferenceHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/LabelPreferenceHelper.java
deleted file mode 100644
index 82cc7dd3ec7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/preferences/LabelPreferenceHelper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.preferences;
-
-/**
- * Utility class for building label preference constants.
- */
-public class LabelPreferenceHelper {
-
-	/**
-	 * Create the preference constant for a label view.
-	 *
-	 * @param diagramType
-	 *            the type of diagram
-	 * @param viewType
-	 *            the type of the view
-	 * @param constantPreferenceKey
-	 *            the constant key of the preference to retrieve
-	 * @return the complete preference key
-	 * @deprecated see https://bugs.eclipse.org/bugs/show_bug.cgi?id=353193
-	 */
-	@Deprecated
-	public static String getPreferenceConstant(String diagramType, String viewType, String constantPreferenceKey) {
-		return diagramType + '_' + viewType + '.' + constantPreferenceKey;
-	}
-
-	/**
-	 * Create the preference constant for a label view.
-	 *
-	 * @param elementkey
-	 *            the element key (including diagram hint)
-	 * @param constantPreferenceKey
-	 *            the constant key of the preference to retrieve
-	 * @return the complete preference key
-	 */
-	public static String getPreferenceConstant(String elementkey, String constantPreferenceKey) {
-		return elementkey + '.' + constantPreferenceKey;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/dnd/helper/LinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/dnd/helper/LinkMappingHelper.java
deleted file mode 100644
index 0f4f2fca2a9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/dnd/helper/LinkMappingHelper.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.dnd.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.ILinkMappingHelper;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLSwitch;
-
-/**
- * Original class {@link org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper} slightly
- * modified to use EObject instead of UML Element in its interface.
- */
-public class LinkMappingHelper implements ILinkMappingHelper {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Collection<?> getSource(Element link) {
-		CommonSourceUMLSwitch umlSwitch = new CommonSourceUMLSwitch();
-		return umlSwitch.doSwitch(link);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Collection<?> getTarget(Element link) {
-		CommonTargetUMLSwitch umlSwitch = new CommonTargetUMLSwitch();
-		return umlSwitch.doSwitch(link);
-	}
-
-	/**
-	 * Contains diagrams common behavior that need to be redefined
-	 *
-	 * @author eperico
-	 */
-	public static class CommonSourceUMLSwitch extends UMLSwitch<Collection<?>> {
-
-		@Override
-		public java.util.Collection<?> caseAssociation(org.eclipse.uml2.uml.Association object) {
-			return object.getEndTypes();
-		};
-
-		@Override
-		public java.util.Collection<?> caseComment(org.eclipse.uml2.uml.Comment object) {
-			ArrayList<EObject> result = new ArrayList<EObject>();
-			result.add(object);
-			return result;
-		};
-
-		@Override
-		public Collection<?> caseDependency(org.eclipse.uml2.uml.Dependency object) {
-			return object.getClients();
-		};
-
-		@Override
-		public java.util.Collection<?> caseGeneralization(org.eclipse.uml2.uml.Generalization object) {
-			ArrayList<EObject> result = new ArrayList<EObject>();
-			result.add(object.getOwner());
-			return result;
-		};
-
-		@Override
-		public java.util.Collection<?> casePackageMerge(org.eclipse.uml2.uml.PackageMerge object) {
-			ArrayList<EObject> result = new ArrayList<EObject>();
-			result.add(object.getReceivingPackage());
-			return result;
-		};
-
-		@Override
-		public java.util.Collection<?> casePackageImport(org.eclipse.uml2.uml.PackageImport object) {
-			ArrayList<EObject> result = new ArrayList<EObject>();
-			result.add(object.getImportingNamespace());
-			return result;
-		};
-
-		@Override
-		public Collection<?> caseInformationFlow(org.eclipse.uml2.uml.InformationFlow object) {
-			return object.getInformationSources();
-		};
-
-		@Override
-		public Collection<?> defaultCase(org.eclipse.emf.ecore.EObject object) {
-			return Collections.EMPTY_LIST;
-		};
-	}
-
-	/**
-	 * Contains diagrams common behavior that need to be redefined
-	 *
-	 * @author eperico
-	 */
-	public static class CommonTargetUMLSwitch extends UMLSwitch<Collection<?>> {
-
-		@Override
-		public java.util.Collection<?> caseAssociation(org.eclipse.uml2.uml.Association object) {
-			return object.getEndTypes();
-		};
-
-		@Override
-		public java.util.Collection<?> caseComment(org.eclipse.uml2.uml.Comment object) {
-			return object.getAnnotatedElements();
-		};
-
-		@Override
-		public Collection<?> caseDependency(org.eclipse.uml2.uml.Dependency object) {
-			return object.getSuppliers();
-		};
-
-		@Override
-		public java.util.Collection<?> caseGeneralization(org.eclipse.uml2.uml.Generalization object) {
-			ArrayList<EObject> result = new ArrayList<EObject>();
-			result.add(object.getGeneral());
-			return result;
-		};
-
-		@Override
-		public java.util.Collection<?> casePackageMerge(org.eclipse.uml2.uml.PackageMerge object) {
-			ArrayList<EObject> result = new ArrayList<EObject>();
-			result.add(object.getMergedPackage());
-			return result;
-		};
-
-		@Override
-		public java.util.Collection<?> casePackageImport(org.eclipse.uml2.uml.PackageImport object) {
-			ArrayList<EObject> result = new ArrayList<EObject>();
-			result.add(object.getImportedPackage());
-			return result;
-		};
-
-		@Override
-		public Collection<?> caseInformationFlow(org.eclipse.uml2.uml.InformationFlow object) {
-			return object.getInformationTargets();
-		};
-
-		@Override
-		public Collection<?> defaultCase(org.eclipse.emf.ecore.EObject object) {
-			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/AbstractElementBorderEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
deleted file mode 100644
index 64c394c0004..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *      Vincent Lorenzo (CEA-LIST) - vincent.lorenzo@cea.fr (bug 493876)
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFNodeFigure;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * Abstract non-diagram specific edit part for border node.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPart {
-
-	protected IFigure contentPane;
-
-	protected IFigure primaryShape;
-
-	public AbstractElementBorderEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-	}
-
-	protected abstract LayoutEditPolicy createLayoutEditPolicy();
-
-	protected IFigure createNodeShape() {
-		return primaryShape = new AffixedNamedElementFigure();
-	}
-
-	@Override
-	public AffixedNamedElementFigure getPrimaryShape() {
-		return (AffixedNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		// When a node has external node labels, the methods refreshChildren() removes the label's
-		// edit part from the registry. Once removed from the registry the visibility cannot be set back to visible.
-
-		// Copied from generated code for Affixed nodes to fix:
-		// 366504: [SysML Block Definition Diagram] Cannot make masked labels of border items (Port) visible
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=366504
-		// 366503: [SysML Internal Block Diagram] Cannot make masked labels of border items (Port) visible
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=366503
-
-		// (this sounds strange as the "Show all labels" manages to get labels back without trouble...).
-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
-			Object notifier = event.getNotifier();
-			List<?> modelChildren = ((View) getModel()).getChildren();
-			if (!(notifier instanceof Edge)) {
-				if (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshBounds() {
-		if (getBorderItemLocator() != null) {
-			int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-			int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-			Point loc = new Point(x, y);
-
-			int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-			int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-			Dimension size = new Dimension(width, height);
-
-			// Update locator constraint
-			IBorderItemLocator locator = getBorderItemLocator();
-			locator.setConstraint(new Rectangle(loc, size));
-
-			// Set new constraint on parent figure
-			getFigure().getParent().setConstraint(getFigure(), locator);
-
-		} else {
-			super.refreshBounds();
-		}
-	}
-
-	protected NodeFigure createNodePlate() {
-		String prefElementId = getNotationView().getType();
-		IPreferenceStore store = Activator.getInstance().getPreferenceStore();
-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
-		DefaultSizeNodeFigure result = new LinkLFNodeFigure(this,store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
-
-		// FIXME: workaround for #154536
-		result.getBounds().setSize(result.getPreferredSize());
-		return result;
-	}
-
-	@Override
-	protected NodeFigure createMainFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	@Override
-	public abstract EditPart getPrimaryChildEditPart();
-
-	@Override
-	public Object getPreferredValue(EStructuralFeature feature) {
-		String prefKey = getNotationView().getType();
-
-		IPreferenceStore store = (IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
-		Object result = null;
-
-		if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-
-			String prefColor = null;
-			if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_LINE);
-
-			} else if (feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FONT);
-
-			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FILL);
-
-			}
-			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(store, prefColor));
-
-		} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-
-			String prefGradient = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_GRADIENT);
-			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(prefGradient));
-			if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
-				result = new Integer(gradientPreferenceConverter.getTransparency());
-
-			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-				result = gradientPreferenceConverter.getGradientData();
-
-			}
-		}
-
-		if (result == null) {
-			result = getStructuralFeatureValue(feature);
-		}
-		return result;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementChildLabelEditPart.java
deleted file mode 100644
index 6f7f077df5c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementChildLabelEditPart.java
+++ /dev/null
@@ -1,889 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gef.tools.SelectEditPartTracker;
-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.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.INodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionHandleEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-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.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.Anchor;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.IdentityAnchor;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-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.gmf.diagram.common.edit.part.ITextAwareEditPart;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.LabelDirectEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.TextNonResizableEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.TextSelectionEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.locator.CellEditorLocatorUtil;
-import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusAnchorableWrappingLabel;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.MaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.parser.DefaultParserHintAdapter;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract non-diagram specific edit part for child label node.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public class AbstractElementChildLabelEditPart extends GraphicalEditPart implements ITextAwareEditPart, IPrimaryEditPart, INodeEditPart {
-
-	private DirectEditManager manager;
-
-	protected IParser parser;
-
-	private List<?> parserElements;
-
-	private String defaultText;
-
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	protected IDirectEditorConfiguration configuration;
-
-	/** Constructor */
-	public AbstractElementChildLabelEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		// return new DragEditPartsTrackerEx(this);
-		// Disable current child label DnD as this is not correctly handled by Papyrus.
-		return new SelectEditPartTracker(this);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedLabelEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new TextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE, new ConnectionHandleEditPolicy());
-	}
-
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	@Override
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	@Override
-	public EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (NameLabelIconHelper.showLabelIcon(view)) {
-				return Activator.getInstance().getLabelProvider().getImage(parserElement);
-			}
-		}
-		return null;
-
-	}
-
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
-	}
-
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
-
-							@Override
-							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-							}
-						});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	@Override
-	public ParserOptions getParserOptions() {
-		if (getNotationView() == null || getNotationView().getDiagram() == null) {
-			return ParserOptions.NONE;
-		}
-
-		// int displayOptions = AppearanceHelper.getLabelDisplay(getNotationView());
-
-		EAnnotation display = getNotationView().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);
-		if (display == null) {
-			return getDefaultParserOptions();
-		}
-
-		// display != null
-		int displayOptions = Integer.parseInt(display.getDetails().get(VisualInformationPapyrusConstants.CUSTOM_APPEARANCE_MASK_VALUE));
-		return new ParserOptions(displayOptions);
-	}
-
-	@Override
-	public ParserOptions getDefaultParserOptions() {
-
-		if (getNotationView() == null || getNotationView().getDiagram() == null) {
-			return ParserOptions.NONE;
-		}
-
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		int displayOptions = store.getInt(LabelPreferenceHelper.getPreferenceConstant(getLabelPreferenceKey(), ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE));
-		if (displayOptions == 0) {
-			return ParserOptions.NONE;
-		}
-
-		return new ParserOptions(displayOptions);
-	}
-
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), resolveSemanticElement(), getNotationView().getType()));
-		}
-		return parser;
-	}
-
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), CellEditorLocatorUtil.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-
-			// initialize the direct edit manager
-			try {
-				getEditingDomain().runExclusive(new Runnable() {
-
-					@Override
-					public void run() {
-						if (isActive() && isEditable()) {
-							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-								performDirectEdit(initialChar.charValue());
-							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-								performDirectEdit(editRequest.getLocation());
-							} else {
-								performDirectEdit();
-							}
-						}
-					}
-				});
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	protected void refreshLabel() {
-
-		setLabelTextHelper(getFigure(), getLabelText());
-		setLabelIconHelper(getFigure(), getLabelIcon());
-
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-	}
-
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	private View getView() {
-		return (View) getModel();
-	}
-
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getInstance().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getInstance().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else if (NotationPackage.eINSTANCE.getView_SourceEdges().equals(feature)) {
-			refreshSourceConnections();
-		} else if (NotationPackage.eINSTANCE.getView_TargetEdges().equals(feature)) {
-			refreshTargetConnections();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	protected IFigure createFigurePrim() {
-		return new FigureDescriptor();
-	}
-
-	static final Font THIS_FONT = new Font(Display.getCurrent(), "Arial", 10, SWT.NORMAL);
-
-	public class FigureDescriptor extends PapyrusAnchorableWrappingLabel {
-
-		public FigureDescriptor() {
-			this.setText("");
-			this.setFont(THIS_FONT);
-		}
-	}
-
-	private String getLabelPreferenceKey() {
-		String diagramType = getNotationView().getDiagram().getType();
-		String labelType = getNotationView().getType();
-		return diagramType + "_" + labelType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getModelSourceConnections()
-	 * 
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelSourceConnections()
-	 */
-	@Override
-	protected List getModelSourceConnections() {
-		return ViewUtil.getSourceConnectionsConnectingVisibleViews((View) getModel());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getModelTargetConnections()
-	 * 
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelTargetConnections()
-	 */
-	@Override
-	protected List getModelTargetConnections() {
-		return ViewUtil.getTargetConnectionsConnectingVisibleViews((View) getModel());
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getSourceConnectionAnchor()
-	 * 
-	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 */
-	@Override
-	public ConnectionAnchor getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart connEditPart) {
-		final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart) connEditPart;
-		String t = ""; //$NON-NLS-1$
-		try {
-			t = (String) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
-
-				@Override
-				public void run() {
-					Anchor a = ((Edge) connection.getModel()).getSourceAnchor();
-					if (a instanceof IdentityAnchor) {
-						setResult(((IdentityAnchor) a).getId());
-					} else {
-						setResult(""); //$NON-NLS-1$
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(), DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getSourceConnectionAnchor", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(), DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getSourceConnectionAnchor", e); //$NON-NLS-1$
-		}
-		return getAnchorableFigure().getConnectionAnchor(t);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getAnchorableFigure()
-	 * 
-	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.Request)
-	 */
-	protected IAnchorableFigure getAnchorableFigure() {
-		IFigure myFigure = getFigure();
-		if (myFigure instanceof IAnchorableFigure) {
-			return (IAnchorableFigure) myFigure;
-		}
-		throw new RuntimeException("The figure of this element should be an IAnchorable Figure");//
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getSourceConnectionAnchor()
-	 * 
-	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.Request)
-	 */
-	@Override
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		if (request instanceof ReconnectRequest) {
-			if (((DropRequest) request).getLocation() == null) {
-				return getAnchorableFigure().getSourceConnectionAnchorAt(null);
-			}
-			Point pt = ((DropRequest) request).getLocation().getCopy();
-			return getAnchorableFigure().getSourceConnectionAnchorAt(pt);
-		} else if (request instanceof DropRequest) {
-			return getAnchorableFigure().getSourceConnectionAnchorAt(((DropRequest) request).getLocation());
-		}
-		return getAnchorableFigure().getSourceConnectionAnchorAt(null);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getTargetConnectionAnchor()
-	 * 
-	 * @see org.eclipse.gef.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 */
-	@Override
-	public ConnectionAnchor getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart connEditPart) {
-		final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart) connEditPart;
-
-		String t = ""; //$NON-NLS-1$
-		try {
-			t = (String) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
-
-				@Override
-				public void run() {
-					Anchor a = ((Edge) connection.getModel()).getTargetAnchor();
-					if (a instanceof IdentityAnchor) {
-						setResult(((IdentityAnchor) a).getId());
-					} else {
-						setResult(""); //$NON-NLS-1$
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(), DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getTargetConnectionAnchor", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(), DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getTargetConnectionAnchor", e); //$NON-NLS-1$
-		}
-
-		return getAnchorableFigure().getConnectionAnchor(t);
-	}
-
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#getTargetConnectionAnchor()
-	 * 
-	 * @see org.eclipse.gef.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.Request)
-	 */
-	@Override
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		if (request instanceof ReconnectRequest) {
-			if (((DropRequest) request).getLocation() == null) {
-				return getAnchorableFigure().getTargetConnectionAnchorAt(null);
-			}
-			Point pt = ((DropRequest) request).getLocation().getCopy();
-			return getAnchorableFigure().getTargetConnectionAnchorAt(pt);
-		} else if (request instanceof DropRequest) {
-			return getAnchorableFigure().getTargetConnectionAnchorAt(((DropRequest) request).getLocation());
-		}
-		return getAnchorableFigure().getTargetConnectionAnchorAt(null);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#mapConnectionAnchorToTerminal()
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapConnectionAnchorToTerminal(org.eclipse.draw2d.ConnectionAnchor)
-	 */
-	@Override
-	final public String mapConnectionAnchorToTerminal(ConnectionAnchor c) {
-		return getAnchorableFigure().getConnectionAnchorTerminal(c);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#mapTerminalToConnectionAnchor()
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapTerminalToConnectionAnchor(java.lang.String)
-	 */
-	@Override
-	final public ConnectionAnchor mapTerminalToConnectionAnchor(String terminal) {
-		return getAnchorableFigure().getConnectionAnchor(terminal);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INotableEditPart#canAttachNote()
-	 * Copied from @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#canAttachNote()
-	 */
-	@Override
-	public boolean canAttachNote() {
-		return true;
-	}
-
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
deleted file mode 100644
index 2a8cb2f6702..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-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.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.helper.BasicClassifierCompartmentLayoutHelper;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * Abstract non-diagram specific edit part for nodes.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public abstract class AbstractElementEditPart extends NamedElementEditPart {
-
-	protected IFigure contentPane;
-
-	protected IFigure primaryShape;
-
-	public AbstractElementEditPart(View view) {
-		super(view);
-		setCompartmentLayoutHelper(BasicClassifierCompartmentLayoutHelper.getInstances());
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-	}
-
-	protected abstract LayoutEditPolicy createLayoutEditPolicy();
-
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new ClassifierFigure();
-	}
-
-	@Override
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	protected abstract boolean addFixedChild(EditPart childEditPart);
-
-	protected abstract boolean removeFixedChild(EditPart childEditPart);
-
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	@Override
-	protected abstract IFigure getContentPaneFor(IGraphicalEditPart editPart);
-
-
-	@Override
-	protected NodeFigure createNodePlate() {
-		String prefElementId = getNotationView().getType();
-		IPreferenceStore store = Activator.getInstance().getPreferenceStore();
-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
-
-		return result;
-	}
-
-	@Override
-	protected NodeFigure createMainFigure() {
-		return createMainFigureWithSVG();
-	}
-
-	@Override
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	@Override
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	@Override
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	@Override
-	public abstract EditPart getPrimaryChildEditPart();
-
-	@Override
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	@Override
-	public Object getPreferredValue(EStructuralFeature feature) {
-		String prefKey = getNotationView().getType();
-
-		IPreferenceStore store = (IPreferenceStore) getDiagramPreferencesHint().getPreferenceStore();
-		Object result = null;
-
-		if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-
-			String prefColor = null;
-			if (feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_LINE);
-
-			} else if (feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FONT);
-
-			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FILL);
-
-			}
-			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(store, prefColor));
-
-		} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-
-			String prefGradient = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_GRADIENT);
-			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(prefGradient));
-			if (feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
-				result = new Integer(gradientPreferenceConverter.getTransparency());
-
-			} else if (feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-				result = gradientPreferenceConverter.getGradientData();
-
-			}
-		}
-
-		if (result == null) {
-			result = getStructuralFeatureValue(feature);
-		}
-		return result;
-	}
-}
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
deleted file mode 100644
index 9269beb8406..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-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.gmf.diagram.common.edit.part.ITextAwareEditPart;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultSnapBackEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.LabelDefaultSemanticEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.LabelDirectEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.TextSelectionEditPolicy;
-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.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-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;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.MaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.parser.DefaultParserHintAdapter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract non-diagram specific edit part for labels.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public abstract class AbstractElementLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, ILabelRoleProvider {
-
-	private DirectEditManager manager;
-
-	private IParser parser;
-
-	private List<?> parserElements;
-
-	protected String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/** Constructor */
-	public AbstractElementLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedLabelEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new TextSelectionEditPolicy());
-		installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE, new DefaultSnapBackEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LabelDefaultSemanticEditPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	public void setLabel(WrappingLabel figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	@Override
-	public EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(new SemanticAdapter(getParserElement(), getNotationView()), getParserOptions().intValue());
-	}
-
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<IParserEditStatus>() {
-
-							@Override
-							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-							}
-						});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	@Override
-	public ParserOptions getParserOptions() {
-
-		if (getNotationView() == null || getNotationView().getDiagram() == null) {
-			return ParserOptions.NONE;
-		}
-
-		EAnnotation display = getNotationView().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);
-		if (display == null) {
-			return getDefaultParserOptions();
-		}
-
-		// display != null
-		int displayOptions = Integer.parseInt(display.getDetails().get(VisualInformationPapyrusConstants.CUSTOM_APPEARANCE_MASK_VALUE));
-		return new ParserOptions(displayOptions);
-	}
-
-	@Override
-	public ParserOptions getDefaultParserOptions() {
-
-		if (getNotationView() == null || getNotationView().getDiagram() == null) {
-			return ParserOptions.NONE;
-		}
-
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		int displayOptions = store.getInt(LabelPreferenceHelper.getPreferenceConstant(getLabelPreferenceKey(), ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE));
-		if (displayOptions == 0) {
-			return ParserOptions.NONE;
-		}
-
-		return new ParserOptions(displayOptions);
-	}
-
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), getParserElement(), getNotationView().getType()));
-		}
-		return parser;
-	}
-
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), new TextCellEditorLocator((WrappingLabel) this.getFigure())));
-		}
-		return manager;
-	}
-
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") { //$NON-NLS-1$
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-
-			// initialize the direct edit manager
-			try {
-				getEditingDomain().runExclusive(new Runnable() {
-
-					@Override
-					public void run() {
-						if (isActive() && isEditable()) {
-							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-								performDirectEdit(initialChar.charValue());
-							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-								performDirectEdit(editRequest.getLocation());
-							} else {
-								performDirectEdit();
-							}
-						}
-					}
-				});
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	protected void refreshLabel() {
-
-		setLabelTextHelper(getFigure(), getLabelText());
-		setLabelIconHelper(getFigure(), getLabelIcon());
-
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-	}
-
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = getParserElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) { //$NON-NLS-1$
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) { //$NON-NLS-1$
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					// Bug 457470 : The label refreshment is not done if the following method is not called
-					// This call was comment to fix a text alignment issue (Bug 440226)
-					refreshLabel(); //Comment to fix text alignment issue
-				}
-			}
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	protected void addSnapBackLocation() {
-		// Use default view position as snap back position
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-
-		String xKey = PreferencesConstantsHelper.getElementConstant(getLabelPreferenceKey(), PreferencesConstantsHelper.LOCATION_X);
-		String yKey = PreferencesConstantsHelper.getElementConstant(getLabelPreferenceKey(), PreferencesConstantsHelper.LOCATION_Y);
-
-		Point snapBackPosition = new Point(store.getInt(xKey), store.getInt(yKey));
-
-		registerSnapBackPosition(getLabelPreferenceKey(), snapBackPosition);
-	}
-
-	private String getLabelPreferenceKey() {
-		String diagramType = getNotationView().getDiagram().getType();
-		String parentType = ViewUtil.getViewContainer(getNotationView()).getType();
-		String labelType = getNotationView().getType();
-		return diagramType + "_" + parentType + "-" + labelType; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public abstract String getLabelRole();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public abstract String getIconPathRole();
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLinkEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLinkEditPart.java
deleted file mode 100644
index 126bb18e566..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLinkEditPart.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineDecoration;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
-
-/**
- * Abstract non-diagram specific edit part for links.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public abstract class AbstractElementLinkEditPart extends UMLConnectionNodeEditPart {
-
-	/**
-	 * Constructor.
-	 */
-	public AbstractElementLinkEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * Add fixed child edit part.
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AppliedStereotypeLinkLabelEditPart) {
-			((AppliedStereotypeLinkLabelEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove fixed child edit part.
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AppliedStereotypeLinkLabelEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-
-		// Update the figure when the line width changes
-		Object feature = event.getFeature();
-		if ((getModel() != null) && (getModel() == event.getNotifier())) {
-
-			if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)) {
-				refreshLineWidth();
-				refreshArrowSource();
-				refreshArrowTarget();
-			} else if (NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(feature)) {
-				refreshLineType();
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLineType();
-		refreshLineWidth();
-		refreshArrowSource();
-		refreshArrowTarget();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		getPrimaryShape().setLineWidth(width);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void setLineType(int style) {
-		getPrimaryShape().setLineStyle(style);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void setArrowSource(RotatableDecoration arrowDecoration) {
-		getPrimaryShape().setSourceDecoration(arrowDecoration);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void setArrowTarget(RotatableDecoration arrowDecoration) {
-		getPrimaryShape().setTargetDecoration(arrowDecoration);
-	}
-
-	/**
-	 * <pre>
-	 * {@inheritDoc}
-	 * 
-	 * This method override parent implementation to add a new set of
-	 * predefined decoration type.
-	 * 
-	 * The arrowType available constants are given in {@link EdgeDecorationType}.
-	 * </pre>
-	 */
-	@Override
-	protected RotatableDecoration getArrowDecoration(int arrowType) {
-		RotatableDecoration decoration = null;
-		int width = getLineWidth();
-		if (width < 0) {
-			width = 1;
-		}
-		if (arrowType == EdgeDecorationType.OPEN_ARROW) {
-			IMapMode mm = getMapMode();
-			decoration = new PolylineDecoration();
-			((PolylineDecoration) decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
-			((PolylineDecoration) decoration).setTemplate(PolylineDecoration.TRIANGLE_TIP);
-			((PolylineDecoration) decoration).setLineWidth(mm.DPtoLP(width));
-
-		} else if (arrowType == EdgeDecorationType.SOLID_ARROW_FILLED) {
-			IMapMode mm = getMapMode();
-			decoration = new PolygonDecoration();
-			((PolygonDecoration) decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
-			((PolygonDecoration) decoration).setTemplate(PolygonDecoration.TRIANGLE_TIP);
-			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
-			((PolygonDecoration) decoration).setFill(true);
-
-		} else if (arrowType == EdgeDecorationType.SOLID_ARROW_EMPTY) {
-			IMapMode mm = getMapMode();
-			decoration = new PolygonDecoration();
-			((PolygonDecoration) decoration).setScale(mm.DPtoLP(15 + width), mm.DPtoLP(5 + width));
-			((PolygonDecoration) decoration).setTemplate(PolygonDecoration.TRIANGLE_TIP);
-			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
-
-			// Not really empty... filled with white color.
-			((PolygonDecoration) decoration).setFill(true);
-			((PolygonDecoration) decoration).setBackgroundColor(ColorConstants.white);
-
-		} else if (arrowType == EdgeDecorationType.SOLID_DIAMOND_FILLED) {
-			IMapMode mm = getMapMode();
-			decoration = new PolygonDecoration();
-			((PolygonDecoration) decoration).setScale(mm.DPtoLP(12 + width), mm.DPtoLP(6 + width));
-
-			PointList diamondPointList = new PointList();
-			diamondPointList.addPoint(0, 0);
-			diamondPointList.addPoint(-1, 1);
-			diamondPointList.addPoint(-2, 0);
-			diamondPointList.addPoint(-1, -1);
-
-			((PolygonDecoration) decoration).setTemplate(diamondPointList);
-			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
-			((PolygonDecoration) decoration).setFill(true);
-
-		} else if (arrowType == EdgeDecorationType.SOLID_DIAMOND_EMPTY) {
-			IMapMode mm = getMapMode();
-			decoration = new PolygonDecoration();
-			((PolygonDecoration) decoration).setScale(mm.DPtoLP(12 + width), mm.DPtoLP(6 + width));
-
-			PointList diamondPointList = new PointList();
-			diamondPointList.addPoint(0, 0);
-			diamondPointList.addPoint(-1, 1);
-			diamondPointList.addPoint(-2, 0);
-			diamondPointList.addPoint(-1, -1);
-
-			((PolygonDecoration) decoration).setTemplate(diamondPointList);
-			((PolygonDecoration) decoration).setLineWidth(mm.DPtoLP(width));
-
-			// Not really empty... filled with white color.
-			((PolygonDecoration) decoration).setFill(true);
-			((PolygonDecoration) decoration).setBackgroundColor(ColorConstants.white);
-		}
-
-		return decoration;
-	}
-}
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
deleted file mode 100644
index 08ca11eb035..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementNodeLabelEditPart.java
+++ /dev/null
@@ -1,744 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.gef.ui.internal.tools.DelegatingDragEditPartsTracker;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-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.gmf.diagram.common.edit.part.ITextAwareEditPart;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.LabelDirectEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.TextNonResizableEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.TextSelectionEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.locator.TextCellEditorLocator;
-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.commands.SemanticAdapter;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.MaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.parser.DefaultParserHintAdapter;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract non-diagram specific edit part for labels.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public abstract class AbstractElementNodeLabelEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, ILabelRoleProvider {
-
-	private DirectEditManager manager;
-
-	private IParser parser;
-
-	private List<?> parserElements;
-
-	protected String defaultText;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/** Constructor */
-	public AbstractElementNodeLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * Compartment-like isSelectable implementation.
-	 *
-	 * By default, the edit parts get selectable only if
-	 * the compartment's top level container matches the top level
-	 * container of the editpart that currently has the keyboard focus
-	 * i.e: you need to select the shape first before selecting a this label.
-	 *
-	 * @see CompartmentEditPart#isSelectable()
-	 */
-	@Override
-	public boolean isSelectable() {
-		if (super.isSelectable()) {
-			EditPart focusPart = getViewer().getFocusEditPart();
-			if (focusPart instanceof IGraphicalEditPart) {
-				TopGraphicEditPart focusTopEP = ((IGraphicalEditPart) focusPart).getTopGraphicEditPart();
-				TopGraphicEditPart myTopEP = getTopGraphicEditPart();
-				if (myTopEP == focusTopEP) {
-					// check if the selection contains only editparts belonging to
-					// the same top level editpart
-					Iterator<?> selection = getViewer().getSelectedEditParts().iterator();
-					while (selection.hasNext()) {
-						Object editPart = selection.next();
-						if (editPart instanceof IGraphicalEditPart && (((IGraphicalEditPart) editPart).getTopGraphicEditPart() != myTopEP)) {
-							return false;
-						}
-					}
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		// Delegate to the main edit part.
-		return new DelegatingDragEditPartsTracker(this, getTopGraphicEditPart());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new MaskManagedLabelEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new TextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-	}
-
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	public void setLabel(WrappingLabel figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	@Override
-	protected List<?> getModelChildren() {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	@Override
-	public EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return org.eclipse.papyrus.sysml.diagram.common.Activator.getInstance().getLabelProvider().getImage(parserElement);
-			}
-		}
-		return null;
-
-	}
-
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
-	}
-
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<IParserEditStatus>() {
-
-							@Override
-							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-							}
-						});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	@Override
-	public ParserOptions getParserOptions() {
-
-		if (getNotationView() == null || getNotationView().getDiagram() == null) {
-			return ParserOptions.NONE;
-		}
-
-		EAnnotation display = getNotationView().getEAnnotation(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);
-		if (display == null) {
-			return getDefaultParserOptions();
-		}
-
-		// display != null
-		int displayOptions = Integer.parseInt(display.getDetails().get(VisualInformationPapyrusConstants.CUSTOM_APPEARANCE_MASK_VALUE));
-		return new ParserOptions(displayOptions);
-	}
-
-	@Override
-	public ParserOptions getDefaultParserOptions() {
-
-		if (getNotationView() == null || getNotationView().getDiagram() == null) {
-			return ParserOptions.NONE;
-		}
-
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		int displayOptions = store.getInt(LabelPreferenceHelper.getPreferenceConstant(getLabelPreferenceKey(), ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE));
-		if (displayOptions == 0) {
-			return ParserOptions.NONE;
-		}
-
-		return new ParserOptions(displayOptions);
-	}
-
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), getParserElement(), getNotationView().getType()));
-		}
-		return parser;
-	}
-
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), new TextCellEditorLocator((WrappingLabel) this.getFigure())));
-		}
-		return manager;
-	}
-
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	@Override
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-
-			// initialize the direct edit manager
-			try {
-				getEditingDomain().runExclusive(new Runnable() {
-
-					@Override
-					public void run() {
-						if (isActive() && isEditable()) {
-							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-								performDirectEdit(initialChar.charValue());
-							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-								performDirectEdit(editRequest.getLocation());
-							} else {
-								performDirectEdit();
-							}
-						}
-					}
-				});
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	protected void refreshLabel() {
-
-		setLabelTextHelper(getFigure(), getLabelText());
-		setLabelIconHelper(getFigure(), getLabelIcon());
-
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof TextSelectionEditPolicy) {
-			((TextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-	}
-
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = getParserElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	public String getLabelPreferenceKey() {
-		String diagramType = getNotationView().getDiagram().getType();
-		String parentType = ViewUtil.getViewContainer(getNotationView()).getType();
-		String labelType = getNotationView().getType();
-		return diagramType + "_" + parentType + "-" + labelType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public abstract String getLabelRole();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public abstract String getIconPathRole();
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractShapeCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractShapeCompartmentEditPart.java
deleted file mode 100644
index 8da57dd5969..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractShapeCompartmentEditPart.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DeselectAllTracker;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RubberbandDragTracker;
-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.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-
-/**
- * Abstract non-diagram specific edit part for shape compartment.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public abstract class AbstractShapeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {
-
-	public AbstractShapeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
-	}
-
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-
-	/**
-	 * Install a drag tracker supporting double click (necessary for navigation).
-	 */
-	@Override
-	public DragTracker getDragTracker(Request req) {
-		if (!supportsDragSelection()) {
-			return super.getDragTracker(req);
-		}
-
-		if (req instanceof SelectionRequest
-				&& ((SelectionRequest) req).getLastButtonPressed() == 3) {
-			return new DeselectAllTracker(this) {
-
-				@Override
-				protected boolean handleButtonDown(int button) {
-					getCurrentViewer().select(AbstractShapeCompartmentEditPart.this);
-					return true;
-				}
-			};
-		}
-
-		return new RubberbandDragTracker() {
-
-			/*
-			 * this method has been respecified in order to allow double click
-			 * on the compartment.
-			 * hence it allows the navigation by double click
-			 */
-			@Override
-			protected boolean handleDoubleClick(int button) {
-				SelectionRequest request = new SelectionRequest();
-				request.setLocation(getLocation());
-				request.setType(RequestConstants.REQ_OPEN);
-				performRequest(request);
-				return true;
-			}
-
-			@Override
-			protected void handleFinished() {
-				if (getViewer().getSelectedEditParts().isEmpty()) {
-					getViewer().select(AbstractShapeCompartmentEditPart.this);
-				}
-			}
-
-		};
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java
deleted file mode 100644
index fca51315244..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeAffixedLabelEditPart.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-
-/**
- * This class implements an affixed label edit part for applied stereotype representation on border items.
- */
-public class AppliedStereotypeAffixedLabelEditPart extends AbstractElementLabelEditPart implements IBorderItemEditPart, IPapyrusEditPart {
-
-	/** Constructor */
-	public AppliedStereotypeAffixedLabelEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());
-	}
-
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return constraint instanceof IBorderItemLocator ? (IBorderItemLocator) constraint : null;
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	protected IFigure createFigurePrim() {
-		return new AppliedStereotypeWrappingLabelFigure();
-	}
-
-	@Override
-	public IFigure getPrimaryShape() {
-		return getFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * Forbid direct edition on this label.
-	 */
-	@Override
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeLinkLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeLinkLabelEditPart.java
deleted file mode 100644
index ed7894be2d6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AppliedStereotypeLinkLabelEditPart.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-
-/**
- * Abstract non-diagram specific edit part for link label representing applied stereotypes.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public class AppliedStereotypeLinkLabelEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public AppliedStereotypeLinkLabelEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * Forbid direct edition on this label.
-	 */
-	@Override
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Stereotype";//$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return "";//$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceMultiplicityEditPart.java
deleted file mode 100644
index 9475db9dc26..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceMultiplicityEditPart.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.uml.diagram.common.utils.AssociationViewUtils;
-import org.eclipse.uml2.uml.Association;
-
-/**
- * Edit Part for link label showing {@link Association} source multiplicity.
- */
-public class AssociationLinkLabelSourceMultiplicityEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public AssociationLinkLabelSourceMultiplicityEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.SOURCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public EObject getParserElement() {
-		EObject semanticElement = resolveSemanticElement();
-		if (!(semanticElement instanceof Association)) {
-			return null;
-		}
-		Association association = (Association) semanticElement;
-		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
-			View owner = ViewUtil.getContainerView(getNotationView());
-
-			if ((association != null) && (association.getMemberEnds().size() == 2)) {
-				return AssociationViewUtils.getSourceSemanticEnd(owner);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "SourceMultiplicity"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceRoleEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceRoleEditPart.java
deleted file mode 100644
index deff0c57a04..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelSourceRoleEditPart.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.uml.diagram.common.utils.AssociationViewUtils;
-import org.eclipse.uml2.uml.Association;
-
-/**
- * Edit Part for link label showing {@link Association} source role.
- */
-public class AssociationLinkLabelSourceRoleEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public AssociationLinkLabelSourceRoleEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.SOURCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public EObject getParserElement() {
-		EObject semanticElement = resolveSemanticElement();
-		if (!(semanticElement instanceof Association)) {
-			return null;
-		}
-		Association association = (Association) semanticElement;
-		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
-			View owner = ViewUtil.getContainerView(getNotationView());
-
-			if ((association != null) && (association.getMemberEnds().size() == 2)) {
-				return AssociationViewUtils.getSourceSemanticEnd(owner);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "SourceRole"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetMultiplicityEditPart.java
deleted file mode 100644
index 8a6ed49d0ec..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetMultiplicityEditPart.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.uml.diagram.common.utils.AssociationViewUtils;
-import org.eclipse.uml2.uml.Association;
-
-/**
- * Edit Part for link label showing {@link Association} target multiplicity.
- */
-public class AssociationLinkLabelTargetMultiplicityEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public AssociationLinkLabelTargetMultiplicityEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.TARGET;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public EObject getParserElement() {
-		EObject semanticElement = resolveSemanticElement();
-		if (!(semanticElement instanceof Association)) {
-			return null;
-		}
-		Association association = (Association) semanticElement;
-		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
-			View owner = ViewUtil.getContainerView(getNotationView());
-
-			if ((association != null) && (association.getMemberEnds().size() == 2)) {
-				return AssociationViewUtils.getTargetSemanticEnd(owner);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "TargetMultiplicity"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetRoleEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetRoleEditPart.java
deleted file mode 100644
index d87bef97665..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AssociationLinkLabelTargetRoleEditPart.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.papyrus.uml.diagram.common.utils.AssociationViewUtils;
-import org.eclipse.uml2.uml.Association;
-
-/**
- * Edit Part for link label showing {@link Association} target role.
- */
-public class AssociationLinkLabelTargetRoleEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public AssociationLinkLabelTargetRoleEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.TARGET;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public EObject getParserElement() {
-		EObject semanticElement = resolveSemanticElement();
-		if (!(semanticElement instanceof Association)) {
-			return null;
-		}
-		Association association = (Association) semanticElement;
-		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
-			View owner = ViewUtil.getContainerView(getNotationView());
-
-			if ((association != null) && (association.getMemberEnds().size() == 2)) {
-				return AssociationViewUtils.getTargetSemanticEnd(owner);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "TargetRole"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelEditPart.java
deleted file mode 100644
index 2249fb48cac..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelEditPart.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-
-/**
- * Edit Part for link label showing {@link Connector} label.
- */
-public class ConnectorLinkLabelEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public ConnectorLinkLabelEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Label"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelSourceMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelSourceMultiplicityEditPart.java
deleted file mode 100644
index e55d3f0cb2f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelSourceMultiplicityEditPart.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-
-/**
- * Edit Part for link label showing {@link Connector} source {@link ConnectorEnd} multiplicity.
- */
-public class ConnectorLinkLabelSourceMultiplicityEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public ConnectorLinkLabelSourceMultiplicityEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.SOURCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public EObject getParserElement() {
-		Connector connector = (Connector) resolveSemanticElement();
-		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
-			View owner = ViewUtil.getContainerView(getNotationView());
-
-			if ((connector != null) && (connector.getEnds().size() == 2)) {
-				return connector.getEnds().get(0);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "SourceMultiplicity"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelTargetMultiplicityEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelTargetMultiplicityEditPart.java
deleted file mode 100644
index e628c640486..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorLinkLabelTargetMultiplicityEditPart.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-
-/**
- * Edit Part for link label showing {@link Connector} target {@link ConnectorEnd} multiplicity.
- */
-public class ConnectorLinkLabelTargetMultiplicityEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public ConnectorLinkLabelTargetMultiplicityEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getKeyPoint() {
-		return ConnectionLocator.TARGET;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public EObject getParserElement() {
-		Connector connector = (Connector) resolveSemanticElement();
-		if ((getNotationView() != null) && (ViewUtil.getContainerView(getNotationView()) != null)) {
-			View owner = ViewUtil.getContainerView(getNotationView());
-
-			if ((connector != null) && (connector.getEnds().size() == 2)) {
-				connector.getEnds().get(1);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "TargetMultiplicity"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
deleted file mode 100644
index 9fec4daad7b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintNodeLabelEditPart.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-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.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-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.commands.SemanticAdapter;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-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.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UMLEditPartFactory;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * Abstract non-diagram specific edit part for node label representing {@link Constraint}.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public class ConstraintNodeLabelEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 *
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-
-	/**
-	 * configuration from a registered edit dialog
-	 *
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintNodeLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText("{" + text + "}");
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(WrappingLabel figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	@SuppressWarnings("rawtypes")
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(new SemanticAdapter(parserElement, getNotationView()), getParserOptions().intValue());
-		}
-		if (text == null) {
-			text = "";
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			@Override
-			@SuppressWarnings("rawtypes")
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl() {
-
-							@Override
-							@SuppressWarnings("unchecked")
-							public void run() {
-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-							}
-						});
-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_Shape_CN, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				} else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			// initialize the direct edit manager
-			try {
-				getEditingDomain().runExclusive(new Runnable() {
-
-					@Override
-					public void run() {
-						if (isActive() && isEditable()) {
-							if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-								Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-								performDirectEdit(initialChar.charValue());
-							} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-								DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-								performDirectEdit(editRequest.getLocation());
-							} else {
-								performDirectEdit();
-							}
-						}
-					}
-				});
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			} else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	@Override
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-			addListenerFilter("SemanticModelConstraintOwner", this, element); // in order to refresh label when ConstraintSpecification creation
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				@Override
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 *
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 *
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 *
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 *
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 *
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 *
-	 * @param theRequest
-	 *            the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/DefaultChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/DefaultChildLabelEditPart.java
deleted file mode 100644
index f444f354991..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/DefaultChildLabelEditPart.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-
-/**
- * Default implementation for child label node.
- */
-public class DefaultChildLabelEditPart extends AbstractElementChildLabelEditPart {
-
-	/** Constructor */
-	public DefaultChildLabelEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java
deleted file mode 100644
index be434b24f66..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementAffixedLabelNameEditPart.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * Abstract non-diagram specific edit part for border node label representing {@link NamedElement}.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public class NamedElementAffixedLabelNameEditPart extends AbstractElementLabelEditPart implements IBorderItemEditPart {
-
-	/** Constructor */
-	public NamedElementAffixedLabelNameEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (NameLabelIconHelper.showLabelIcon(view)) {
-				return Activator.getInstance().getImage(parserElement.eClass());
-			}
-		}
-		return null;
-
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementLinkLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementLinkLabelNameEditPart.java
deleted file mode 100644
index 9fd5a7198b0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementLinkLabelNameEditPart.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * Edit Part for link label showing {@link NamedElement} name.
- */
-public class NamedElementLinkLabelNameEditPart extends AbstractElementLabelEditPart {
-
-	/** Constructor */
-	public NamedElementLinkLabelNameEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementNodeLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementNodeLabelNameEditPart.java
deleted file mode 100644
index 321bb2fdca0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/NamedElementNodeLabelNameEditPart.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * Abstract non-diagram specific edit part for node label representing {@link NamedElement}.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public class NamedElementNodeLabelNameEditPart extends AbstractElementNodeLabelEditPart {
-
-	public NamedElementNodeLabelNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Name"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java
deleted file mode 100644
index 70d3db8ff42..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedLabelNameEditPart.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.Port;
-
-/**
- * This class implements a {@link Port} affixed label edit part.
- */
-public class PortAffixedLabelNameEditPart extends AbstractElementLabelEditPart implements IBorderItemEditPart {
-
-	/** Constructor */
-	public PortAffixedLabelNameEditPart(View view) {
-		super(view);
-		addSnapBackLocation();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart#getDefaultTextAlignment()
-	 *
-	 * @return
-	 */
-	@Override
-	protected int getDefaultTextAlignment() {
-		return PositionConstants.LEFT;
-	}
-
-	@Override
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return constraint instanceof IBorderItemLocator ? (IBorderItemLocator) constraint : null;
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return Activator.getInstance().getLabelProvider().getImage(parserElement);
-			}
-		}
-		return null;
-
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	protected IFigure createFigurePrim() {
-		return new PapyrusWrappingLabel();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Label"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyNodeLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyNodeLabelEditPart.java
deleted file mode 100644
index 05446ab6a64..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyNodeLabelEditPart.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Abstract non-diagram specific edit part for node label representing {@link Property}.
- * This class is adapted from edit parts generated by GMF Tooling.
- */
-public class PropertyNodeLabelEditPart extends AbstractElementNodeLabelEditPart {
-
-	public PropertyNodeLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLabelRole() {
-		return "Label"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getIconPathRole() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/SlotChildLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/SlotChildLabelEditPart.java
deleted file mode 100644
index fce649339b9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/SlotChildLabelEditPart.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.Slot;
-
-/**
- * Edit part for {@link Slot} used as Child label node.
- */
-public class SlotChildLabelEditPart extends AbstractElementChildLabelEditPart {
-
-	/** Constructor */
-	public SlotChildLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
deleted file mode 100644
index 683b933e63c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.policy;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-/**
- * <pre>
- * This class modifies EncapsulatedClassifier default resize command in order to move
- * any Port IBorderItem possibly attached.
- * See. bug. https://bugs.eclipse.org/bugs/show_bug.cgi?id=354814
- * Could not find a more general way to do this without making any assumption about
- * the kind of attached IBorderItem and that would only rely on its IBorderItemLocator.
- * </pre>
- */
-public class EncapsulatedClassifierResizableShapeEditPolicy extends org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.EncapsulatedClassifierResizableShapeEditPolicy {
-
-	/**
-	 * <pre>
-	 * {@inheritDoc}
-	 *
-	 * Forbid AutoSize for elements that can hold Port, it currently
-	 * leads to Port (FlowPort) with incorrect location stored in notation,
-	 * and possible incorrect visual representation (FlowPort).
-	 * </pre>
-	 */
-	@Override
-	protected Command getAutoSizeCommand(Request request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/MaskManagedLabelEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/MaskManagedLabelEditPolicy.java
deleted file mode 100644
index b8c32595146..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/MaskManagedLabelEditPolicy.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.policy;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.part.ITextAwareEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.MaskLabelHelper;
-import org.eclipse.papyrus.uml.diagram.common.parser.IMaskManagedSemanticParser;
-
-
-/**
- * <pre>
- * Generic mask manage edit policy for {@link ITextAwareEditPart}, managed masks are assumed to be given by the
- * {@link ITextAwareEditPart} parser (must implement {@link IMaskManagedSemanticParser}).
- * </pre>
- */
-public class MaskManagedLabelEditPolicy extends GraphicalEditPolicy implements IMaskManagedLabelEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-
-		IParser parser = getHostLabelEditPart().getParser();
-		if (parser instanceof IMaskManagedSemanticParser) {
-			masks = ((IMaskManagedSemanticParser) parser).getMasks();
-		}
-
-		return masks;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Collection<String> getCurrentDisplayValue() {
-		Collection<String> result = MaskLabelHelper.getMaskValues(getView());
-		if (result == null) {
-			IParser parser = getHostLabelEditPart().getParser();
-			if (parser instanceof IMaskManagedSemanticParser) {
-				result = ((IMaskManagedSemanticParser) parser).getDefaultValue(getHost());
-			}
-		}
-
-		if (result == null) {
-			return Collections.emptySet();
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void updateDisplayValue(Collection<String> maskValues) {
-		MaskLabelHelper.setMaskValues(getView(), maskValues);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setDefaultDisplayValue() {
-		MaskLabelHelper.unsetMaskValues(getView());
-	}
-
-	// @unused.
-	@Override
-	public void refreshDisplay() {
-		// Not implemented.
-	}
-
-	/**
-	 * Get the host label edit part (has to implement {@link ITextAwareEditPart}).
-	 *
-	 * @return the host label edit part.
-	 */
-	private ITextAwareEditPart getHostLabelEditPart() {
-		return (ITextAwareEditPart) getHost();
-	}
-
-	private View getView() {
-		return (View) getHost().getModel();
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
deleted file mode 100644
index 08a6de67b6d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.policy;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.commands.CreateViewCommand;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
-import org.eclipse.papyrus.infra.gmfdiag.common.snap.NodeSnapHelper;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-
-/**
- * Replaces the {@link DefaultCreationEditPolicy} in order to manage Affixed Port position on creation or on drop.
- */
-public class StructuredClassifierCreationEditPolicy extends CreationEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReparentCommand(ChangeBoundsRequest request) {
-		// Forbid re-parent in this edit policy (to be used by compartment)
-		// in order to avoid node to be moved in compartments.
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * <pre>
-	 * {@inheritDoc}
-	 * 
-	 * The goal here is to create the view and to move it at the mouse location,
-	 * respecting a given locator. It is assumed that only affixed Port can be created on
-	 * edit part that have this edit policy, and the locator is a {@link PortPositionLocator}.
-	 * 
-	 * @see DefaultCreationEditPolicy#getCreateCommand().
-	 * </pre>
-	 */
-	@Override
-	protected Command getCreateCommand(CreateViewRequest request) {
-
-		// This overrides getCreateCommand in order to use a specific CreateViewCommand (instead of
-		// org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand.
-
-		// The original CreateCommand#canExecute() implementation rely on ViewProvider#provides(CreateViewForKindOperation op)
-		// method to know if a view can be created. The problem is that this method is incorrectly generated by GMF Tooling and should be avoided.
-
-		// CreateViewCommand replace the semantic adapter in its call to ViewService to know if a provider exists.
-
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
-
-		Iterator<? extends ViewDescriptor> descriptors = request.getViewDescriptors().iterator();
-		while (descriptors.hasNext()) {
-
-			CreateViewRequest.ViewDescriptor descriptor = descriptors.next();
-			ICommand createCommand = new CreateViewCommand(editingDomain, descriptor, (View) (getHost().getModel()));
-
-			// Add SetBounds
-			createCommand = CompositeCommand.compose(createCommand, getSetBoundsCommand(request, descriptor));
-			//
-
-			cc.compose(createCommand);
-
-		}
-
-		return new ICommandProxy(cc.reduce());
-
-	}
-
-	/**
-	 * Get a SetBoundsCommand to move a new view at current mouse position.
-	 *
-	 * @param request
-	 *            The creation request.
-	 * @param descriptor
-	 *            The descriptor of the new element.
-	 * @return The set bounds command.
-	 */
-	private ICommand getSetBoundsCommand(CreateViewRequest request, CreateViewRequest.ViewDescriptor descriptor) {
-		ICommand setBoundsCommand = null;
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-
-		// Retrieve parent location
-		Point parentLoc = getHostFigure().getBounds().getLocation().getCopy();
-
-
-		final Point realWantedLocation;
-		Map<?, ?> params = request.getExtendedData();
-		Point realLocation = (Point) params.get(AspectUnspecifiedTypeCreationTool.INITIAL_MOUSE_LOCATION_FOR_CREATION);
-		if (realLocation != null) {
-			realWantedLocation = realLocation.getCopy();
-		} else {
-			// we use this location to be able to create Port in the corners of the figure
-			realWantedLocation = request.getLocation().getCopy();
-		}
-
-		// Compute relative creation location
-		Point requestedLocation = realWantedLocation.getCopy();
-
-
-
-		getHostFigure().translateToRelative(requestedLocation);
-
-		// Create proposed creation bounds and use the locator to find the expected position
-		PortPositionLocator locator = new PortPositionLocator(getHostFigure(), PositionConstants.NONE);
-		final Rectangle preferredBounds = locator.getPreferredLocation(new Rectangle(requestedLocation, new Dimension(20, 20)));
-		Rectangle retainedBounds = preferredBounds.getCopy();
-
-		// find the current side of the wanted position
-		final Rectangle parentBounds = getHostFigure().getBounds().getCopy();
-		// break all!!! getHostFigure().translateToAbsolute(parentBounds);
-		locator.setConstraint(preferredBounds.getCopy().translate(parentBounds.getLocation().getNegated()));
-		int currentSide = locator.getCurrentSideOfParent();
-		if (request.isSnapToEnabled() && currentSide != PositionConstants.NORTH_EAST && currentSide != PositionConstants.NORTH_WEST && currentSide != PositionConstants.SOUTH_EAST && currentSide != PositionConstants.SOUTH_WEST) { // request for snap port at the
-																																																										// creation
-			// we find the best location with snap
-			Point wantedPoint = preferredBounds.getLocation();
-			getHostFigure().translateToAbsolute(wantedPoint);
-			Rectangle portBounds = new Rectangle(wantedPoint, new Dimension(20, 20));
-			NodeSnapHelper helper = new NodeSnapHelper((SnapToHelper) getHost().getAdapter(SnapToHelper.class), portBounds, false, false, true);
-			final ChangeBoundsRequest tmpRequest = new ChangeBoundsRequest("move"); //$NON-NLS-1$
-			tmpRequest.setEditParts(Collections.emptyList());
-			tmpRequest.setSnapToEnabled(true);
-			tmpRequest.setLocation(portBounds.getLocation());
-			helper.snapPoint(tmpRequest);
-			preferredBounds.translate(tmpRequest.getMoveDelta());
-
-			switch (currentSide) {
-			case PositionConstants.NORTH:
-			case PositionConstants.SOUTH:
-				preferredBounds.y = retainedBounds.y;
-				break;
-			case PositionConstants.EAST:
-			case PositionConstants.WEST:
-				preferredBounds.x = retainedBounds.x;
-				break;
-			default:
-				break;
-			}
-		}
-		// Convert the calculated preferred bounds as relative to parent location
-		Rectangle creationBounds = preferredBounds.getTranslated(parentLoc.getNegated());
-		setBoundsCommand = new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, descriptor, creationBounds);
-		return setBoundsCommand;
-	}
-
-	/**
-	 * Convenience method to return the host's Figure.
-	 *
-	 * @return The host GraphicalEditPart's Figure
-	 */
-	private IFigure getHostFigure() {
-		return ((GraphicalEditPart) getHost()).getFigure();
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/AssociationLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/AssociationLinkViewFactory.java
deleted file mode 100644
index 8cedb0f8335..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/AssociationLinkViewFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.AssociationViewUtils;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * View factory for Association.
- */
-public class AssociationLinkViewFactory extends ConnectorViewFactory {
-
-	/**
-	 * <pre>
-	 * {@inheritDoc}
-	 *
-	 * Add two EObjectValueStyle in order to store the Properties that are associated with
-	 * the Graphical ends.
-	 * </pre>
-	 */
-	@Override
-	protected List createStyles(View view) {
-
-		EObjectValueStyle sourceStyle = NotationFactory.eINSTANCE.createEObjectValueStyle();
-		sourceStyle.setName(AssociationViewUtils.SEMANTIC_SOURCE_END);
-
-		EObjectValueStyle targetStyle = NotationFactory.eINSTANCE.createEObjectValueStyle();
-		targetStyle.setName(AssociationViewUtils.SEMANTIC_TARGET_END);
-
-		view.getStyles().add(sourceStyle);
-		view.getStyles().add(targetStyle);
-
-		return super.createStyles(view);
-	}
-
-	/**
-	 * <pre>
-	 * {@inheritDoc}
-	 *
-	 * Store {@link Association} semantic ends (Property) in dedicated styles.
-	 * </pre>
-	 */
-	@Override
-	public View createView(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Edge view = (Edge) super.createView(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-
-		if ((view != null) && (view.getElement() != null) && (view.getElement() instanceof Association)) {
-			Association association = (Association) view.getElement();
-
-			assert (association.getMemberEnds().size() == 2);
-
-			Property propertySource = association.getMemberEnds().get(0);
-			Property propertyTarget = association.getMemberEnds().get(1);
-
-			AssociationViewUtils.setSourceSemanticEnd(view, propertySource);
-			AssociationViewUtils.setTargetSemanticEnd(view, propertyTarget);
-		}
-
-		return view;
-	}
-
-	/**
-	 * Creates Association view and add Label nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_ROLE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_SOURCE_MULTIPLICITY_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_ROLE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_ASSOCIATION_TARGET_MULTIPLICITY_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/ClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/ClassifierViewFactory.java
deleted file mode 100644
index f52c3a73ce5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/factory/ClassifierViewFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * View factory for UML Classifier.
- *
- * FIXME : NestedClassifier compartment is not yet supported.
- */
-public class ClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates Classifier view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-
-		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
deleted file mode 100644
index dd9cf5719ed..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/ConnectorEdgeFigure.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-
-/**
- * Figure for UML {@link Connector} Edges.
- */
-public class ConnectorEdgeFigure extends NamedElementEdgeFigure {
-
-	/** The multiplicity source label. */
-	private WrappingLabel fSourceMultiplicityLabel;
-
-	/** The multiplicity target label. */
-	private WrappingLabel fTargetMultiplicityLabel;
-
-	/**
-	 * Instantiates a new association figure.
-	 */
-	public ConnectorEdgeFigure() {
-		super();
-		createContents();
-	}
-
-	/**
-	 * Creates the contents.
-	 */
-	@Override
-	protected void createContents() {
-		super.createContents();
-
-		fSourceMultiplicityLabel = new PapyrusWrappingLabel();
-		fSourceMultiplicityLabel.setText("");
-
-		this.add(fSourceMultiplicityLabel);
-
-		fTargetMultiplicityLabel = new PapyrusWrappingLabel();
-		fTargetMultiplicityLabel.setText("");
-
-		this.add(fTargetMultiplicityLabel);
-
-	}
-
-	/**
-	 * Gets the applied stereotype association label.
-	 *
-	 * @return the applied stereotype association label
-	 */
-	@Override
-	public WrappingLabel getAppliedStereotypeLabel() {
-		return appliedStereotypeLabel;
-	}
-
-	/**
-	 * Gets the multiplicity source label.
-	 *
-	 * @return the multiplicity source label
-	 */
-	public WrappingLabel getSourceMultiplicityLabel() {
-		return fSourceMultiplicityLabel;
-	}
-
-	/**
-	 * Gets the multiplicity target label.
-	 *
-	 * @return the multiplicity target label
-	 */
-	public WrappingLabel getTargetMultiplicityLabel() {
-		return fTargetMultiplicityLabel;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/EdgeDecorationType.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/EdgeDecorationType.java
deleted file mode 100644
index 7a644b7cf30..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/EdgeDecorationType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import org.eclipse.gmf.runtime.notation.ArrowType;
-
-/**
- * <pre>
- * The class provides a list of predefined ids to create edge decorations.
- *
- * Also see : org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLinkEditPart#getArrowDecoration().
- * </pre>
- */
-public final class EdgeDecorationType {
-
-	public static final int NONE = ArrowType.NONE; // 0
-
-	public static final int OPEN_ARROW = ArrowType.OPEN_ARROW; // 1
-
-	public static final int SOLID_ARROW_FILLED = ArrowType.SOLID_ARROW; // 2
-
-	public static final int SOLID_ARROW_EMPTY = 3;
-
-	public static final int SOLID_DIAMOND_FILLED = 4;
-
-	public static final int SOLID_DIAMOND_EMPTY = 5;
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/GeneralizationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/GeneralizationFigure.java
deleted file mode 100644
index 51a89d59f97..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/GeneralizationFigure.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;
-
-/**
- * Figure for UML Generalization Edges.
- */
-public class GeneralizationFigure extends UMLEdgeFigure {
-
-	public GeneralizationFigure() {
-		super();
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceRealizationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceRealizationFigure.java
deleted file mode 100644
index 2511b00e612..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceRealizationFigure.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-/**
- * Figure for UML InterfaceRealization Edges.
- */
-public class InterfaceRealizationFigure extends NamedElementEdgeFigure {
-
-	public InterfaceRealizationFigure() {
-		super();
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
deleted file mode 100644
index 889906a6b2d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/figure/NamedElementEdgeFigure.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-
-/**
- * <pre>
- * This edge figure support stereotype application and name labels,
- * and does not make any assumption on style, decorations, and width.
- * These properties are managed by the edit part.
- *
- * This figure also provides its own custom dash pattern that can be use calling
- * setLineType(Graphics.LINE_CUSTOM);
- * </pre>
- */
-public class NamedElementEdgeFigure extends UMLEdgeFigure {
-
-	private WrappingLabel nameLabel;
-
-	/** Dashes used to paint line. */
-	private final int[] dashes = new int[10];
-
-	public NamedElementEdgeFigure() {
-		super();
-
-		// set dashes
-		for (int i = 0; i < 10; i++) {
-			dashes[i] = 5;
-		}
-		setLineDash(dashes);
-
-		createContents();
-	}
-
-	public WrappingLabel getNameLabel() {
-		return nameLabel;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void createContents() {
-		super.createContents();
-		nameLabel = new PapyrusWrappingLabel();
-		nameLabel.setText("");
-
-		this.add(nameLabel);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
deleted file mode 100644
index 9cb1c33b8fd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/AssociationEndLabelParser.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.ValueSpecification;
-import org.eclipse.uml2.uml.VisibilityKind;
-
-/**
- * Semantic Parser for {@link Property} used as {@link Association} end.
- */
-public class AssociationEndLabelParser extends PropertyLabelParser {
-
-	/** The String format for displaying a {@link Property} label with modifiers */
-	protected static final String ALT_MODIFIER_FORMAT = "{%s}%s";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Property)) {
-
-			Property property = (Property) eObject;
-
-			// manage visibility
-			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
-				String visibility;
-				switch (property.getVisibility().getValue()) {
-				case VisibilityKind.PACKAGE:
-					visibility = "~";
-					break;
-				case VisibilityKind.PUBLIC:
-					visibility = "+";
-					break;
-				case VisibilityKind.PROTECTED:
-					visibility = "#";
-					break;
-				case VisibilityKind.PRIVATE:
-					visibility = "-";
-					break;
-				default:
-					visibility = "+";
-					break;
-				}
-				result = String.format(VISIBILITY_FORMAT, visibility, result);
-			}
-
-			// manage derived modifier
-			if (maskValues.contains(ICustomAppearance.DISP_DERIVE) && property.isDerived()) {
-				result = String.format(DERIVED_FORMAT, result);
-			}
-
-			// manage name
-			if (maskValues.contains(ICustomAppearance.DISP_NAME) && property.isSetName()) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(property);
-
-				// If property is owned by Association (non navigable) only show the name when explicitly asked.
-
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_NON_NAVIGABLE_ROLE) || !((property.getOwningAssociation() != null) && (property.getOwningAssociation().getOwnedEnds().contains(property)))) {
-
-					result = String.format(NAME_FORMAT, result, name);
-				}
-			}
-
-			// manage type
-			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
-				String type = "<Undefined>";
-				if (property.getType() != null) {
-					type = UMLLabelInternationalization.getInstance().getLabel(property.getType());
-				}
-
-				// If type is undefined only show "<Undefined>" when explicitly asked.
-
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {
-
-					result = String.format(TYPE_FORMAT, result, type);
-				}
-			}
-
-			// manage multiplicity
-			if (maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY)) {
-
-				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(property, maskValues);
-				if (multiplicity != null && !multiplicity.isEmpty()) {
-					result += " " + multiplicity;
-				}
-			}
-
-			// manage default value
-			if (maskValues.contains(ICustomAppearance.DISP_DEFAULT_VALUE) && property.getDefaultValue() != null) {
-				ValueSpecification valueSpecification = property.getDefaultValue();
-				result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification, true));
-			}
-
-			// manage modifier
-			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
-				StringBuffer sb = new StringBuffer();
-				if (property.isReadOnly()) {
-					sb.append(sb.length() == 0 ? "readOnly" : ", readOnly");
-				}
-				if (property.isOrdered()) {
-					sb.append(sb.length() == 0 ? "ordered" : ", ordered");
-				}
-				if (property.isUnique()) {
-					sb.append(sb.length() == 0 ? "unique" : ", unique");
-				}
-				if (property.isDerivedUnion()) {
-					sb.append(sb.length() == 0 ? "union" : ", union");
-				}
-				EList<Property> redefinedProperties = property.getRedefinedProperties();
-				if (redefinedProperties != null && !redefinedProperties.isEmpty()) {
-					for (Property p : redefinedProperties) {
-						sb.append(sb.length() == 0 ? UMLLabelInternationalization.getInstance().getLabel(p) : ", redefines " + UMLLabelInternationalization.getInstance().getLabel(p));
-					}
-				}
-				if (sb.length() != 0) {
-					result = String.format(ALT_MODIFIER_FORMAT, sb.toString(), result);
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		return super.getMasks();
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		View view = (View) element.getAdapter(View.class);
-		if (view == null) {
-			return super.getDefaultValue(element);
-		}
-
-		if (view.getType() != null && view.getType().contains("multiplicity")) {
-			return Arrays.asList(ICustomAppearance.DISP_MULTIPLICITY, ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY);
-		} else if (view.getType() != null && view.getType().contains("role")) {
-			return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_VISIBILITY, ICustomAppearance.DISP_DERIVE);
-		}
-
-		return super.getDefaultValue(element);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConnectorLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConnectorLabelParser.java
deleted file mode 100644
index dba310651f9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConnectorLabelParser.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Semantic Parser for {@link Connector}
- */
-public class ConnectorLabelParser extends NamedElementLabelParser {
-
-	/** The String format for displaying a {@link Connector} label with its name */
-	protected static final String NAME_FORMAT = "%s";
-
-	/** The String format for displaying a {@link Connector} label with its type */
-	protected static final String TYPE_FORMAT = "%s: %s";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Connector)) {
-
-			Connector connector = (Connector) eObject;
-
-			// manage name
-			if (maskValues.contains(ICustomAppearance.DISP_NAME) && (connector.isSetName())) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(connector);
-				result = String.format(NAME_FORMAT, name);
-			}
-
-			// manage type
-			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
-				String type = "<Undefined>";
-				if (connector.getType() != null) {
-					type = UMLLabelInternationalization.getInstance().getLabel(connector.getType());
-				}
-
-				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || !"<Undefined>".equals(type)) {
-					result = String.format(TYPE_FORMAT, result, type);
-				}
-			}
-
-		}
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof Connector)) {
-			Connector semElement = (Connector) element;
-
-			semanticElementsBeingParsed.add(semElement);
-			if (semElement.getType() != null) {
-				semanticElementsBeingParsed.add(semElement.getType());
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ICustomAppearance.DISP_TYPE, "Type");
-		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
deleted file mode 100644
index 72ad2e82762..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
-import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Semantic Parser for {@link Constraint}.
- */
-public class ConstraintLabelParser extends NamedElementLabelParser {
-
-	/** The String format for displaying a Property label with derived modifier */
-	protected static final String NAME_FORMAT = "%s";
-
-	/** The String format for displaying a Property with visibility */
-	protected static final String SPECIFICATION_FORMAT = "%s{%s}";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String editString = "";
-
-		EObject eObject = EMFHelper.getEObject(element);
-		if ((eObject != null) && (eObject instanceof Constraint)) {
-			Constraint semElement = (Constraint) eObject;
-
-			// edit name
-			if ((maskValues.contains(ICustomAppearance.DISP_NAME))) {
-				if (semElement.isSetName()) {
-					editString = UMLLabelInternationalization.getInstance().getLabel(semElement);
-				}
-
-				// (try to) edit constraint specification
-			} else if ((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
-				if (semElement.getSpecification() != null) {
-					editString = ValueSpecificationUtil.getSpecificationValue(semElement.getSpecification());
-					if (editString == null) {
-						editString = "";
-					}
-				}
-			}
-		}
-		return editString;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Constraint)) {
-
-			Constraint semElement = (Constraint) eObject;
-
-			// manage name
-			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (semElement.isSetName())) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(semElement);
-				result = String.format(NAME_FORMAT, name);
-			}
-
-			// manage specification
-			if ((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
-				String spec = "<Undefined>";
-				if (semElement.getSpecification() != null) {
-					spec = ValueSpecificationUtil.getSpecificationValue(semElement.getSpecification(), true);
-					if (spec == null || "".equals(spec)) {
-						spec = "<Undefined>";
-					}
-				}
-				result = String.format(SPECIFICATION_FORMAT, result, spec);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		ICommand command = UnexecutableCommand.INSTANCE;
-		SetRequest updateRequest = null;
-
-		Constraint constraint = (Constraint) EMFHelper.getEObject(element);
-		if (constraint == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// prepare set name request
-		if ((maskValues.contains(ICustomAppearance.DISP_NAME))) {
-			if(InternationalizationPreferencesUtils.getInternationalizationPreference(constraint) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML(constraint)){
-				final ModelSet modelSet = (ModelSet)constraint.eResource().getResourceSet();
-				command = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), constraint, newString, null));
-			}else{
-				updateRequest = new SetRequest(constraint, UMLPackage.eINSTANCE.getNamedElement_Name(), newString);
-				updateRequest.setLabel("Update Constraint Label");
-			}
-
-			// prepare set specification request
-		} else if ((maskValues.contains(ILabelPreferenceConstants.DISP_SPECIFICATION))) {
-			ValueSpecification spec = constraint.getSpecification();
-			if (spec == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-
-			ValueSpecification specCopy = EcoreUtil.copy(spec);
-			ValueSpecificationUtil.restoreSpecificationValue(specCopy, newString);
-
-			updateRequest = new SetRequest(constraint, UMLPackage.eINSTANCE.getConstraint_Specification(), specCopy);
-			updateRequest.setLabel("Update Constraint Label");
-		}
-
-		try {
-			if (updateRequest != null) {
-				IClientContext context = TypeContext.getContext(constraint);
-				command = ElementEditServiceUtils.getEditServiceProvider(context).getEditService(constraint).getEditCommand(updateRequest);
-			}
-
-		} catch (ServiceException e) {
-			Activator.log.error(e);
-		}
-
-
-		return command;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getValueSpecification__BooleanValue().equals(feature) || UMLPackage.eINSTANCE.getValueSpecification__IntegerValue().equals(feature) || UMLPackage.eINSTANCE.getValueSpecification__StringValue().equals(feature)
-						|| UMLPackage.eINSTANCE.getValueSpecification__UnlimitedValue().equals(feature) || UMLPackage.eINSTANCE.getOpaqueExpression_Body().equals(feature) || UMLPackage.eINSTANCE.getOpaqueExpression_Language().equals(feature)
-						|| super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof Constraint)) {
-			Constraint semElement = (Constraint) element;
-
-			semanticElementsBeingParsed.add(semElement);
-			if (semElement.getSpecification() != null) {
-				semanticElementsBeingParsed.add(semElement.getSpecification());
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>(2);
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_SPECIFICATION, "Specification");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ILabelPreferenceConstants.DISP_SPECIFICATION);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/DefaultParserHintAdapter.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/DefaultParserHintAdapter.java
deleted file mode 100644
index 1bfb39d67da..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/DefaultParserHintAdapter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-public class DefaultParserHintAdapter extends ParserHintAdapter {
-
-	private Diagram diagram = null;
-
-	/** Constructor */
-	public DefaultParserHintAdapter(Diagram diagram, EObject element, String parserHint) {
-		super(element, parserHint);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public Object getAdapter(Class adapter) {
-
-		if (adapter.equals(Diagram.class)) {
-			return diagram;
-		}
-
-		return super.getAdapter(adapter);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
deleted file mode 100644
index 1f0d3ceb89e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/MultiplicityElementLabelParser.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.MaskLabelHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.MultiplicityElement;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Semantic Parser for {@link MultiplicityElement}
- */
-public class MultiplicityElementLabelParser implements IMaskManagedSemanticParser {
-
-	/** The String format for displaying a {@link Property} label with multiplicity */
-	protected static final String MULTIPLICITY_FORMAT = "[%s..%s]";
-
-	/** The String format for displaying a {@link Property} label with multiplicity */
-	protected static final String MULTIPLICITY_FORMAT_ALT = "[%s]";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditString(IAdaptable element, int flags) {
-		return getPrintString(element, flags);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
-		return ParserEditStatus.UNEDITABLE_STATUS;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof MultiplicityElement)) {
-
-			MultiplicityElement multElt = (MultiplicityElement) eObject;
-
-			// manage multiplicity
-			if ((maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY))) {
-
-				// TODO : add a case for default with multiplicity not set.
-				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(multElt, maskValues);
-				if (multiplicity != null && !multiplicity.isEmpty()) {
-					result += " " + multiplicity;
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return EcorePackage.eINSTANCE.getEAnnotation_Details().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof MultiplicityElement)) {
-			MultiplicityElement semElement = (MultiplicityElement) element;
-
-			semanticElementsBeingParsed.add(semElement);
-			if (semElement.getLowerValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getLowerValue());
-			}
-			if (semElement.getUpperValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getUpperValue());
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
-		return true;
-	}
-
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
-		return masks;
-	}
-
-	protected Collection<String> getMaskValues(IAdaptable element) {
-		View view = (View) element.getAdapter(View.class);
-		if (view == null) {
-			return getDefaultValue(element);
-		}
-
-		Collection<String> result = MaskLabelHelper.getMaskValues(view);
-		if (result == null) {
-			result = getDefaultValue(element);
-		}
-		return result;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_MULTIPLICITY);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
deleted file mode 100644
index da7801a0797..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.MaskLabelHelper;
-import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
-import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Semantic Parser for {@link NamedElement} name.
- */
-public class NamedElementLabelParser implements IMaskManagedSemanticParser {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditString(IAdaptable element, int flags) {
-		String editString = "";
-
-		EObject eObject = EMFHelper.getEObject(element);
-		if ((eObject != null) && (eObject instanceof NamedElement)) {
-			NamedElement semElement = (NamedElement) eObject;
-			if (semElement.isSetName()) {
-				editString = UMLLabelInternationalization.getInstance().getLabel(semElement);
-			}
-		}
-		return editString;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
-		return ParserEditStatus.EDITABLE_STATUS;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
-
-		ICommand command = UnexecutableCommand.INSTANCE;
-
-		EObject objectToEdit = EMFHelper.getEObject(element);
-		if (objectToEdit == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		try {
-			if(InternationalizationPreferencesUtils.getInternationalizationPreference(objectToEdit) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement)objectToEdit)){
-				final ModelSet modelSet = (ModelSet)objectToEdit.eResource().getResourceSet();
-				command = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), (NamedElement)objectToEdit, newString, null));
-			}else{
-				IClientContext context = TypeContext.getContext(objectToEdit);
-				command = ElementEditServiceUtils.getEditServiceProvider(context).getEditService(objectToEdit).getEditCommand(new SetRequest(objectToEdit, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));
-			}
-		} catch (ServiceException e) {
-			Activator.log.error(e);
-		}
-
-		return command;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if (eObject instanceof NamedElement) {
-			return UMLLabelInternationalization.getInstance().getLabel((NamedElement) eObject);
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return EcorePackage.eINSTANCE.getEAnnotation_Details().equals(feature) || UMLPackage.eINSTANCE.getNamedElement_Name().equals(feature);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-		semanticElementsBeingParsed.add(element);
-
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		return Collections.emptyMap();
-	}
-
-	protected Collection<String> getMaskValues(IAdaptable element) {
-		View view = (View) element.getAdapter(View.class);
-		if (view == null) {
-			return getDefaultValue(element);
-		}
-
-		Collection<String> result = MaskLabelHelper.getMaskValues(view);
-		if (result == null) {
-			result = getDefaultValue(element);
-		}
-		return result;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Collections.emptySet();
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/OperationLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/OperationLabelParser.java
deleted file mode 100644
index 81ef14ccf77..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/OperationLabelParser.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.tools.util.StringHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.uml.diagram.common.utils.ParameterLabelUtil;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.ParameterDirectionKind;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.VisibilityKind;
-
-/**
- * Semantic Parser for {@link Operation}
- */
-public class OperationLabelParser extends NamedElementLabelParser {
-
-	/** Parameter parser */
-	protected IMaskManagedSemanticParser parameterParser = new ParameterLabelParser();
-
-	/** The String format for displaying {@link Operation} label with visibility */
-	protected static final String VISIBILITY_FORMAT = "%s ";
-
-	/** The String format for displaying a {@link Operation} label with its name */
-	protected static final String NAME_FORMAT = "%s%s(%s)";
-
-	/** The String format for displaying a {@link Operation} label with its type */
-	protected static final String TYPE_FORMAT = "%s: %s";
-
-	/** The String format for displaying a {@link Operation} label with modifiers */
-	protected static final String MODIFIER_FORMAT = "%s{%s}";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Operation)) {
-
-			Operation operation = (Operation) eObject;
-
-			// manage visibility
-			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
-				String visibility;
-				switch (operation.getVisibility().getValue()) {
-				case VisibilityKind.PACKAGE:
-					visibility = "~";
-					break;
-				case VisibilityKind.PUBLIC:
-					visibility = "+";
-					break;
-				case VisibilityKind.PROTECTED:
-					visibility = "#";
-					break;
-				case VisibilityKind.PRIVATE:
-					visibility = "-";
-					break;
-				default:
-					visibility = "+";
-					break;
-				}
-				result = String.format(VISIBILITY_FORMAT, visibility);
-			}
-
-			// manage name and parameters
-			if ((maskValues.contains(ICustomAppearance.DISP_NAME)) && (operation.isSetName())) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(operation);
-
-				StringBuffer params = new StringBuffer();
-				for (Parameter parameter : operation.getOwnedParameters()) {
-					if (parameter.getDirection() != ParameterDirectionKind.RETURN_LITERAL) {
-						String currentParamLabel = ParameterLabelUtil.getPrintString(parameter, extractParameterMaskValues(maskValues));
-						params.append(params.length() == 0 ? currentParamLabel : ", " + currentParamLabel);
-					}
-				}
-
-				result = String.format(NAME_FORMAT, result, name, params);
-			}
-
-			// manage type
-			if ((maskValues.contains(ICustomAppearance.DISP_TYPE))) {
-				String type = "<Undefined>";
-				if (operation.getType() != null) {
-					type = UMLLabelInternationalization.getInstance().getLabel(operation.getType());
-				}
-
-				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if ((maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE)) || (!"<Undefined>".equals(type))) {
-					result = String.format(TYPE_FORMAT, result, type);
-				}
-			}
-
-			// manage modifier
-			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
-				StringBuffer sb = new StringBuffer();
-				if (operation.isAbstract()) {
-					sb.append(sb.length() == 0 ? "abstract" : ", abstract");
-				}
-				if (operation.isStatic()) {
-					sb.append(sb.length() == 0 ? "static" : ", static");
-				}
-				if (operation.isUnique()) {
-					sb.append(sb.length() == 0 ? "unique" : ", unique");
-				}
-				if (operation.isQuery()) {
-					sb.append(sb.length() == 0 ? "query" : ", query");
-				}
-				if (operation.isLeaf()) {
-					sb.append(sb.length() == 0 ? "leaf" : ", leaf");
-				}
-
-				if (sb.length() != 0) {
-					result = String.format(MODIFIER_FORMAT, result, sb.toString());
-				}
-			}
-		}
-		return result;
-	}
-
-	private static Collection<String> extractParameterMaskValues(Collection<String> operationMaskValues) {
-		Set<String> result = new HashSet<String>();
-
-		for (String maskValue : operationMaskValues) {
-			if (maskValue.startsWith(ICustomAppearance.PARAMETERS_PREFIX)) {
-				String newValue = StringHelper.firstToLower(maskValue.replace(ICustomAppearance.PARAMETERS_PREFIX, ""));
-				result.add(newValue);
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getNamedElement_Visibility().equals(feature) || UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getBehavioralFeature_IsAbstract().equals(feature)
-						|| UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature) || UMLPackage.eINSTANCE.getOperation_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getOperation_IsQuery().equals(feature)
-						|| UMLPackage.eINSTANCE.getRedefinableElement_IsLeaf().equals(feature) || parameterParser.isAffectingEvent(event, flags) || super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof Operation)) {
-			Operation semElement = (Operation) element;
-
-			semanticElementsBeingParsed.add(semElement);
-			if (semElement.getType() != null) {
-				semanticElementsBeingParsed.add(semElement.getType());
-			}
-			for (Parameter parameter : semElement.getOwnedParameters()) {
-				semanticElementsBeingParsed.addAll(parameterParser.getSemanticElementsBeingParsed(parameter));
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>(5);
-		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ICustomAppearance.DISP_TYPE, "Type");
-		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
-
-		masks.put(ICustomAppearance.DISP_PARAMETER_DIRECTION, "Parameter direction");
-		masks.put(ICustomAppearance.DISP_PARAMETER_NAME, "Parameter name");
-		masks.put(ICustomAppearance.DISP_PARAMETER_TYPE, "Parameter type");
-		masks.put(ICustomAppearance.DISP_PARAMETER_MULTIPLICITY, "Parameter multiplicity");
-		masks.put(ICustomAppearance.DISP_PARAMETER_DEFAULT, "Parameter default value");
-		masks.put(ICustomAppearance.DISP_PARAMETER_MODIFIERS, "Parameter modifiers");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ICustomAppearance.DISP_PARAMETER_DIRECTION, ICustomAppearance.DISP_PARAMETER_NAME, ICustomAppearance.DISP_PARAMETER_TYPE);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java
deleted file mode 100644
index 0c37c6078ba..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ParameterLabelParser.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.uml.diagram.common.utils.ParameterLabelUtil;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Semantic Parser for {@link Parameter}
- */
-public class ParameterLabelParser extends NamedElementLabelParser {
-
-	/** The String format for displaying a {@link Parameter} with direction */
-	protected static final String DIRECTION_FORMAT = "%s %s";
-
-	/** The String format for displaying a {@link Parameter} label with its name */
-	protected static final String NAME_FORMAT = "%s%s";
-
-	/** The String format for displaying a {@link Parameter} label with its type */
-	protected static final String TYPE_FORMAT = "%s: %s";
-
-	/** The String format for displaying a {@link Parameter} label with its multiplicity */
-	protected static final String MULTIPLICITY_FORMAT = "%s [%s..%s]";
-
-	/** The String format for displaying a {@link Parameter} label with its default value */
-	protected static final String DEFAULT_VALUE_FORMAT = "%s= %s";
-
-	/** The String format for displaying a {@link Parameter} label with its modifiers */
-	protected static final String MODIFIER_FORMAT = "%s{%s}";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if (eObject != null && eObject instanceof Parameter) {
-			Parameter parameter = (Parameter) eObject;
-			return ParameterLabelUtil.getPrintString(parameter, maskValues);
-		}
-
-		return "";
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getParameter_Direction().equals(feature) || UMLPackage.eINSTANCE.getParameter_DefaultValue().equals(feature)
-						|| UMLPackage.eINSTANCE.getParameter_IsStream().equals(feature) || UMLPackage.eINSTANCE.getParameter_IsException().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered().equals(feature)
-						|| UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature)
-						|| super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof Parameter)) {
-			Parameter semElement = (Parameter) element;
-
-			semanticElementsBeingParsed.add(semElement);
-			if (semElement.getType() != null) {
-				semanticElementsBeingParsed.add(semElement.getType());
-			}
-			if (semElement.getDefaultValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getDefaultValue());
-			}
-			if (semElement.getLowerValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getLowerValue());
-			}
-			if (semElement.getUpperValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getUpperValue());
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_DIRECTION, "Direction");
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ICustomAppearance.DISP_TYPE, "Type");
-		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
-		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default value");
-		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
deleted file mode 100644
index 89ea3a8e1d7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/PropertyLabelParser.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.ValueSpecification;
-import org.eclipse.uml2.uml.VisibilityKind;
-
-/**
- * Semantic Parser for {@link Property}
- */
-public class PropertyLabelParser extends NamedElementLabelParser {
-
-	/** The String format for displaying a {@link Property} with visibility */
-	protected static final String VISIBILITY_FORMAT = "%s %s";
-
-	/** The String format for displaying a {@link Property} label with derived modifier */
-	protected static final String DERIVED_FORMAT = "%s/";
-
-	/** The String format for displaying a {@link Property} label with its name */
-	protected static final String NAME_FORMAT = "%s%s";
-
-	/** The String format for displaying a {@link Property} label with its type */
-	protected static final String TYPE_FORMAT = "%s: %s";
-
-	/** The String format for displaying a {@link Property} label with multiplicity */
-	protected static final String MULTIPLICITY_FORMAT = "%s [%s..%s]";
-
-	/** The String format for displaying a {@link Property} label with multiplicity */
-	protected static final String MULTIPLICITY_FORMAT_ALT = "%s [%s]";
-
-	/** The String format for displaying a {@link Property} label with default value */
-	protected static final String DEFAULT_VALUE_FORMAT = "%s= %s";
-
-	/** The String format for displaying a {@link Property} label with modifiers */
-	protected static final String MODIFIER_FORMAT = "%s{%s}";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Property)) {
-
-			Property property = (Property) eObject;
-
-			// manage visibility
-			if (maskValues.contains(ICustomAppearance.DISP_VISIBILITY)) {
-				String visibility;
-				switch (property.getVisibility().getValue()) {
-				case VisibilityKind.PACKAGE:
-					visibility = "~";
-					break;
-				case VisibilityKind.PUBLIC:
-					visibility = "+";
-					break;
-				case VisibilityKind.PROTECTED:
-					visibility = "#";
-					break;
-				case VisibilityKind.PRIVATE:
-					visibility = "-";
-					break;
-				default:
-					visibility = "+";
-					break;
-				}
-				result = String.format(VISIBILITY_FORMAT, visibility, result);
-			}
-
-			// manage derived modifier
-			if (maskValues.contains(ICustomAppearance.DISP_DERIVE) && (property.isDerived())) {
-				result = String.format(DERIVED_FORMAT, result);
-			}
-
-			// manage name
-			if (maskValues.contains(ICustomAppearance.DISP_NAME) && (property.isSetName())) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(property);
-				result = String.format(NAME_FORMAT, result, name);
-			}
-
-			// manage type
-			if (maskValues.contains(ICustomAppearance.DISP_TYPE)) {
-				String type = "<Undefined>";
-				if (property.getType() != null) {
-					type = UMLLabelInternationalization.getInstance().getLabel(property.getType());
-				}
-
-				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if (maskValues.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {
-					result = String.format(TYPE_FORMAT, result, type);
-				}
-			}
-
-			// manage multiplicity
-			if (maskValues.contains(ICustomAppearance.DISP_MULTIPLICITY)) {
-
-				// TODO : add a case for default with multiplicity not set.
-				String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(property, maskValues);
-				if (multiplicity != null && !multiplicity.isEmpty()) {
-					result += " " + multiplicity;
-				}
-			}
-
-			// manage default value
-			if (maskValues.contains(ICustomAppearance.DISP_DEFAULT_VALUE) && property.getDefaultValue() != null) {
-				ValueSpecification valueSpecification = property.getDefaultValue();
-				result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification, true));
-			}
-
-			// manage modifier
-			if (maskValues.contains(ICustomAppearance.DISP_MODIFIERS)) {
-				StringBuffer sb = new StringBuffer();
-				if (property.isReadOnly()) {
-					sb.append(sb.length() == 0 ? "readOnly" : ", readOnly");
-				}
-				if (property.isOrdered()) {
-					sb.append(sb.length() == 0 ? "ordered" : ", ordered");
-				}
-				if (property.isUnique()) {
-					sb.append(sb.length() == 0 ? "unique" : ", unique");
-				}
-				if (property.isDerivedUnion()) {
-					sb.append(sb.length() == 0 ? "union" : ", union");
-				}
-				EList<Property> redefinedProperties = property.getRedefinedProperties();
-				if (redefinedProperties != null && !redefinedProperties.isEmpty()) {
-					for (Property p : redefinedProperties) {
-						sb.append(sb.length() == 0 ? UMLLabelInternationalization.getInstance().getLabel(p) : ", redefines " + UMLLabelInternationalization.getInstance().getLabel(p));
-					}
-				}
-				if (sb.length() != 0) {
-					result = String.format(MODIFIER_FORMAT, result, sb.toString());
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-
-			if (feature instanceof EStructuralFeature) { // UMLPackage.eINSTANCE.getLiteralString_Value().equals(feature) ||
-				return UMLPackage.eINSTANCE.getTypedElement_Type().equals(feature) || UMLPackage.eINSTANCE.getInstanceValue_Instance().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_IsOrdered().equals(feature)
-						|| UMLPackage.eINSTANCE.getMultiplicityElement_IsUnique().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue().equals(feature) || UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue().equals(feature)
-						|| UMLPackage.eINSTANCE.getStructuralFeature_IsReadOnly().equals(feature) || UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature) || UMLPackage.eINSTANCE.getProperty_IsDerived().equals(feature)
-						|| UMLPackage.eINSTANCE.getProperty_IsDerivedUnion().equals(feature) || UMLPackage.eINSTANCE.getProperty_RedefinedProperty().equals(feature) || super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof Property)) {
-			Property semElement = (Property) element;
-
-			semanticElementsBeingParsed.add(semElement);
-			if (semElement.getType() != null) {
-				semanticElementsBeingParsed.add(semElement.getType());
-			}
-			if (semElement.getLowerValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getLowerValue());
-			}
-			if (semElement.getUpperValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getUpperValue());
-			}
-			if (semElement.getDefaultValue() != null) {
-				semanticElementsBeingParsed.add(semElement.getDefaultValue());
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_VISIBILITY, "Visibility");
-		masks.put(ICustomAppearance.DISP_DERIVE, "Is Derived");
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ICustomAppearance.DISP_TYPE, "Type");
-		masks.put(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE, "Show <Undefined> type");
-		masks.put(ICustomAppearance.DISP_MULTIPLICITY, "Multiplicity");
-		masks.put(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY, "Show default multiplicity");
-		masks.put(ICustomAppearance.DISP_DEFAULT_VALUE, "Default Value");
-		masks.put(ICustomAppearance.DISP_MODIFIERS, "Modifiers");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE, ICustomAppearance.DISP_MULTIPLICITY, ILabelPreferenceConstants.DISP_UNDEFINED_TYPE);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ReceptionLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ReceptionLabelParser.java
deleted file mode 100644
index a5fbfaef55c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ReceptionLabelParser.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.uml2.uml.Reception;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Semantic Parser for {@link Reception}
- */
-public class ReceptionLabelParser extends NamedElementLabelParser implements IMaskManagedSemanticParser {
-
-	/** The String format for displaying a Property with visibility */
-	protected static final String PREFIX = "\u00ABsignal\u00BB ";
-
-	/** The String format for displaying a Property label with its name */
-	protected static final String NAME_FORMAT = "%s%s";
-
-	/** The String format for displaying a Property label with its type */
-	protected static final String TYPE_FORMAT = "%s: %s";
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-
-		Collection<String> maskValues = getMaskValues(element);
-
-		if (maskValues.isEmpty()) {
-			return MaskedLabel;
-		}
-
-		String result = PREFIX;
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if ((eObject != null) && (eObject instanceof Reception)) {
-
-			Reception reception = (Reception) eObject;
-
-			// manage name
-			if (maskValues.contains(ICustomAppearance.DISP_NAME) && reception.isSetName()) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(reception);
-				result = String.format(NAME_FORMAT, result, name);
-			}
-
-			// manage signal
-			if (maskValues.contains(ILabelPreferenceConstants.DISP_SIGNAL)) {
-				String type = "<Undefined>";
-				if (reception.getSignal() != null) {
-					type = UMLLabelInternationalization.getInstance().getLabel(reception.getSignal());
-				}
-				result = String.format(TYPE_FORMAT, result, type);
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getReception_Signal().equals(feature) || super.isAffectingEvent(event, flags);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-
-		if ((element != null) && (element instanceof Reception)) {
-			Reception semElement = (Reception) element;
-
-			semanticElementsBeingParsed.add(semElement);
-			if (semElement.getSignal() != null) {
-				semanticElementsBeingParsed.add(semElement.getSignal());
-			}
-		}
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, String> getMasks() {
-		Map<String, String> masks = new HashMap<String, String>();
-		masks.put(ICustomAppearance.DISP_NAME, "Name");
-		masks.put(ILabelPreferenceConstants.DISP_SIGNAL, "Signal");
-		return masks;
-	}
-
-	@Override
-	public Collection<String> getDefaultValue(IAdaptable element) {
-		return Arrays.asList(ICustomAppearance.DISP_NAME, ILabelPreferenceConstants.DISP_SIGNAL);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/SlotLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/SlotLabelParser.java
deleted file mode 100644
index f1b973ad083..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/SlotLabelParser.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.parser;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Semantic Parser for {@link Slot}
- */
-public class SlotLabelParser implements ISemanticParser {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditString(IAdaptable element, int flags) {
-		return getPrintString(element, flags);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
-		return ParserEditStatus.UNEDITABLE_STATUS;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-		String result = "";
-		EObject eObject = EMFHelper.getEObject(element);
-
-		if (eObject instanceof Slot) {
-			Slot slot = (Slot) eObject;
-			result = "<UNDEFINED>";
-
-			if (slot.getDefiningFeature() != null) {
-
-				// Add defining feature
-				result = slot.getDefiningFeature().getName();
-
-				// Add values
-				if (!slot.getValues().isEmpty()) {
-
-					String values = "";
-					Iterator<ValueSpecification> iter = slot.getValues().iterator();
-					while (iter.hasNext()) {
-						ValueSpecification currentSpecification = iter.next();
-
-						String currentValue = currentSpecification.stringValue();
-						if ((currentSpecification instanceof InstanceValue) && ((InstanceValue) currentSpecification).getInstance() != null) {
-							currentValue = ((InstanceValue) currentSpecification).getInstance().getName();
-						}
-
-						values = values + currentValue;
-						if (iter.hasNext()) {
-							result = result + ", ";
-						}
-					}
-
-					result = result + ": " + values;
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAffectingEvent(Object event, int flags) {
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature instanceof EStructuralFeature) {
-				return UMLPackage.eINSTANCE.getSlot_DefiningFeature().equals(feature);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<EObject> getSemanticElementsBeingParsed(EObject element) {
-		List<EObject> semanticElementsBeingParsed = new ArrayList<EObject>();
-		semanticElementsBeingParsed.add(element);
-
-		return semanticElementsBeingParsed;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean areSemanticElementsAffected(EObject listener, Object notification) {
-		return true;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/AssociationViewUtils.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/AssociationViewUtils.java
deleted file mode 100644
index a9be2ba4980..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/AssociationViewUtils.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.utils;
-
-import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * Utility class for Association graphical end - property mapping.
- */
-public class AssociationViewUtils {
-
-	/** ID for the source end - property mapping of an association */
-	public static final String SEMANTIC_SOURCE_END = "semantic_source_end";
-
-	/** ID for the target end - property mapping of an association */
-	public static final String SEMANTIC_TARGET_END = "semantic_target_end";
-
-	/**
-	 * Get the semantic end from the source of an edge representing an Association.
-	 *
-	 * @param view
-	 *            the Association view.
-	 * @return the Property corresponding to the source of the graphical end.
-	 */
-	public static Property getSourceSemanticEnd(View view) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_SOURCE_END);
-		return semanticStyle == null ? null : (Property) semanticStyle.getEObjectValue();
-	}
-
-	/**
-	 * Get the semantic end from the target of an edge representing an Association.
-	 *
-	 * @param view
-	 *            the Association view.
-	 * @return the Property corresponding to the target of the graphical end.
-	 */
-	public static Property getTargetSemanticEnd(View view) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_TARGET_END);
-		return semanticStyle == null ? null : (Property) semanticStyle.getEObjectValue();
-	}
-
-	/**
-	 * Set the semantic end for the source of an edge representing an Association.
-	 *
-	 * @param view
-	 *            the Association view.
-	 * @param end
-	 *            the Property corresponding to the source of the graphical end.
-	 */
-	public static void setSourceSemanticEnd(View view, Property end) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_SOURCE_END);
-		semanticStyle.setEObjectValue(end);
-	}
-
-	/**
-	 * Set the semantic end for the target of an edge representing an Association.
-	 *
-	 * @param view
-	 *            the Association view.
-	 * @param end
-	 *            the Property corresponding to the target of the graphical end.
-	 */
-	public static void setTargetSemanticEnd(View view, Property end) {
-		EObjectValueStyle semanticStyle = (EObjectValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getEObjectValueStyle(), SEMANTIC_TARGET_END);
-		semanticStyle.setEObjectValue(end);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
deleted file mode 100644
index edb3268fffb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/utils/ParameterLabelUtil.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.utils;
-
-import java.util.Collection;
-
-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLMultiplicityElementUtil;
-import org.eclipse.papyrus.uml.diagram.common.parser.IMaskManagedSemanticParser;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;
-import org.eclipse.papyrus.uml.tools.utils.ValueSpecificationUtil;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.ParameterDirectionKind;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-
-public class ParameterLabelUtil {
-
-	/** The String format for displaying a {@link Parameter} with direction */
-	protected static final String DIRECTION_FORMAT = "%s %s";
-
-	/** The String format for displaying a {@link Parameter} label with its name */
-	protected static final String NAME_FORMAT = "%s%s";
-
-	/** The String format for displaying a {@link Parameter} label with its type */
-	protected static final String TYPE_FORMAT = "%s: %s";
-
-	/** The String format for displaying a {@link Parameter} label with its multiplicity */
-	protected static final String MULTIPLICITY_FORMAT = "%s [%s..%s]";
-
-	/** The String format for displaying a {@link Parameter} label with its default value */
-	protected static final String DEFAULT_VALUE_FORMAT = "%s= %s";
-
-	/** The String format for displaying a {@link Parameter} label with its modifiers */
-	protected static final String MODIFIER_FORMAT = "%s{%s}";
-
-	public static String getPrintString(Parameter parameter, Collection<String> displayValue) {
-		if (displayValue.isEmpty()) {
-			return IMaskManagedSemanticParser.MaskedLabel;
-		}
-
-		String result = "";
-
-		if (parameter != null) {
-
-			// manage direction
-			if (displayValue.contains(ICustomAppearance.DISP_DIRECTION) || displayValue.contains(ICustomAppearance.DISP_PARAMETER_DIRECTION)) {
-				String direction;
-				switch (parameter.getDirection().getValue()) {
-				case ParameterDirectionKind.IN:
-					direction = "in";
-					break;
-				case ParameterDirectionKind.OUT:
-					direction = "out";
-					break;
-				case ParameterDirectionKind.INOUT:
-					direction = "inout";
-					break;
-				case ParameterDirectionKind.RETURN:
-					direction = "return";
-					break;
-				default:
-					direction = "in";
-					break;
-				}
-				result = String.format(DIRECTION_FORMAT, direction, result);
-			}
-
-			// manage name
-			if ((displayValue.contains(ICustomAppearance.DISP_NAME) || displayValue.contains(ICustomAppearance.DISP_PARAMETER_NAME)) && (parameter.isSetName())) {
-				String name = UMLLabelInternationalization.getInstance().getLabel(parameter);
-				result = String.format(NAME_FORMAT, result, name);
-			}
-
-			// manage type
-			if (displayValue.contains(ICustomAppearance.DISP_TYPE) || displayValue.contains(ICustomAppearance.DISP_PARAMETER_TYPE)) {
-				String type = "<Undefined>";
-				if (parameter.getType() != null) {
-					type = UMLLabelInternationalization.getInstance().getLabel(parameter.getType());
-				}
-
-				// If type is undefined only show "<Undefined>" when explicitly asked.
-				if (displayValue.contains(ILabelPreferenceConstants.DISP_UNDEFINED_TYPE) || (!"<Undefined>".equals(type))) {
-					result = String.format(TYPE_FORMAT, result, type);
-				}
-			}
-
-			// manage multiplicity
-			String multiplicity = SysMLMultiplicityElementUtil.formatMultiplicity(parameter, displayValue);
-			if (multiplicity != null && !multiplicity.isEmpty()) {
-				result += " " + multiplicity;
-			}
-
-			// manage default value
-			if ((displayValue.contains(ICustomAppearance.DISP_PARAMETER_DEFAULT) || displayValue.contains(ICustomAppearance.DISP_DEFAULT_VALUE)) && ((parameter.getDefaultValue() != null))) {
-				ValueSpecification valueSpecification = parameter.getDefaultValue();
-				result = String.format(DEFAULT_VALUE_FORMAT, result, ValueSpecificationUtil.getSpecificationValue(valueSpecification, true));
-			}
-
-			// manage modifier
-			if (displayValue.contains(ICustomAppearance.DISP_PARAMETER_MODIFIERS) || displayValue.contains(ICustomAppearance.DISP_MODIFIERS)) {
-				StringBuffer sb = new StringBuffer();
-				if (parameter.isOrdered()) {
-					sb.append(sb.length() == 0 ? "ordered" : ", ordered");
-				}
-				if (parameter.isUnique()) {
-					sb.append(sb.length() == 0 ? "unique" : ", unique");
-				}
-				if (parameter.isStream()) {
-					sb.append(sb.length() == 0 ? "stream" : ", stream");
-				}
-				if (parameter.isException()) {
-					sb.append(sb.length() == 0 ? "exception" : ", exception");
-				}
-				if (sb.length() != 0) {
-					result = String.format(MODIFIER_FORMAT, result, sb.toString());
-				}
-			}
-
-		}
-		return result;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockCompositeEditPart.java
deleted file mode 100644
index 03205daf866..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockCompositeEditPart.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.BlockCompositeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-
-public class BlockCompositeEditPart extends AbstractElementEditPart {
-
-	public BlockCompositeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new BlockCompositeSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new StructuredClassifierCreationEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		// Start of user code custom policies
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new org.eclipse.papyrus.uml.diagram.common.edit.policy.EncapsulatedClassifierResizableShapeEditPolicy());
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) {
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof BlockLabelNameEditPart) {
-			((BlockLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((FlowPortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		if (childEditPart instanceof StructureCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getStructureCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((StructureCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof BlockLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((FlowPortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof StructureCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getStructureCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((StructureCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof StructureCompartmentEditPart) {
-			return getPrimaryShape().getStructureCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigure());
-	}
-
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new BlockCompositeFigure();
-	}
-
-	@Override
-	public BlockCompositeFigure getPrimaryShape() {
-		return (BlockCompositeFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockConstraintCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockConstraintCompartmentEditPart.java
deleted file mode 100644
index 8e1d6e67072..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockConstraintCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-
-public class BlockConstraintCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "constraints";
-
-	public BlockConstraintCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockEditPart.java
deleted file mode 100644
index 334c8499427..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockEditPart.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.BlockFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-
-public class BlockEditPart extends AbstractElementEditPart {
-
-	public BlockEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new BlockCompositeSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new StructuredClassifierCreationEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		// Start of user code custom policies
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new org.eclipse.papyrus.uml.diagram.common.edit.policy.EncapsulatedClassifierResizableShapeEditPolicy());
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) {
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof BlockLabelNameEditPart) {
-			((BlockLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((FlowPortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		if (childEditPart instanceof BlockPropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((BlockPropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PartPropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPartPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((PartPropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ReferencePropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getReferencePropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((ReferencePropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPortCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((PortCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof FlowPortCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getFlowPortCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((FlowPortCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof BlockConstraintCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockConstraintCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((BlockConstraintCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ValuePropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getValuePropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((ValuePropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof BlockLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof FlowPortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((FlowPortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof BlockPropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((BlockPropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PartPropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPartPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((PartPropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ReferencePropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getReferencePropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((ReferencePropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPortCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((PortCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof FlowPortCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getFlowPortCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((FlowPortCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof BlockConstraintCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockConstraintCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((BlockConstraintCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ValuePropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getValuePropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((ValuePropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof BlockPropertyCompartmentEditPart) {
-			return getPrimaryShape().getBlockPropertyCompartmentFigure();
-		}
-		if (editPart instanceof PartPropertyCompartmentEditPart) {
-			return getPrimaryShape().getPartPropertyCompartmentFigure();
-		}
-		if (editPart instanceof ReferencePropertyCompartmentEditPart) {
-			return getPrimaryShape().getReferencePropertyCompartmentFigure();
-		}
-		if (editPart instanceof PortCompartmentEditPart) {
-			return getPrimaryShape().getPortCompartmentFigure();
-		}
-		if (editPart instanceof FlowPortCompartmentEditPart) {
-			return getPrimaryShape().getFlowPortCompartmentFigure();
-		}
-		if (editPart instanceof OperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		if (editPart instanceof BlockConstraintCompartmentEditPart) {
-			return getPrimaryShape().getBlockConstraintCompartmentFigure();
-		}
-		if (editPart instanceof ValuePropertyCompartmentEditPart) {
-			return getPrimaryShape().getValuePropertyCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigure());
-	}
-
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new BlockFigure();
-	}
-
-	@Override
-	public BlockFigure getPrimaryShape() {
-		return (BlockFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockLabelNameEditPart.java
deleted file mode 100644
index 83af46d0cff..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockLabelNameEditPart.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart;
-
-public class BlockLabelNameEditPart extends NamedElementNodeLabelNameEditPart {
-
-	/** Constructor */
-	public BlockLabelNameEditPart(View view) {
-		super(view);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompartmentEditPart.java
deleted file mode 100644
index 628a4f4c17f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.PropertyCompartmentSemanticEditPolicy;
-
-public class BlockPropertyCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "properties";
-
-	public BlockPropertyCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyStructureCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyStructureCompartmentEditPart.java
deleted file mode 100644
index 87d8fdde8fa..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/BlockPropertyStructureCompartmentEditPart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockPropertyStructureCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.CustomDuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractShapeCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-
-public class BlockPropertyStructureCompartmentEditPart extends AbstractShapeCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "structure";
-
-	public BlockPropertyStructureCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new BlockPropertyStructureCompartmentSemanticEditPolicy());
-		// Start of user code custom edit policies
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockEditPart.java
deleted file mode 100644
index b6d15b7806f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockEditPart.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.ConstraintBlockFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-
-public class ConstraintBlockEditPart extends AbstractElementEditPart {
-
-	public ConstraintBlockEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintBlockLabelNameEditPart) {
-			((ConstraintBlockLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ParameterCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getParameterCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((ParameterCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof BlockConstraintCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockConstraintCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((BlockConstraintCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintBlockLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ParameterCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getParameterCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((ParameterCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof BlockConstraintCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getBlockConstraintCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((BlockConstraintCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ParameterCompartmentEditPart) {
-			return getPrimaryShape().getParameterCompartmentFigure();
-		}
-		if (editPart instanceof BlockConstraintCompartmentEditPart) {
-			return getPrimaryShape().getBlockConstraintCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintBlockFigure();
-	}
-
-	@Override
-	public ConstraintBlockFigure getPrimaryShape() {
-		return (ConstraintBlockFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.LABEL_SYSML_CONSTRAINTBLOCK_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockLabelNameEditPart.java
deleted file mode 100644
index a863eb654d8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ConstraintBlockLabelNameEditPart.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart;
-
-public class ConstraintBlockLabelNameEditPart extends NamedElementNodeLabelNameEditPart {
-
-	/** Constructor */
-	public ConstraintBlockLabelNameEditPart(View view) {
-		super(view);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionEditPart.java
deleted file mode 100644
index 108ace0b471..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionEditPart.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.DimensionFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-
-public class DimensionEditPart extends AbstractElementEditPart {
-
-	public DimensionEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DimensionLabelNameEditPart) {
-			((DimensionLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DimensionLabelNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new DimensionFigure();
-	}
-
-	@Override
-	public DimensionFigure getPrimaryShape() {
-		return (DimensionFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.LABEL_SYSML_DIMENSION_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionLabelNameEditPart.java
deleted file mode 100644
index cc012285d49..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/DimensionLabelNameEditPart.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart;
-
-public class DimensionLabelNameEditPart extends NamedElementNodeLabelNameEditPart {
-
-	/** Constructor */
-	public DimensionLabelNameEditPart(View view) {
-		super(view);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortCompartmentEditPart.java
deleted file mode 100644
index 6e0c6cec59b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPortCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.FlowPortCompartmentSemanticEditPolicy;
-
-public class FlowPortCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "flow ports";
-
-	public FlowPortCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FlowPortCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyCompartmentEditPart.java
deleted file mode 100644
index b61127fa01e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowPropertyCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-
-public class FlowPropertyCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "flow properties";
-
-	public FlowPropertyCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationEditPart.java
deleted file mode 100644
index 00fb8ffa5b9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationEditPart.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.FlowSpecificationFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-
-public class FlowSpecificationEditPart extends AbstractElementEditPart {
-
-	public FlowSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FlowSpecificationLabelNameEditPart) {
-			((FlowSpecificationLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof FlowPropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getFlowPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((FlowPropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FlowSpecificationLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof FlowPropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getFlowPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((FlowPropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof FlowPropertyCompartmentEditPart) {
-			return getPrimaryShape().getFlowPropertyCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new FlowSpecificationFigure();
-	}
-
-	@Override
-	public FlowSpecificationFigure getPrimaryShape() {
-		return (FlowSpecificationFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.LABEL_SYSML_FLOWSPECIFICATION_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationLabelNameEditPart.java
deleted file mode 100644
index bb44d904f9d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/FlowSpecificationLabelNameEditPart.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart;
-
-public class FlowSpecificationLabelNameEditPart extends NamedElementNodeLabelNameEditPart {
-
-	/** Constructor */
-	public FlowSpecificationLabelNameEditPart(View view) {
-		super(view);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ParameterCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ParameterCompartmentEditPart.java
deleted file mode 100644
index 853e3dde4b9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ParameterCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.ConstraintParameterCompartmentSemanticEditPolicy;
-
-public class ParameterCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "parameters";
-
-	public ParameterCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintParameterCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/PartPropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/PartPropertyCompartmentEditPart.java
deleted file mode 100644
index 2c1112d7dd7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/PartPropertyCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.PartCompartmentSemanticEditPolicy;
-
-public class PartPropertyCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "parts";
-
-	public PartPropertyCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PartCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ReferencePropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ReferencePropertyCompartmentEditPart.java
deleted file mode 100644
index 736ceb8aaac..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ReferencePropertyCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.ReferenceCompartmentSemanticEditPolicy;
-
-public class ReferencePropertyCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "references";
-
-	public ReferencePropertyCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ReferenceCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/StructureCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/StructureCompartmentEditPart.java
deleted file mode 100644
index 5bfd6a12e93..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/StructureCompartmentEditPart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.CustomDuplicatePasteEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.StructureCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractShapeCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-
-public class StructureCompartmentEditPart extends AbstractShapeCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "structure";
-
-	public StructureCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StructureCompartmentSemanticEditPolicy());
-		// Start of user code custom edit policies
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitEditPart.java
deleted file mode 100644
index 09c89bd841b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitEditPart.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.UnitFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-
-public class UnitEditPart extends AbstractElementEditPart {
-
-	public UnitEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UnitLabelNameEditPart) {
-			((UnitLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UnitLabelNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new UnitFigure();
-	}
-
-	@Override
-	public UnitFigure getPrimaryShape() {
-		return (UnitFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.LABEL_SYSML_UNIT_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitLabelNameEditPart.java
deleted file mode 100644
index f160a7651be..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/UnitLabelNameEditPart.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart;
-
-public class UnitLabelNameEditPart extends NamedElementNodeLabelNameEditPart {
-
-	/** Constructor */
-	public UnitLabelNameEditPart(View view) {
-		super(view);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValuePropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValuePropertyCompartmentEditPart.java
deleted file mode 100644
index 4c49454d343..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValuePropertyCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.ValueCompartmentSemanticEditPolicy;
-
-public class ValuePropertyCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "values";
-
-	public ValuePropertyCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ValueCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeEditPart.java
deleted file mode 100644
index b3e1b126e9c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeEditPart.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.figure.ValueTypeFigure;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-
-public class ValueTypeEditPart extends AbstractElementEditPart {
-
-	public ValueTypeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ValueTypeLabelNameEditPart) {
-			((ValueTypeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ValueTypeLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PropertyCompartmentEditPart) {
-			return getPrimaryShape().getPropertyCompartmentFigure();
-		}
-		if (editPart instanceof OperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new ValueTypeFigure();
-	}
-
-	@Override
-	public ValueTypeFigure getPrimaryShape() {
-		return (ValueTypeFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(SysMLGraphicalTypes.LABEL_SYSML_VALUETYPE_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeLabelNameEditPart.java
deleted file mode 100644
index b2fe15c129d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/edit/part/ValueTypeLabelNameEditPart.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementNodeLabelNameEditPart;
-
-public class ValueTypeLabelNameEditPart extends NamedElementNodeLabelNameEditPart {
-
-	/** Constructor */
-	public ValueTypeLabelNameEditPart(View view) {
-		super(view);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
deleted file mode 100644
index 3c4cb2154b7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class BlockClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates Block view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-
-	// Start of user code preferences
-	@Override
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-		// Get default size from preferences use set view size.
-		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);
-		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);
-		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width(), store.getInt(preferenceConstantWitdh));
-		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height(), store.getInt(preferenceConstantHeight));
-	}
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
deleted file mode 100644
index f993010bb16..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class BlockCompositeClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates BlockComposite view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-
-	// Start of user code preferences
-	@Override
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-		// Get default size from preferences use set view size.
-		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);
-		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);
-		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width(), store.getInt(preferenceConstantWitdh));
-		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height(), store.getInt(preferenceConstantHeight));
-	}
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
deleted file mode 100644
index 4fde8d208f4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class BlockPropertyCompositeClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates BlockPropertyComposite view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-
-	// Start of user code preferences
-	@Override
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-		org.eclipse.jface.preference.IPreferenceStore store = (org.eclipse.jface.preference.IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-		// Get default size from preferences use set view size.
-		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);
-		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);
-		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width(), store.getInt(preferenceConstantWitdh));
-		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height(), store.getInt(preferenceConstantHeight));
-	}
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockClassifierViewFactory.java
deleted file mode 100644
index 2c722b9a94a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockClassifierViewFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class ConstraintBlockClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates ConstraintBlock view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.LABEL_SYSML_CONSTRAINTBLOCK_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockPropertyCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockPropertyCompositeClassifierViewFactory.java
deleted file mode 100644
index 097b114915f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ConstraintBlockPropertyCompositeClassifierViewFactory.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-public class ConstraintBlockPropertyCompositeClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates ConstraintBlockPropertyComposite view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-
-		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		if (ConstraintBlockPropertyCompositeEditPart.lastRepresentationIsSquareWithStructure()) {
-			getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		}
-
-		if (element != null) {
-			EObject newElement = EMFHelper.getEObject(element);
-			if (newElement instanceof Property && UMLUtil.getStereotypeApplication((Property) newElement, ConstraintProperty.class) != null) {
-				Property constraintProperty = (Property) newElement;
-				ViewService.createNode(view, getConstraint(constraintProperty), UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, getPreferencesHint());
-			}
-		}
-
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-
-	private Constraint getConstraint(Property constraintProperty) {
-		Type type = constraintProperty.getType();
-		if (type instanceof Class && UMLUtil.getStereotypeApplication(type, ConstraintBlock.class) != null) { // instanceof ensure type is not null
-			Class constraintBlock = (Class) type;
-			EList<Constraint> ownedRules = constraintBlock.getOwnedRules();
-			for (Constraint constraint : ownedRules) {
-				return constraint;
-			}
-		}
-		return null;
-	}
-
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/DimensionClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/DimensionClassifierViewFactory.java
deleted file mode 100644
index 4c9538eb7f9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/DimensionClassifierViewFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class DimensionClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates Dimension view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.LABEL_SYSML_DIMENSION_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowPortAffixedNodeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowPortAffixedNodeViewFactory.java
deleted file mode 100644
index fa9338933fb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowPortAffixedNodeViewFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class FlowPortAffixedNodeViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates FlowPort view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowSpecificationClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowSpecificationClassifierViewFactory.java
deleted file mode 100644
index f94d5a153cc..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/FlowSpecificationClassifierViewFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class FlowSpecificationClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates FlowSpecification view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.LABEL_SYSML_FLOWSPECIFICATION_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/NestedBlockPropertyCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/NestedBlockPropertyCompositeClassifierViewFactory.java
deleted file mode 100644
index fc990300597..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/NestedBlockPropertyCompositeClassifierViewFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class NestedBlockPropertyCompositeClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates NestedBlockPropertyComposite view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/UnitClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/UnitClassifierViewFactory.java
deleted file mode 100644
index 7413b11f4d1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/UnitClassifierViewFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-
-public class UnitClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates Unit view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.LABEL_SYSML_UNIT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ValueTypeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ValueTypeClassifierViewFactory.java
deleted file mode 100644
index 15d2b60264f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/ValueTypeClassifierViewFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class ValueTypeClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates ValueType view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, SysMLGraphicalTypes.LABEL_SYSML_VALUETYPE_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockCompositeFigure.java
deleted file mode 100644
index 878ae768b3a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockCompositeFigure.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.StructureCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class BlockCompositeFigure extends ClassifierFigure {
-
-	public BlockCompositeFigure() {
-		super(); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(StructureCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getStructureCompartmentFigure() {
-		return getCompartment(StructureCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockFigure.java
deleted file mode 100644
index 601395e4d3c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockFigure.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockConstraintCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.PartPropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ReferencePropertyCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ValuePropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class BlockFigure extends ClassifierFigure {
-
-	public BlockFigure() {
-		super(); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(BlockPropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(PartPropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(ReferencePropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(PortCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(FlowPortCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(OperationCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(BlockConstraintCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(ValuePropertyCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getBlockPropertyCompartmentFigure() {
-		return getCompartment(BlockPropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public IFigure getPartPropertyCompartmentFigure() {
-		return getCompartment(PartPropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public IFigure getReferencePropertyCompartmentFigure() {
-		return getCompartment(ReferencePropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public IFigure getPortCompartmentFigure() {
-		return getCompartment(PortCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public IFigure getFlowPortCompartmentFigure() {
-		return getCompartment(FlowPortCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	@Override
-	public IFigure getOperationCompartmentFigure() {
-		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public IFigure getBlockConstraintCompartmentFigure() {
-		return getCompartment(BlockConstraintCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public IFigure getValuePropertyCompartmentFigure() {
-		return getCompartment(ValuePropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockPropertyCompositeFigure.java
deleted file mode 100644
index 0122cafd541..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/BlockPropertyCompositeFigure.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyStructureCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class BlockPropertyCompositeFigure extends ClassifierFigure {
-
-	public BlockPropertyCompositeFigure() {
-		super("undefined"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(BlockPropertyStructureCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getBlockPropertyStructureCompartmentFigure() {
-		return getCompartment(BlockPropertyStructureCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public void setFigureTag(String newTag) {
-		getTaggedLabel().setText(String.valueOf("\u00AB") + newTag + String.valueOf("\u00BB"));
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockFigure.java
deleted file mode 100644
index 4fbda1071ee..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockFigure.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockConstraintCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ParameterCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class ConstraintBlockFigure extends ClassifierFigure {
-
-	public ConstraintBlockFigure() {
-		super("constraint"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(ParameterCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(BlockConstraintCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getParameterCompartmentFigure() {
-		return getCompartment(ParameterCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	public IFigure getBlockConstraintCompartmentFigure() {
-		return getCompartment(BlockConstraintCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockPropertyCompositeFigure.java
deleted file mode 100644
index 6a941aab4be..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ConstraintBlockPropertyCompositeFigure.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure;
-
-public class ConstraintBlockPropertyCompositeFigure extends PapyrusRoundedNodeFigure {
-
-	protected WrappingLabel constraintLabel;
-	protected WrappingLabel tagLabel;
-
-	private static final String tagConstraintText = String.valueOf("\u00AB") + "constraint" + String.valueOf("\u00BB");
-
-	/** main flow page */
-	protected FlowPage page;
-
-	public ConstraintBlockPropertyCompositeFigure() {
-		this(ConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);
-	}
-
-	public ConstraintBlockPropertyCompositeFigure(String representationMode) {
-		super();
-
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout() {
-
-			@Override
-			/**
-			 * Always strech figure for StructureCompartment
-			 * @see org.eclipse.draw2d.LayoutManager#layout(IFigure)
-			 */
-			public void layout(IFigure parent) {
-				if (!parent.isVisible()) {
-					return;
-				}
-				List<?> children = getChildren(parent);
-				int numChildren = children.size();
-				Rectangle clientArea = transposer.t(parent.getClientArea());
-				int x = clientArea.x;
-				int y = clientArea.y;
-				int availableHeight = clientArea.height;
-
-				Dimension prefSizes[] = new Dimension[numChildren];
-				Dimension minSizes[] = new Dimension[numChildren];
-				Dimension maxSizes[] = new Dimension[numChildren];
-
-				// Calculate the width and height hints. If it's a vertical ToolBarLayout,
-				// then ignore the height hint (set it to -1); otherwise, ignore the
-				// width hint. These hints will be passed to the children of the parent
-				// figure when getting their preferred size.
-				int wHint = -1;
-				int hHint = -1;
-				if (isHorizontal()) {
-					hHint = parent.getClientArea(Rectangle.SINGLETON).height;
-				} else {
-					wHint = parent.getClientArea(Rectangle.SINGLETON).width;
-				}
-
-				/*
-				 * Calculate sum of preferred heights of all children(totalHeight).
-				 * Calculate sum of minimum heights of all children(minHeight).
-				 * Cache Preferred Sizes and Minimum Sizes of all children.
-				 *
-				 * totalHeight is the sum of the preferred heights of all children
-				 * totalMinHeight is the sum of the minimum heights of all children
-				 * prefMinSumHeight is the sum of the difference between all children's
-				 * preferred heights and minimum heights. (This is used as a ratio to
-				 * calculate how much each child will shrink).
-				 */
-				IFigure child;
-				int totalHeight = 0;
-				int totalMinHeight = 0;
-				double totalMaxHeight = 0;
-				int prefMinSumHeight = 0;
-				double prefMaxSumHeight = 0;
-
-				for (int i = 0; i < numChildren; i++) {
-					child = (IFigure) children.get(i);
-
-					prefSizes[i] = transposer.t(child.getPreferredSize(wHint, hHint));
-					minSizes[i] = transposer.t(child.getMinimumSize(wHint, hHint));
-					maxSizes[i] = transposer.t(child.getMaximumSize());
-
-					if (getConstraint(child) != null) {
-						double ratio = ((Double) getConstraint(child)).doubleValue();
-						int prefHeight = (int) (ratio * availableHeight);
-						prefHeight = Math.max(prefHeight, minSizes[i].height);
-						prefHeight = Math.min(prefHeight, maxSizes[i].height);
-						prefSizes[i].height = prefHeight;
-					}
-
-					totalHeight += prefSizes[i].height;
-					totalMinHeight += minSizes[i].height;
-					totalMaxHeight += maxSizes[i].height;
-				}
-				totalHeight += (numChildren - 1) * getSpacing();
-				totalMinHeight += (numChildren - 1) * getSpacing();
-				totalMaxHeight += (numChildren - 1) * getSpacing();
-				prefMinSumHeight = totalHeight - totalMinHeight;
-				prefMaxSumHeight = totalMaxHeight - totalHeight;
-
-				/*
-				 * The total amount that the children must be shrunk is the
-				 * sum of the preferred Heights of the children minus
-				 * Max(the available area and the sum of the minimum heights of the children).
-				 *
-				 * amntShrinkHeight is the combined amount that the children must shrink
-				 * amntShrinkCurrentHeight is the amount each child will shrink respectively
-				 */
-				int amntShrinkHeight =
-						totalHeight - Math.max(availableHeight, totalMinHeight);
-
-				for (int i = 0; i < numChildren; i++) {
-					int amntShrinkCurrentHeight = 0;
-					int prefHeight = prefSizes[i].height;
-					int minHeight = minSizes[i].height;
-					int maxHeight = maxSizes[i].height;
-					int prefWidth = prefSizes[i].width;
-					int minWidth = minSizes[i].width;
-					int maxWidth = maxSizes[i].width;
-					Rectangle newBounds = new Rectangle(x, y, prefWidth, prefHeight);
-
-					child = (IFigure) children.get(i);
-					if (getStretchMajorAxis() || child instanceof ShapeCompartmentFigure) {
-						if (amntShrinkHeight > 0 && prefMinSumHeight != 0) {
-							amntShrinkCurrentHeight = (int) ((long) (prefHeight - minHeight)
-									* amntShrinkHeight / (prefMinSumHeight));
-						} else if (amntShrinkHeight < 0 && totalHeight != 0) {
-							amntShrinkCurrentHeight =
-									(int) (((maxHeight - prefHeight) / prefMaxSumHeight)
-									* amntShrinkHeight);
-						}
-					}
-
-					int width = Math.min(prefWidth, maxWidth);
-					if (isStretchMinorAxis()) {
-						width = maxWidth;
-					}
-					width = Math.max(minWidth, Math.min(clientArea.width, width));
-					newBounds.width = width;
-
-					int adjust = clientArea.width - width;
-					switch (getMinorAlignment()) {
-					case ALIGN_TOPLEFT:
-						adjust = 0;
-						break;
-					case ALIGN_CENTER:
-						adjust /= 2;
-						break;
-					case ALIGN_BOTTOMRIGHT:
-						break;
-					}
-					newBounds.x += adjust;
-					if (newBounds.height - amntShrinkCurrentHeight > maxHeight) {
-						amntShrinkCurrentHeight = newBounds.height - maxHeight;
-					}
-					newBounds.height -= amntShrinkCurrentHeight;
-					child.setBounds(transposer.t(newBounds));
-
-					amntShrinkHeight -= amntShrinkCurrentHeight;
-					prefMinSumHeight -= (prefHeight - minHeight);
-					prefMaxSumHeight -= (maxHeight - prefHeight);
-					totalHeight -= prefHeight;
-					y += newBounds.height + getSpacing();
-				}
-			}
-
-			/**
-			 * Gets the list of children after applying the layout options of
-			 * ignore invisible children & reverse children
-			 */
-			private List<?> getChildren(IFigure container) {
-				@SuppressWarnings({ "rawtypes", "unchecked" })
-				List<?> children = new ArrayList(container.getChildren());
-				if (getIgnoreInvisibleChildren()) {
-					Iterator<?> iter = children.iterator();
-					while (iter.hasNext()) {
-						IFigure f = (IFigure) iter.next();
-						if (!f.isVisible()) {
-							iter.remove();
-						}
-					}
-				}
-				if (isReversed()) {
-					Collections.reverse(children);
-				}
-				return children;
-			}
-
-		};
-
-		layout.setStretchMajorAxis(false);
-		setLayoutManager(layout);
-
-		tagLabel = new WrappingLabel();
-		tagLabel.setAlignment(PositionConstants.MIDDLE);
-		add(tagLabel);
-
-		if (ConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION.equals(representationMode)) {
-			corner = 50;
-		}
-		else {
-			corner = 0;
-			tagLabel.setText(tagConstraintText);
-		}
-
-		add(nameLabel);
-
-		constraintLabel = new WrappingLabel();
-		constraintLabel.setAlignment(PositionConstants.RIGHT);
-		add(constraintLabel);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeNamedElementFigure#getNameLabel()
-	 *
-	 * @return
-	 */
-	@Override
-	public WrappingLabel getNameLabel() {
-		return nameLabel;
-	}
-
-	/**
-	 *
-	 * @return the textflow of the constraint that contain the string of the
-	 *         specification
-	 */
-	public WrappingLabel getConstraintLabel() {
-		return constraintLabel;
-	}
-
-	public int getCorner() {
-		return corner;
-	}
-
-	public void setCorner(int newCorner) {
-		this.corner = newCorner;
-	}
-
-	public WrappingLabel getTagLabel() {
-		return tagLabel;
-	}
-
-	public void setTagLabel(String newTag) {
-		this.tagLabel.setText(newTag);
-	}
-
-	public static boolean isCompleteRepresentation() {
-		return false;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/DimensionFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/DimensionFigure.java
deleted file mode 100644
index c154cd80685..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/DimensionFigure.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class DimensionFigure extends ClassifierFigure {
-
-	public DimensionFigure() {
-		super(); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		return compartments;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/FlowSpecificationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/FlowSpecificationFigure.java
deleted file mode 100644
index f05f3cde6aa..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/FlowSpecificationFigure.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class FlowSpecificationFigure extends ClassifierFigure {
-
-	public FlowSpecificationFigure() {
-		super("flowSpecification"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(FlowPropertyCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getFlowPropertyCompartmentFigure() {
-		return getCompartment(FlowPropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/NestedBlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/NestedBlockPropertyCompositeFigure.java
deleted file mode 100644
index 638d17864f0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/NestedBlockPropertyCompositeFigure.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class NestedBlockPropertyCompositeFigure extends ClassifierFigure {
-
-	public NestedBlockPropertyCompositeFigure() {
-		super("undefined"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		return compartments;
-	}
-
-	public void setFigureTag(String newTag) {
-		getTaggedLabel().setText(String.valueOf("\u00AB") + newTag + String.valueOf("\u00BB"));
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/SysMLDiagramFrameFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/SysMLDiagramFrameFigure.java
deleted file mode 100644
index ad42f9d085d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/SysMLDiagramFrameFigure.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.OrderedLayout;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.papyrus.uml.diagram.common.draw2d.InteractionFigure;
-import org.eclipse.papyrus.uml.diagram.common.draw2d.LeftToolbarLayout;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-
-public class SysMLDiagramFrameFigure extends NodeNamedElementFigure {
-
-	private WrappingLabel stereotypeLabel;
-
-	private WrappingLabel frameLabel;
-
-	private RectangleFigure frameLabelContainerFigure;
-
-	private InteractionFigure interactionFigure;
-
-	private int structureOffset;
-
-	public SysMLDiagramFrameFigure() {
-		super();
-		createContents();
-	}
-
-	protected void createContents() {
-		add(createFigureHeader());
-		setLayoutManager(new SysMLLayoutLayoutManager());
-	}
-
-	protected RectangleFigure createFigureHeader() {
-
-		if (this.stereotypeLabel == null) {
-			this.stereotypeLabel = new WrappingLabel() {
-
-				@Override
-				public Dimension getPreferredSize(final int wHint, final int hHint) {
-					final Dimension preferredSize = super.getPreferredSize(wHint, hHint);
-					if (preferredSize.width == 0) {
-						return preferredSize;
-					}
-					return new Dimension(preferredSize.width + 2, preferredSize.height);
-				}
-			};
-		}
-
-		stereotypeLabel.setAlignment(OrderedLayout.ALIGN_CENTER);
-		if (this.frameLabel == null) {
-			this.frameLabel = new WrappingLabel() {
-
-				@Override
-				public Dimension getPreferredSize(final int wHint, final int hHint) {
-					final Dimension preferredSize = super.getPreferredSize(wHint, hHint);
-					if (preferredSize.width == 0) {
-						return preferredSize;
-					}
-					return new Dimension(preferredSize.width + 9, preferredSize.height);
-				}
-			};
-		}
-
-		interactionFigure = new InteractionFigure();
-		interactionFigure.setBorder(new MarginBorder(3, 3, 6, 3));
-		interactionFigure.setLayoutManager(new LeftToolbarLayout());
-		interactionFigure.add(frameLabel);
-
-		frameLabelContainerFigure = new RectangleFigure();
-		frameLabelContainerFigure.setOutline(false);
-		frameLabelContainerFigure.setFill(false);
-		frameLabelContainerFigure.setLayoutManager(new ToolbarLayout(false));
-		frameLabelContainerFigure.add(interactionFigure, OrderedLayout.ALIGN_CENTER);
-		return frameLabelContainerFigure;
-	}
-
-	@Override
-	public WrappingLabel getNameLabel() {
-		if (frameLabel == null) {
-			createFigureHeader();
-		}
-		return frameLabel;
-	}
-
-	public RectangleFigure getLabelContainer() {
-		return frameLabelContainerFigure;
-	}
-
-	/**
-	 * this is the layout manager in charge to place element in the enumeration
-	 *
-	 */
-	private class SysMLLayoutLayoutManager extends AutomaticCompartmentLayoutManager {
-
-		/**
-		 *
-		 * {@inheritDoc}
-		 */
-		@Override
-		public void layout(final IFigure container) {
-			List<IFigure> figuresToRemove = new ArrayList<IFigure>();
-			for (int i = 0; i < container.getChildren().size(); i++) {
-				IFigure currentCompartment = (IFigure) container.getChildren().get(i);
-				// this is a visible compartment
-				if (currentCompartment instanceof ShapeCompartmentFigure) {
-					Rectangle bound = new Rectangle(currentCompartment.getBounds());
-					currentCompartment.invalidate();
-					Dimension pref = currentCompartment.getPreferredSize();
-					currentCompartment.invalidate();
-					Dimension prefConstraint = currentCompartment.getPreferredSize(container.getBounds().width - 40, -1);
-					if (pref.width < prefConstraint.width) {
-						bound.setSize(pref);
-					} else {
-						bound.setSize(prefConstraint);
-					}
-					bound.x = container.getBounds().x + 10;
-					bound.y = container.getBounds().y + structureOffset;
-					bound.width = container.getBounds().width - 20;
-					bound.height = container.getBounds().height - structureOffset - 10;
-					currentCompartment.setBounds(bound);
-				} else if (currentCompartment == frameLabelContainerFigure) {
-					Rectangle boundLabel = new Rectangle(frameLabelContainerFigure.getBounds());
-					Dimension frameLabelDimension = frameLabelContainerFigure.getPreferredSize();
-					boundLabel.setSize(frameLabelDimension);
-					frameLabelContainerFigure.setBounds(boundLabel);
-				} else {
-					// remove other figure
-					figuresToRemove.add(currentCompartment);
-				}
-			}
-			for (IFigure iFigure : figuresToRemove) {
-				container.getChildren().remove(iFigure);
-			}
-		}
-	}
-
-	public void setStereotypeLabel(String stereotypeText) {
-		interactionFigure.remove(frameLabel);
-		if (interactionFigure.getChildren().contains(stereotypeLabel)) {
-			interactionFigure.remove(stereotypeLabel);
-		}
-		if (stereotypeText != null && !stereotypeText.isEmpty()) {
-			stereotypeLabel.setText(String.valueOf("\u00AB") + stereotypeText + String.valueOf("\u00BB"));
-			interactionFigure.add(stereotypeLabel);
-			structureOffset = 41;
-		}
-		else {
-			// no stereotype
-			structureOffset = 26;
-		}
-		interactionFigure.add(frameLabel);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/UnitFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/UnitFigure.java
deleted file mode 100644
index 21d1c2521eb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/UnitFigure.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class UnitFigure extends ClassifierFigure {
-
-	public UnitFigure() {
-		super(); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		return compartments;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ValueTypeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ValueTypeFigure.java
deleted file mode 100644
index 0536e5f8fc4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/figure/ValueTypeFigure.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class ValueTypeFigure extends ClassifierFigure {
-
-	public ValueTypeFigure() {
-		super(); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(OperationCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getPropertyCompartmentFigure() {
-		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	@Override
-	public IFigure getOperationCompartmentFigure() {
-		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLGraphicalTypes.java
deleted file mode 100644
index 572c2de388f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLGraphicalTypes.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.utils;
-
-public class SysMLGraphicalTypes {
-
-	/** ********************************************************* */
-	/** Diagram custom graphical types id *********************** */
-	/** ********************************************************* */
-	/** Custom nodes */
-	public static final String SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID = "shape_sysml_block_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID = "shape_sysml_block_as_composite"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID = "shape_sysml_blockproperty_as_composite"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID = "shape_sysml_constraintblockproperty_as_composite"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID = "shape_sysml_dimension_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID = "shape_sysml_constraintblock_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID = "shape_sysml_flowspecification_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID = "shape_sysml_unit_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID = "shape_sysml_valuetype_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID = "shape_sysml_flowport_as_affixed"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_REQUIREMENT_AS_CLASSIFER_ID = "shape_sysml_requirement_as_classifier"; //$NON-NLS-1$
-
-	@Deprecated
-	public static final String SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID = "shape_sysml_nestedblockproperty_as_composite"; //$NON-NLS-1$
-
-	/** Custom label nodes */
-	public static final String SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID = "shape_sysml_constraintproperty_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_FLOWPORT_AS_LABEL_ID = "shape_sysml_flowport_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID = "shape_sysml_flowproperty_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_PART_AS_LABEL_ID = "shape_sysml_part_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_REFERENCE_AS_LABEL_ID = "shape_sysml_reference_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_SYSML_VALUE_AS_LABEL_ID = "shape_sysml_value_as_label"; //$NON-NLS-1$
-
-	/** Custom inner labels */
-	public static final String LABEL_SYSML_BLOCK_NAME_ID = "label_sysml_block_name"; //$NON-NLS-1$
-
-	public static final String LABEL_SYSML_CONSTRAINTBLOCK_NAME_ID = "label_sysml_constraintblock_name"; //$NON-NLS-1$
-
-	public static final String LABEL_SYSML_DIMENSION_NAME_ID = "label_sysml_dimension_name"; //$NON-NLS-1$
-
-	public static final String LABEL_SYSML_FLOWSPECIFICATION_NAME_ID = "label_sysml_flowspecification_name"; //$NON-NLS-1$
-
-	public static final String LABEL_SYSML_UNIT_NAME_ID = "label_sysml_unit_name"; //$NON-NLS-1$
-
-	public static final String LABEL_SYSML_VALUETYPE_NAME_ID = "label_sysml_valuetype_name"; //$NON-NLS-1$
-
-	public static final String LABEL_SYSML_REQUIREMENT_ID_ID = "label_sysml_requirement_id"; //$NON-NLS-1$
-
-	public static final String LABEL_SYSML_REQUIREMENT_TEXT_ID = "label_sysml_requirement_text"; //$NON-NLS-1$
-
-	/** Custom affixed labels */
-	public static final String AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID = "affixedlabel_sysml_flowport_label"; //$NON-NLS-1$
-
-	/** Custom compartments */
-	public static final String COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID = "compartment_sysml_constraint_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID = "compartment_sysml_flowport_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID = "compartment_sysml_flowproperty_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID = "compartment_sysml_parameter_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_PART_AS_LIST_ID = "compartment_sysml_part_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID = "compartment_sysml_property_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID = "compartment_sysml_reference_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_STRUCTURE_ID = "compartment_sysml_structure"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID = "compartment_sysml_blockproperty_structure"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_VALUE_AS_LIST_ID = "compartment_sysml_value_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_SYSML_REQUIREMENT_IDINFO_AS_LIST_ID = "compartment_sysml_requirement_idinfo_as_list"; //$NON-NLS-1$
-
-	/** Custom links */
-	public static final String LINK_SYSML_ASSOCIATION_ID = "link_sysml_association"; //$NON-NLS-1$
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ActorEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ActorEditPart.java
deleted file mode 100644
index d98baf375aa..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ActorEditPart.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.ActorFigure;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class ActorEditPart extends AbstractElementEditPart {
-
-	public ActorEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PropertyCompartmentEditPart) {
-			return getPrimaryShape().getPropertyCompartmentFigure();
-		}
-		if (editPart instanceof OperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new ActorFigure();
-	}
-
-	@Override
-	public ActorFigure getPrimaryShape() {
-		return (ActorFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorEditPart.java
deleted file mode 100644
index 699f630a164..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConnectorEditPart.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.blocks.BindingConnector;
-import org.eclipse.papyrus.uml.diagram.common.figure.ConnectorEdgeFigure;
-import org.eclipse.uml2.uml.Element;
-
-public class ConnectorEditPart extends AbstractElementLinkEditPart {
-
-	/**
-	 * Constructor.
-	 */
-	public ConnectorEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConnectorLinkLabelEditPart) {
-			((ConnectorLinkLabelEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConnectorLinkLabelSourceMultiplicityEditPart) {
-			((ConnectorLinkLabelSourceMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getSourceMultiplicityLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConnectorLinkLabelTargetMultiplicityEditPart) {
-			((ConnectorLinkLabelTargetMultiplicityEditPart) childEditPart).setLabel(getPrimaryShape().getTargetMultiplicityLabel());
-			return true;
-		}
-		return super.addFixedChild(childEditPart);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConnectorLinkLabelEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConnectorLinkLabelSourceMultiplicityEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConnectorLinkLabelTargetMultiplicityEditPart) {
-			return true;
-		}
-		return super.removeFixedChild(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new ConnectorEdgeFigure();
-	}
-
-	/**
-	 * Creates primary shape for this edit part.
-	 */
-	@Override
-	public ConnectorEdgeFigure getPrimaryShape() {
-		return (ConnectorEdgeFigure) getFigure();
-	}
-
-	@Override
-	protected void refreshLineWidth() {
-		int width = getLineWidth();
-		if (width < 1) {
-			width = 1;
-		}
-
-		if (org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication((Element) resolveSemanticElement(), BindingConnector.class) != null) {
-			setLineWidth(width * 2);
-		} else {
-			setLineWidth(width);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintCompartmentEditPart.java
deleted file mode 100644
index 81395657cb7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-
-public class ConstraintCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "constraints";
-
-	public ConstraintCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintParameterAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintParameterAffixedNodeEditPart.java
deleted file mode 100644
index 436f87d7959..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/ConstraintParameterAffixedNodeEditPart.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutListener;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-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.gmf.diagram.common.edit.policy.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class ConstraintParameterAffixedNodeEditPart extends AbstractElementBorderEditPart {
-
-	private LayoutListener.Stub layoutInitializationListener;
-
-	public ConstraintParameterAffixedNodeEditPart(View view) {
-		super(view);
-	}
-
-
-	@Override
-	protected EditPart createChild(Object model) {
-		return super.createChild(model);
-	}
-
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy() {
-
-			/**
-			 * <pre>
-			 * {@inheritDoc}
-			 *
-			 * This modifies the edit policy in order to call refreshVisuals() whenever the stereotype image to show is null.
-			 * (required to show the Port default image correctly).
-			 * </pre>
-			 */
-			@Override
-			protected void refreshStereotypeDisplay() {
-				if (getHost() instanceof IPapyrusEditPart) {
-					IFigure figure = ((IPapyrusEditPart) getHost()).getPrimaryShape();
-
-					if ((figure instanceof IPapyrusUMLElementFigure) && (stereotypeIconToDisplay() != null)) {
-						((IPapyrusUMLElementFigure) figure).setStereotypeDisplay(null, stereotypeIconToDisplay());
-					} else {
-						refreshVisuals();
-					}
-				}
-			}
-
-		});
-
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) { // External labels
-					return new ExternalLabelPrimaryDragRoleEditPolicy() {
-
-						@Override
-						@SuppressWarnings("rawtypes")
-						protected List createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-							mh.setBorder(null);
-							return Collections.singletonList(mh);
-						}
-					};
-				}
-
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-		borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		return;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);
-	}
-
-	/**
-	 * <pre>
-	 * Calls the figure refresh when a change event is detected on
-	 * UMLPackage.eINSTANCE.getProperty_Aggregation().
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-
-		// When the constraint parameter position changes, its position on parent side may change and requires a visual refresh.
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshVisuals();
-		}
-
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new AffixedNamedElementFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public AffixedNamedElementFigure getPrimaryShape() {
-		return (AffixedNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * <pre>
-	 * A post layout listener is added during activate and remove the first time the layout occurs.
-	 * This is required in order to be able to find the side of this border item on its parent when opening the model.
-	 * Without this, the locator is unable to guess the parent side because the parent constraint is not set yet.
-	 *
-	 * Once the initialization is done, the listener become useless and can be removed.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	public void activate() {
-
-		layoutInitializationListener = new LayoutListener.Stub() {
-
-			@Override
-			public void postLayout(IFigure container) {
-				refreshVisuals();
-				// getBorderedFigure().getBorderItemContainer().removeLayoutListener(layoutInitializationListener);
-				layoutInitializationListener = null;
-			}
-		};
-		getBorderedFigure().getBorderItemContainer().addLayoutListener(layoutInitializationListener);
-
-		super.activate();
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DataTypeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DataTypeEditPart.java
deleted file mode 100644
index 9493d1aee61..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DataTypeEditPart.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.DataTypeFigure;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class DataTypeEditPart extends AbstractElementEditPart {
-
-	public DataTypeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PropertyCompartmentEditPart) {
-			return getPrimaryShape().getPropertyCompartmentFigure();
-		}
-		if (editPart instanceof OperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new DataTypeFigure();
-	}
-
-	@Override
-	public DataTypeFigure getPrimaryShape() {
-		return (DataTypeFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DependencyEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DependencyEditPart.java
deleted file mode 100644
index 795bae58205..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/DependencyEditPart.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
-import org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure;
-
-public class DependencyEditPart extends AbstractElementLinkEditPart {
-
-	/**
-	 * Constructor.
-	 */
-	public DependencyEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return super.addFixedChild(childEditPart);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			return true;
-		}
-		return super.removeFixedChild(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new NamedElementEdgeFigure();
-	}
-
-	/**
-	 * Creates primary shape for this edit part.
-	 */
-	@Override
-	public NamedElementEdgeFigure getPrimaryShape() {
-		return (NamedElementEdgeFigure) getFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshLineType() {
-		// Start of user code custom line type
-		setLineType(Graphics.LINE_CUSTOM);
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowSource() {
-		// Start of user code custom source decoration
-		setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowTarget() {
-		// Start of user code custom target decoration
-		setArrowTarget(getArrowDecoration(EdgeDecorationType.OPEN_ARROW));
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationEditPart.java
deleted file mode 100644
index 9b8c7323269..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationEditPart.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.EnumerationFigure;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class EnumerationEditPart extends AbstractElementEditPart {
-
-	public EnumerationEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof EnumerationLiteralCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((EnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof EnumerationLiteralCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((EnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof EnumerationLiteralCompartmentEditPart) {
-			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new EnumerationFigure();
-	}
-
-	@Override
-	public EnumerationFigure getPrimaryShape() {
-		return (EnumerationFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationLiteralCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationLiteralCompartmentEditPart.java
deleted file mode 100644
index c8e2aead54c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/EnumerationLiteralCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-
-public class EnumerationLiteralCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "literals";
-
-	public EnumerationLiteralCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/GeneralizationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/GeneralizationEditPart.java
deleted file mode 100644
index ad314da2305..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/GeneralizationEditPart.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
-import org.eclipse.papyrus.uml.diagram.common.figure.GeneralizationFigure;
-
-public class GeneralizationEditPart extends AbstractElementLinkEditPart {
-
-	/**
-	 * Constructor.
-	 */
-	public GeneralizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		return super.addFixedChild(childEditPart);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		return super.removeFixedChild(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new GeneralizationFigure();
-	}
-
-	/**
-	 * Creates primary shape for this edit part.
-	 */
-	@Override
-	public GeneralizationFigure getPrimaryShape() {
-		return (GeneralizationFigure) getFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshLineType() {
-		// Start of user code custom line type
-		setLineType(Graphics.LINE_SOLID);
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowSource() {
-		// Start of user code custom source decoration
-		setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowTarget() {
-		// Start of user code custom target decoration
-		setArrowTarget(getArrowDecoration(EdgeDecorationType.SOLID_ARROW_EMPTY));
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceEditPart.java
deleted file mode 100644
index f2947a5d2b2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceEditPart.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.InterfaceFigure;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class InterfaceEditPart extends AbstractElementEditPart {
-
-	public InterfaceEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PropertyCompartmentEditPart) {
-			return getPrimaryShape().getPropertyCompartmentFigure();
-		}
-		if (editPart instanceof OperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new InterfaceFigure();
-	}
-
-	@Override
-	public InterfaceFigure getPrimaryShape() {
-		return (InterfaceFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceRealizationEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceRealizationEditPart.java
deleted file mode 100644
index 1d11426d928..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/InterfaceRealizationEditPart.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
-import org.eclipse.papyrus.uml.diagram.common.figure.InterfaceRealizationFigure;
-
-public class InterfaceRealizationEditPart extends AbstractElementLinkEditPart {
-
-	/**
-	 * Constructor.
-	 */
-	public InterfaceRealizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return super.addFixedChild(childEditPart);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			return true;
-		}
-		return super.removeFixedChild(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new InterfaceRealizationFigure();
-	}
-
-	/**
-	 * Creates primary shape for this edit part.
-	 */
-	@Override
-	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure) getFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshLineType() {
-		// Start of user code custom line type
-		setLineType(Graphics.LINE_CUSTOM);
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowSource() {
-		// Start of user code custom source decoration
-		setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowTarget() {
-		// Start of user code custom target decoration
-		setArrowTarget(getArrowDecoration(EdgeDecorationType.SOLID_ARROW_EMPTY));
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/OperationCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/OperationCompartmentEditPart.java
deleted file mode 100644
index 29dd59c92d5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/OperationCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-
-public class OperationCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "operations";
-
-	public OperationCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedNodeEditPart.java
deleted file mode 100644
index e8715b7db88..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortAffixedNodeEditPart.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.ExternalLabelPrimaryDragRoleEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PortAffixedNodeEditPart extends AbstractElementBorderEditPart {
-
-	public PortAffixedNodeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				if (child instanceof IBorderItemEditPart) { // External labels
-					return new ExternalLabelPrimaryDragRoleEditPolicy() {
-
-						@Override
-						protected List createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-							mh.setBorder(null);
-							return Collections.singletonList(mh);
-						}
-					};
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-		borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		return;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortCompartmentEditPart.java
deleted file mode 100644
index f70d5b19b79..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PortCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-
-public class PortCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "standard ports";
-
-	public PortCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PrimitiveTypeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PrimitiveTypeEditPart.java
deleted file mode 100644
index 6d027342cc8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PrimitiveTypeEditPart.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.PrimitiveTypeFigure;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PrimitiveTypeEditPart extends AbstractElementEditPart {
-
-	public PrimitiveTypeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new PrimitiveTypeFigure();
-	}
-
-	@Override
-	public PrimitiveTypeFigure getPrimaryShape() {
-		return (PrimitiveTypeFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyCompartmentEditPart.java
deleted file mode 100644
index a42db06ab62..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/PropertyCompartmentEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-
-public class PropertyCompartmentEditPart extends ResizeableListCompartmentEditPart {
-
-	public final static String COMPARTMENT_NAME = "properties";
-
-	public PropertyCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		// Start of user code custom edit policies
-		// End of user code
-	}
-
-	@Override
-	public String getCompartmentName() {
-		return COMPARTMENT_NAME;
-	}
-
-	@Override
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	@Override
-	public IFigure createFigure() {
-		ResizableCompartmentFigure result = (ResizableCompartmentFigure) super.createFigure();
-		result.setTitleVisibility(false);
-		return result;
-	}
-
-	@Override
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/SignalEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/SignalEditPart.java
deleted file mode 100644
index 3411cbe80af..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/SignalEditPart.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.SignalFigure;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class SignalEditPart extends AbstractElementEditPart {
-
-	public SignalEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			@Override
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			@Override
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			@Override
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			((NamedElementNodeLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.add(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementNodeLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof PropertyCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getPropertyCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((PropertyCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof OperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane);
-			pane.remove(((OperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PropertyCompartmentEditPart) {
-			return getPrimaryShape().getPropertyCompartmentFigure();
-		}
-		if (editPart instanceof OperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	// public EditPart getTargetEditPart(Request request) {
-	// if(request instanceof CreateViewAndElementRequest) {
-	// CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-	// IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
-	// if(type == CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_CLN) {
-	// return getChildBySemanticHint(CustomBlockDefinitionDiagramElementTypes.BLOCK_CONSTRAINT_COMPARTMENT_HINT);
-	// }
-	// }
-	// return super.getTargetEditPart(request);
-	// }
-	@Override
-	protected IFigure createNodeShape() {
-		return primaryShape = new SignalFigure();
-	}
-
-	@Override
-	public SignalFigure getPrimaryShape() {
-		return (SignalFigure) primaryShape;
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/UsageEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/UsageEditPart.java
deleted file mode 100644
index cfab37bf90f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/edit/part/UsageEditPart.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.edit.part;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.EdgeDecorationType;
-import org.eclipse.papyrus.uml.diagram.common.figure.NamedElementEdgeFigure;
-
-public class UsageEditPart extends AbstractElementLinkEditPart {
-
-	/**
-	 * Constructor.
-	 */
-	public UsageEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy("use"));
-		// Start of user code custom policies
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			((NamedElementLinkLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return super.addFixedChild(childEditPart);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NamedElementLinkLabelNameEditPart) {
-			return true;
-		}
-		return super.removeFixedChild(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new NamedElementEdgeFigure();
-	}
-
-	/**
-	 * Creates primary shape for this edit part.
-	 */
-	@Override
-	public NamedElementEdgeFigure getPrimaryShape() {
-		return (NamedElementEdgeFigure) getFigure();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshLineType() {
-		// Start of user code custom line type
-		setLineType(Graphics.LINE_CUSTOM);
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowSource() {
-		// Start of user code custom source decoration
-		setArrowSource(getArrowDecoration(EdgeDecorationType.NONE));
-		// End of user code
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void refreshArrowTarget() {
-		// Start of user code custom target decoration
-		setArrowTarget(getArrowDecoration(EdgeDecorationType.OPEN_ARROW));
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConnectorLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConnectorLinkViewFactory.java
deleted file mode 100644
index f1851011c66..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConnectorLinkViewFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * View factory for Connector.
- */
-public class ConnectorLinkViewFactory extends ConnectorViewFactory {
-
-	/**
-	 * Creates Connector view and add Label nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConstraintPropertyAffixedNodeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConstraintPropertyAffixedNodeViewFactory.java
deleted file mode 100644
index 96460cb9c40..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/ConstraintPropertyAffixedNodeViewFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-
-
-public class ConstraintPropertyAffixedNodeViewFactory extends PortAffixedNodeViewFactory {
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/DependencyLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/DependencyLinkViewFactory.java
deleted file mode 100644
index 15aba6f4db5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/DependencyLinkViewFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * View factory for Dependency.
- */
-public class DependencyLinkViewFactory extends ConnectorViewFactory {
-
-	/**
-	 * Creates Dependency view and add Label nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/EnumerationClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/EnumerationClassifierViewFactory.java
deleted file mode 100644
index 4b300693973..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/EnumerationClassifierViewFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class EnumerationClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates Enumeration view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/GeneralizationLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/GeneralizationLinkViewFactory.java
deleted file mode 100644
index 4459ac68e98..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/GeneralizationLinkViewFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * View factory for Generalization.
- */
-public class GeneralizationLinkViewFactory extends ConnectorViewFactory {
-
-	/**
-	 * Creates Generalization view and add Label nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/InterfaceRealizationLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/InterfaceRealizationLinkViewFactory.java
deleted file mode 100644
index 095d3582c4e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/InterfaceRealizationLinkViewFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * View factory for InterfaceRealization.
- */
-public class InterfaceRealizationLinkViewFactory extends ConnectorViewFactory {
-
-	/**
-	 * Creates InterfaceRealization view and add Label nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PortAffixedNodeViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PortAffixedNodeViewFactory.java
deleted file mode 100644
index 555236eacd7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PortAffixedNodeViewFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PortAffixedNodeViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates Port view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PrimitiveTypeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PrimitiveTypeClassifierViewFactory.java
deleted file mode 100644
index 0f603a562ef..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/PrimitiveTypeClassifierViewFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ShapeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class PrimitiveTypeClassifierViewFactory extends ShapeViewFactory {
-
-	/**
-	 * Creates PrimitiveType view and add Label and Compartment nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LABEL_UML_NAMEDELEMENT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		// this action needs to be done after the compartments creation
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-	// Start of user code preferences
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/UsageLinkViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/UsageLinkViewFactory.java
deleted file mode 100644
index a02e00ede2a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/factory/UsageLinkViewFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.factory;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * View factory for Usage.
- */
-public class UsageLinkViewFactory extends ConnectorViewFactory {
-
-	/**
-	 * Creates Usage view and add Label nodes
-	 */
-	@Override
-	protected void decorateView(View containerView, View view, IAdaptable element, String semanticHint, int index, boolean persisted) {
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		getViewService().createNode(element, view, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, ViewUtil.APPEND, persisted, getPreferencesHint());
-		super.decorateView(containerView, view, element, semanticHint, index, persisted);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/ActorFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/ActorFigure.java
deleted file mode 100644
index e7b5124b775..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/ActorFigure.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class ActorFigure extends ClassifierFigure {
-
-	public ActorFigure() {
-		super("actor"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(OperationCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getPropertyCompartmentFigure() {
-		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	@Override
-	public IFigure getOperationCompartmentFigure() {
-		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/DataTypeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/DataTypeFigure.java
deleted file mode 100644
index e6ab2cb91d3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/DataTypeFigure.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class DataTypeFigure extends ClassifierFigure {
-
-	public DataTypeFigure() {
-		super("datatype"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(OperationCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getPropertyCompartmentFigure() {
-		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	@Override
-	public IFigure getOperationCompartmentFigure() {
-		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/EnumerationFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/EnumerationFigure.java
deleted file mode 100644
index 33839691c06..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/EnumerationFigure.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.EnumerationLiteralCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class EnumerationFigure extends ClassifierFigure {
-
-	public EnumerationFigure() {
-		super("enumeration"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(EnumerationLiteralCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getEnumerationLiteralCompartmentFigure() {
-		return getCompartment(EnumerationLiteralCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceFigure.java
deleted file mode 100644
index db162ee1a95..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/InterfaceFigure.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class InterfaceFigure extends ClassifierFigure {
-
-	public InterfaceFigure() {
-		super("interface"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(OperationCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getPropertyCompartmentFigure() {
-		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	@Override
-	public IFigure getOperationCompartmentFigure() {
-		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/PrimitiveTypeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/PrimitiveTypeFigure.java
deleted file mode 100644
index 596800a9789..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/PrimitiveTypeFigure.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class PrimitiveTypeFigure extends ClassifierFigure {
-
-	public PrimitiveTypeFigure() {
-		super("primitive"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		return compartments;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/SignalFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/SignalFigure.java
deleted file mode 100644
index 8b78df6b131..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/figure/SignalFigure.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.figure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.OperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-
-public class SignalFigure extends ClassifierFigure {
-
-	public SignalFigure() {
-		super("signal"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createContentPane(List<String> compartments) {
-		super.createContentPane(getUpdatedListOfCompartments(compartments));
-	}
-
-	/**
-	 * Get the list of compartments, updated with specific ones
-	 *
-	 * @param compartments
-	 *            the original list of compartments (untouched)
-	 * @return the new completed list of compartments
-	 */
-	private List<String> getUpdatedListOfCompartments(List<String> compartments) {
-		compartments = new ArrayList<String>(compartments);
-		compartments.add(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-		compartments.add(OperationCompartmentEditPart.COMPARTMENT_NAME);
-		return compartments;
-	}
-
-	public IFigure getPropertyCompartmentFigure() {
-		return getCompartment(PropertyCompartmentEditPart.COMPARTMENT_NAME);
-	}
-
-	@Override
-	public IFigure getOperationCompartmentFigure() {
-		return getCompartment(OperationCompartmentEditPart.COMPARTMENT_NAME);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/utils/UMLGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/utils/UMLGraphicalTypes.java
deleted file mode 100644
index 494dea676aa..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/uml/diagram/common/utils/UMLGraphicalTypes.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.utils;
-
-public class UMLGraphicalTypes {
-
-	/** ********************************************************* */
-	/** Diagram custom graphical types id *********************** */
-	/** ********************************************************* */
-	/** Custom nodes */
-	public static final String SHAPE_UML_ACTOR_AS_CLASSIFIER_ID = "shape_uml_actor_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID = "shape_uml_datatype_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID = "shape_uml_enumeration_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID = "shape_uml_interface_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID = "shape_uml_primitivetype_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID = "shape_uml_signal_as_classifier"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_PORT_AS_AFFIXED_ID = "shape_uml_port_as_affixed"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_PROPERTY_AS_AFFIXED_ID = "shape_uml_property_as_affixed"; //$NON-NLS-1$
-
-	/** Custom label nodes */
-	public static final String SHAPE_UML_CONSTRAINT_AS_LABEL_ID = "shape_uml_constraint_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID = "shape_uml_enumerationliteral_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_OPERATION_AS_LABEL_ID = "shape_uml_operation_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_PORT_AS_LABEL_ID = "shape_uml_port_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_PROPERTY_AS_LABEL_ID = "shape_uml_property_as_label"; //$NON-NLS-1$
-
-	public static final String SHAPE_UML_RECEPTION_AS_LABEL_ID = "shape_uml_reception_as_label"; //$NON-NLS-1$
-
-	/** Custom inner labels */
-	public static final String LABEL_UML_NAMEDELEMENT_NAME_ID = "label_uml_namedelement_name"; //$NON-NLS-1$
-
-	public static final String LABEL_UML_PROPERTY_LABEL_ID = "label_uml_property_label"; //$NON-NLS-1$
-
-	/** Custom affixed labels */
-	public static final String AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID = "affixedlabel_uml_appliedstereotype"; //$NON-NLS-1$
-
-	public static final String AFFIXEDLABEL_UML_NAMEDELEMENT_NAME_ID = "affixedlabel_uml_namedelement_name"; //$NON-NLS-1$
-
-	public static final String AFFIXEDLABEL_UML_PORT_LABEL_ID = "affixedlabel_uml_port_label"; //$NON-NLS-1$
-
-	/** Custom compartments */
-	public static final String COMPARTMENT_UML_CONSTRAINT_AS_LIST_ID = "compartment_uml_constraint_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID = "compartment_uml_enumerationliteral_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_UML_OPERATION_AS_LIST_ID = "compartment_uml_operation_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_UML_PORT_AS_LIST_ID = "compartment_uml_port_as_list"; //$NON-NLS-1$
-
-	public static final String COMPARTMENT_UML_PROPERTY_AS_LIST_ID = "compartment_uml_property_as_list"; //$NON-NLS-1$
-
-	/** Custom links */
-	public static final String LINK_UML_DEPENDENCY_ID = "link_uml_dependency"; //$NON-NLS-1$
-
-	public static final String LINK_UML_CONNECTOR_ID = "link_uml_connector"; //$NON-NLS-1$
-
-	public static final String LINK_UML_GENERALIZATION_ID = "link_uml_generalization"; //$NON-NLS-1$
-
-	public static final String LINK_UML_INTERFACEREALIZATION_ID = "link_uml_interfacerealization"; //$NON-NLS-1$
-
-	public static final String LINK_UML_USAGE_ID = "link_uml_usage"; //$NON-NLS-1$
-
-	/** Custom link labels */
-	public static final String LINKLABEL_UML_CONNECTOR_LABEL_ID = "linklabel_uml_connector_label"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_NAMEDELEMENT_NAME_ID = "linklabel_uml_namedelement_name"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_APPLIEDSTEREOTYPE_ID = "linklabel_uml_appliedstereotype"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_ASSOCIATION_SOURCE_ROLE_ID = "linklabel_uml_association_source_role"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_ASSOCIATION_SOURCE_MULTIPLICITY_ID = "linklabel_uml_association_source_multiplicity"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_ASSOCIATION_TARGET_ROLE_ID = "linklabel_uml_association_target_role"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_ASSOCIATION_TARGET_MULTIPLICITY_ID = "linklabel_uml_association_target_multiplicity"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID = "linklabel_uml_connector_source_multiplicity"; //$NON-NLS-1$
-
-	public static final String LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID = "linklabel_uml_connector_target_multiplicity"; //$NON-NLS-1$
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
deleted file mode 100644
index 4437e9f5e9c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common;
-
-import java.util.ArrayList;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.uml.internationalization.edit.providers.InternationalizationUMLItemProviderAdapterFactory;
-import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-//import org.eclipse.papyrus.sysml.activities.provider.ActivitiesItemProviderAdapterFactory;
-//import org.eclipse.papyrus.sysml.allocations.provider.AllocationsItemProviderAdapterFactory;
-//import org.eclipse.papyrus.sysml.blocks.provider.BlocksItemProviderAdapterFactory;
-//import org.eclipse.papyrus.sysml.constraints.provider.ConstraintsItemProviderAdapterFactory;
-//import org.eclipse.papyrus.sysml.modelelements.provider.ModelelementsItemProviderAdapterFactory;
-//import org.eclipse.papyrus.sysml.portandflows.provider.PortandflowsItemProviderAdapterFactory;
-//import org.eclipse.papyrus.sysml.requirements.provider.RequirementsItemProviderAdapterFactory;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	/** The Constant ID. */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml.diagram.common"; //$NON-NLS-1$
-
-	/** Shared instance of the plug-in (singleton pattern) */
-	private static Activator plugin;
-
-	/** Logging helper */
-	public static LogHelper log;
-
-	/** The composed adapter factory */
-	private ComposedAdapterFactory adapterFactory;
-
-	/** generic label provider based on EMF facet */
-	private UMLLabelProvider labelProvider;
-
-	/** Default constructor */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the login helper
-		log = new LogHelper(plugin);
-
-		// prepare the composed adapter factory
-		adapterFactory = createAdapterFactory();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		adapterFactory.dispose();
-		adapterFactory = null;
-		if (labelProvider != null) {
-			labelProvider.dispose();
-			labelProvider = null;
-		}
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 *
-	 * @return Shared Preference Store.
-	 */
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-
-	/**
-	 * Get the item provider adapter factory.
-	 *
-	 * @return the adapter factory.
-	 */
-	public AdapterFactory getItemProvidersAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * Get an image descriptor for current item.
-	 *
-	 * @param item
-	 *            the item for which an image descriptor searched.
-	 * @return the image descriptor.
-	 */
-	public ImageDescriptor getItemImageDescriptor(Object item) {
-		IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(item, IItemLabelProvider.class);
-		if (labelProvider != null) {
-			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));
-		}
-		return null;
-	}
-
-	/**
-	 * Get an image for a ENamedElement in plug-in image registry.
-	 *
-	 * @param element
-	 *            the element.
-	 * @return the image.
-	 */
-	public Image getImage(ENamedElement element) {
-
-		String imageKey = element.getName();
-
-		Image image = getImageRegistry().get(imageKey);
-		if (image == null) {
-			ImageDescriptor imageDescriptor = getProvidedImageDescriptor(element);
-			if (imageDescriptor == null) {
-				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-			}
-			getImageRegistry().put(imageKey, imageDescriptor);
-			image = getImageRegistry().get(imageKey);
-		}
-		return image;
-	}
-
-	/**
-	 * <pre>
-	 * Provide a FlowPort image for border edit part that take the border item position
-	 * into account.
-	 *
-	 * The image is not rotated, but predefined.
-	 *
-	 * The side of the image (relatively to the parent figure) can be:
-	 *         <ul>
-	 *         <li>{@linkplain PositionConstants#NORTH}</li>
-	 *         <li> {@linkplain PositionConstants#SOUTH}</li>
-	 *         <li> {@linkplain PositionConstants#EAST}</li>
-	 *         <li> {@linkplain PositionConstants#WEST}</li>
-	 *         <li> {@linkplain PositionConstants#NORTH_EAST}</li>
-	 *         <li> {@linkplain PositionConstants#NORTH_WEST}</li>
-	 *         <li> {@linkplain PositionConstants#SOUTH_EAST}</li>
-	 *         <li> {@linkplain PositionConstants#SOUTH_WEST}</li>
-	 *         </ul>
-	 *
-	 * </pre>
-	 */
-	public Image getFlowPortImage(FlowPort flowport, int side) {
-
-		// Prepare the image key
-		String imageKey = "FlowPort_";
-		if (flowport.isAtomic()) {
-			if (flowport.getDirection() == FlowDirection.IN) {
-				imageKey = imageKey + "IN_";
-			} else if (flowport.getDirection() == FlowDirection.OUT) {
-				imageKey = imageKey + "OUT_";
-			} else if (flowport.getDirection() == FlowDirection.INOUT) {
-				imageKey = imageKey + "INOUT_";
-			}
-
-			imageKey = imageKey + "A_";
-		} else {
-			imageKey = imageKey + "NA_";
-		}
-
-		if (side == PositionConstants.WEST) {
-			imageKey = imageKey + "WEST";
-		} else if (side == PositionConstants.NORTH) {
-			imageKey = imageKey + "NORTH";
-		} else if (side == PositionConstants.SOUTH) {
-			imageKey = imageKey + "SOUTH";
-		} else if (side == PositionConstants.EAST) {
-			imageKey = imageKey + "EAST";
-		} else if (side == PositionConstants.NORTH_WEST) {
-			imageKey = imageKey + "NORTH_WEST";
-		} else if (side == PositionConstants.NORTH_EAST) {
-			imageKey = imageKey + "NORTH_EAST";
-		} else if (side == PositionConstants.SOUTH_EAST) {
-			imageKey = imageKey + "SOUTH_EAST";
-		} else if (side == PositionConstants.SOUTH_WEST) {
-			imageKey = imageKey + "SOUTH_WEST";
-		}
-
-		// Retrieve image from registry or add it in the registry
-		Image image = getImageRegistry().get(imageKey);
-		if (image == null) {
-
-			ImageDescriptor imageDescriptor = imageDescriptorFromPlugin(PLUGIN_ID, "/icons/flowports/" + imageKey + ".gif");
-
-			if (imageDescriptor == null) {
-				imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-			}
-			getImageRegistry().put(imageKey, imageDescriptor);
-			image = getImageRegistry().get(imageKey);
-		}
-
-		return image;
-	}
-
-	/**
-	 * Returns a label provider supported by EMF Facet
-	 *
-	 * @return a label provider supported by EMF Facet
-	 */
-	public ILabelProvider getLabelProvider() {
-		if (labelProvider == null) {
-			// add a generic label provider for sysml elements
-			labelProvider = new UMLLabelProvider();
-		}
-		return labelProvider;
-	}
-
-	/**
-	 * Create a new Composed adapter factory for this plug-in.
-	 */
-	protected ComposedAdapterFactory createAdapterFactory() {
-		ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();
-
-		// Add SysML adapters
-		// factories.add(new ActivitiesItemProviderAdapterFactory());
-		// factories.add(new AllocationsItemProviderAdapterFactory());
-		// factories.add(new BlocksItemProviderAdapterFactory());
-		// factories.add(new ConstraintsItemProviderAdapterFactory());
-		// factories.add(new ModelelementsItemProviderAdapterFactory());
-		// factories.add(new PortandflowsItemProviderAdapterFactory());
-		// factories.add(new RequirementsItemProviderAdapterFactory());
-		// Add UML adapter
-		factories.add(new InternationalizationUMLItemProviderAdapterFactory());
-
-		// Other adapters
-		factories.add(new EcoreItemProviderAdapterFactory());
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-		return new ComposedAdapterFactory(factories);
-	}
-
-	private ImageDescriptor getProvidedImageDescriptor(ENamedElement element) {
-		if (element instanceof EStructuralFeature) {
-			EStructuralFeature feature = ((EStructuralFeature) element);
-			EClass eContainingClass = feature.getEContainingClass();
-			EClassifier eType = feature.getEType();
-			if (eContainingClass != null && !eContainingClass.isAbstract()) {
-				element = eContainingClass;
-			} else if (eType instanceof EClass && !((EClass) eType).isAbstract()) {
-				element = eType;
-			}
-		}
-		if (element instanceof EClass) {
-			EClass eClass = (EClass) element;
-			if (!eClass.isAbstract()) {
-				return getItemImageDescriptor(eClass.getEPackage().getEFactoryInstance().create(eClass));
-			}
-		}
-		// TODO : support structural features
-		return null;
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
deleted file mode 100644
index 600ca083aad..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.commands;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
-import org.eclipse.papyrus.uml.diagram.common.commands.ModelCreationCommandBase;
-import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.UMLFactory;
-
-
-/**
- * The Class CreateSysMLModelCommand.
- */
-public class CreateSysMLModelCommand extends ModelCreationCommandBase {
-
-	/**
-	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
-	 *
-	 * @return
-	 */
-
-	@Override
-	protected EObject createRootElement() {
-		return UMLFactory.eINSTANCE.createModel();
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#initializeModel(org.eclipse.emf.ecore.EObject)
-	 *
-	 * @param owner
-	 */
-
-	@Override
-	protected void initializeModel(EObject owner) {
-		super.initializeModel(owner);
-		((org.eclipse.uml2.uml.Package) owner).setName(getModelName());
-
-		// Retrieve SysML profile and apply with Sub-profile
-		Profile sysml = (Profile) PackageUtil.loadPackage(URI.createURI(SysmlResource.SYSML_PROFILE_URI), owner.eResource().getResourceSet());
-		if (sysml != null) {
-			PackageUtil.applyProfile(((org.eclipse.uml2.uml.Package) owner), sysml, true);
-		}
-	}
-
-	/**
-	 * Gets the model name.
-	 *
-	 * @return the model name
-	 */
-	protected String getModelName() {
-		return "SysMLmodel";
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
deleted file mode 100644
index ec0a181ec6b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
- *  Sebastien Bordes (Esterel Technologies SAS) - Bug 497816
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.strategy.paste;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;
-import org.eclipse.papyrus.infra.core.clipboard.IClipboardAdditionalData;
-import org.eclipse.papyrus.infra.core.clipboard.PapyrusClipboard;
-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.DefaultPasteStrategy;
-import org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Offer a strategy for copying stereotypes.
- */
-public class PartPasteStrategy implements IPasteStrategy {
-
-	/** The instance. */
-	private static IPasteStrategy instance = new PartPasteStrategy();
-
-	/**
-	 * Gets the single instance of StereotypePasteStrategy.
-	 *
-	 * @return single instance of StereotypePasteStrategy
-	 */
-	public static IPasteStrategy getInstance() {
-		return instance;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getLabel()
-	 */
-	@Override
-	public String getLabel() {
-		return "partPasteStrategy"; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getID()
-	 */
-	@Override
-	public String getID() {
-		return Activator.ID + ".partPasteStrategy"; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getDescription()
-	 */
-	@Override
-	public String getDescription() {
-		return "Paste part elements with association"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Gets the category id.
-	 *
-	 * @return the category id
-	 */
-	public String getCategoryID() {
-		return "org.eclipse.papyrus.strategy.paste"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Gets the category label.
-	 *
-	 * @return the category label
-	 */
-	public String getCategoryLabel() {
-		return "Paste all copied elements"; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getImage()
-	 */
-	@Override
-	@Deprecated
-	public Image getImage() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getPriority()
-	 */
-	@Override
-	@Deprecated
-	public int getPriority() {
-		return 1;
-	}
-
-	/**
-	 * Sets the options.
-	 *
-	 * @param options
-	 *            the options
-	 */
-	public void setOptions(Map<String, Object> options) {
-		// Nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getSemanticCommand(org.eclipse.emf.edit.domain.EditingDomain,
-	 * org.eclipse.emf.ecore.EObject, org.eclipse.papyrus.infra.core.clipboard.PapyrusClipboard)
-	 */
-	@Override
-	public org.eclipse.emf.common.command.Command getSemanticCommand(EditingDomain domain, EObject targetOwner, PapyrusClipboard<Object> papyrusClipboard) {
-		if (targetOwner instanceof Classifier || targetOwner instanceof Package) { // test if block or package
-			// get affiliate AdditionnalData
-			Map<Object, ?> additionalDataMap = papyrusClipboard.getAdditionalDataForStrategy(getID());
-			if (additionalDataMap != null) {
-				CompoundCommand compoundCommand = new CompoundCommand("Copy associations for parts"); //$NON-NLS-1$
-				for (Iterator<Object> iterator = papyrusClipboard.iterator(); iterator.hasNext();) {
-					Object object = iterator.next();
-					EObject target = papyrusClipboard.getTragetCopyFromInternalClipboardCopy(object);
-					Object additionnalData = additionalDataMap.get(object);
-					EList<Association> listDuplicatedAssociation = new BasicEList<Association>();
-					EObject associationContainer = null;
-					if (target != null && target instanceof Property && targetOwner instanceof Classifier && additionnalData instanceof PartAdditionalData) { // test if it is a part
-						Classifier block = (Classifier) targetOwner;
-						Property property = (Property) target;
-						PartAdditionalData partAdditionalData = (PartAdditionalData) additionnalData;
-						Association newAssociation = partAdditionalData.getDuplicatedAssociation();
-						restoreAssociationPartContext(block, property, newAssociation);
-						listDuplicatedAssociation.add(newAssociation);
-						associationContainer = block.eContainer();
-					} else if (target != null && target instanceof Classifier && targetOwner instanceof Package && additionnalData instanceof PartBlockAdditionalData) { // test if it is a block
-						Classifier classifier = (Classifier) target;
-						EList<Property> allAttributes = classifier.getAllAttributes();
-						PartBlockAdditionalData partBlockAdditionalData = (PartBlockAdditionalData) additionnalData;
-						for (Property property : allAttributes) {
-							Association duplicatedAssociation = partBlockAdditionalData.getDuplicatedAssociationByPropertyName(property.getName());
-							if (duplicatedAssociation != null) {
-								restoreAssociationPartContext(classifier, property, duplicatedAssociation);
-								listDuplicatedAssociation.add(duplicatedAssociation);
-							}
-						}
-						associationContainer = targetOwner;
-					}
-					if (associationContainer != null && !listDuplicatedAssociation.isEmpty()) {
-						// add associations to the nearest container
-						MoveRequest moveRequest = new MoveRequest(associationContainer, listDuplicatedAssociation);
-						IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetOwner);
-						if (provider != null) {
-							ICommand editCommand = provider.getEditCommand(moveRequest);
-							if (editCommand != null) {
-								GMFtoEMFCommandWrapper gmFtoEMFCommandWrapper = new GMFtoEMFCommandWrapper(editCommand);
-								compoundCommand.append(gmFtoEMFCommandWrapper);
-							}
-						}
-					}
-				}
-				// An empty command can't be executed
-				if (compoundCommand.getCommandList().isEmpty()) {
-					return null;
-				}
-				return compoundCommand;
-			}
-		}
-		return null;
-	}
-
-
-
-
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#getGraphicalCommand(org.eclipse.emf.edit.domain.EditingDomain,
-	 * org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart, org.eclipse.papyrus.infra.core.clipboard.PapyrusClipboard)
-	 */
-	@Override
-	public Command getGraphicalCommand(EditingDomain domain, org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart targetEditPart, PapyrusClipboard<Object> papyrusClipboard) {
-		View targetView = (View) targetEditPart.getModel();
-		EObject targetOwner = targetView.getElement();
-		org.eclipse.emf.common.command.Command semanticCommand = getSemanticCommand(domain, targetOwner, papyrusClipboard);
-		if (semanticCommand != null) {
-			org.eclipse.gef.commands.CompoundCommand compoundCommand = new org.eclipse.gef.commands.CompoundCommand("Association Part Semantic And Graphical paste"); //$NON-NLS-1$
-			EMFtoGEFCommandWrapper emFtoGEFCommandWrapper = new EMFtoGEFCommandWrapper(semanticCommand);
-			compoundCommand.add(emFtoGEFCommandWrapper);
-			return compoundCommand;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#dependsOn()
-	 */
-	@Override
-	public IPasteStrategy dependsOn() {
-		return DefaultPasteStrategy.getInstance();
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy#prepare(org.eclipse.papyrus.infra.core.clipboard.PapyrusClipboard)
-	 */
-	@Override
-	public void prepare(PapyrusClipboard<Object> papyrusClipboard, Collection<EObject> selection) {
-		Map<Object, IClipboardAdditionalData> mapCopyPartData = new HashMap<Object, IClipboardAdditionalData>();
-		for (Iterator<EObject> iterator = papyrusClipboard.iterateOnSource(); iterator.hasNext();) {
-			EObject eObjectSource = iterator.next();
-			if (eObjectSource instanceof Element) {
-				Element elementSource = (Element) eObjectSource;
-				IClipboardAdditionalData clipboardAdditionalData = null;
-				if (elementSource instanceof Property && UMLUtil.getStereotypeApplication(elementSource.getOwner(), Block.class) != null) { // is part
-					Property propertySource = (Property) elementSource;
-					Association association = propertySource.getAssociation();
-					if (association != null) {
-						clipboardAdditionalData = new PartAdditionalData(association);
-					}
-				} else if (elementSource instanceof Classifier && UMLUtil.getStereotypeApplication(elementSource, Block.class) != null) {// is Block
-					Classifier block = (Classifier) elementSource;
-					clipboardAdditionalData = new PartBlockAdditionalData(block);
-				}
-				if (clipboardAdditionalData != null) {
-					Object copy = papyrusClipboard.getCopyFromSource(eObjectSource);
-					mapCopyPartData.put(copy, clipboardAdditionalData);
-				}
-			}
-
-		}
-		papyrusClipboard.pushAdditionalData(getID(), mapCopyPartData);
-	}
-
-
-	/**
-	 * Duplicate the association
-	 *
-	 * @param association
-	 * @return
-	 */
-	protected Association duplicateAssociation(Association association) {
-		EcoreUtil.Copier copier = new EcoreUtil.Copier();
-		copier.copy(association);
-		EObject eObject = copier.get(association);
-		return (Association) eObject;
-	}
-
-	/**
-	 * Init the association in the new context
-	 *
-	 * @param classifier
-	 * @param property
-	 * @param association
-	 */
-	protected void restoreAssociationPartContext(Classifier classifier, Property property, Association association) {
-		EList<Property> memberEnds = association.getMemberEnds(); // should have only one element
-		if (memberEnds != null && !memberEnds.isEmpty()) {
-			Property blockProperty = memberEnds.get(0);
-			blockProperty.setType(classifier);
-		}
-		memberEnds.add(property);
-	}
-
-
-	/**
-	 * The Class PartAdditionalData.
-	 */
-	protected class PartAdditionalData implements IClipboardAdditionalData {
-
-		/** The association. */
-		protected Association asssociation;
-
-		/**
-		 * @param association
-		 */
-		public PartAdditionalData(Association asssociation) {
-			this.asssociation = duplicateAssociation(asssociation);
-		}
-
-		/**
-		 * @return a copy of the association
-		 */
-		public Association getDuplicatedAssociation() {
-			return duplicateAssociation(asssociation);
-		}
-
-	}
-
-	/**
-	 * The Class PartBlockAdditionalData.
-	 */
-	protected class PartBlockAdditionalData implements IClipboardAdditionalData {
-
-		/** The associations by property name. */
-		protected Map<String, Association> mapPropertyNameToAssociation;
-
-		/**
-		 * @param block
-		 */
-		public PartBlockAdditionalData(Classifier block) {
-			this.mapPropertyNameToAssociation = new HashMap<String, Association>();
-			EList<Property> allAttributes = block.getAllAttributes();
-			for (Property property : allAttributes) {
-				Association association = property.getAssociation();
-				Association newAssociation = duplicateAssociation(association);
-				mapPropertyNameToAssociation.put(property.getName(), newAssociation);
-			}
-
-		}
-
-		/**
-		 * @param propertyName
-		 * @return a copy of the association
-		 */
-		public Association getDuplicatedAssociationByPropertyName(String propertyName) {
-			Association association = mapPropertyNameToAssociation.get(propertyName);
-			return duplicateAssociation(association);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/ConstraintBlockHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/ConstraintBlockHelper.java
deleted file mode 100644
index bb21d0c7240..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/ConstraintBlockHelper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.utils;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-public class ConstraintBlockHelper extends ElementHelper {
-
-	public static boolean couldBeConstraintParameter(EObject possibleContraintParameter, EObject ownerConstraintBlock) {
-		if (!(ownerConstraintBlock instanceof org.eclipse.uml2.uml.Class && UMLUtil.getStereotypeApplication((Element) ownerConstraintBlock, ConstraintBlock.class) != null)) {
-			return false;
-		}
-		return UMLUtil.getStereotypeApplication((Element) possibleContraintParameter, ConstraintProperty.class) == null;
-	}
-
-	public static boolean isConstraintParameter(Element element, View view) {
-		if (element instanceof Property) {
-			Property constraintProperty = (Property) element;
-			Element ownerConstraintBlock = constraintProperty.getOwner();
-			if (ownerConstraintBlock instanceof org.eclipse.uml2.uml.Class && UMLUtil.getStereotypeApplication(ownerConstraintBlock, ConstraintBlock.class) != null) {
-				// check for graphics : owned by a constraintProperty
-				if (view != null) {
-					View containerView = ViewUtil.getContainerView(view);
-					Element containerElement = (Element) containerView.getElement();
-					// Owned by a ConstraintProperty
-					if (containerElement instanceof Property
-							&& UMLUtil.getStereotypeApplication(containerElement, ConstraintProperty.class) != null
-							&& ((Property) containerElement).getType() == ownerConstraintBlock) {
-						return true;
-					}
-					// Owned by a ConstraintBlock
-					if (containerElement instanceof org.eclipse.uml2.uml.Class
-							&& UMLUtil.getStereotypeApplication(containerElement, ConstraintBlock.class) != null
-							&& containerElement == ownerConstraintBlock) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-}
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
deleted file mode 100644
index b8a2e6cc40f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLCreateOrShowExistingElementHelper.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *		CEA LIST - Initial API and implementation
- *		Fanch Bonnabesse (ALL4TEC) fanch.bonnabesse@alltec.net - Bug 478288, 419357
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.common.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants;
-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.AssociationUtil;
-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;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Show Existing Link Helper for SysML. This class provides specific management for SysML Association.
- *
- * @author VL222926
- *
- */
-public class SysMLCreateOrShowExistingElementHelper extends CreateOrShowExistingElementHelper {
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 */
-	public SysMLCreateOrShowExistingElementHelper() {
-		super();
-	}
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param linkHelper
-	 */
-	public SysMLCreateOrShowExistingElementHelper(final ILinkMappingHelper linkHelper) {
-		super(linkHelper);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper#getIElementTypeNameToDisplay(org.eclipse.gmf.runtime.emf.type.core.IElementType)
-	 *
-	 * @param elementType
-	 * @return
-	 */
-	@Override
-	protected String getIElementTypeNameToDisplay(final IElementType elementType) {
-		if (SysMLElementTypes.ASSOCIATION_NONE.equals(elementType) || SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.equals(elementType)) {
-			return "Association/DirectAssociation"; //$NON-NLS-1$
-		} else if (SysMLElementTypes.ASSOCIATION_COMPOSITE.equals(elementType) || SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.equals(elementType)) {
-			return "Composition/DirectComposition"; //$NON-NLS-1$
-		} else if (SysMLElementTypes.ASSOCIATION_SHARED.equals(elementType) || SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.equals(elementType)) {
-			return "Aggregation/DirectAggregation"; //$NON-NLS-1$
-		}
-		return super.getIElementTypeNameToDisplay(elementType);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper#hasWantedType(org.eclipse.emf.ecore.EObject, org.eclipse.gmf.runtime.emf.type.core.IElementType)
-	 *
-	 * @param eobject
-	 *            an eobject
-	 * @param wantedType
-	 *            the wanted element type
-	 * @return
-	 * 		true if the eobject is an instance of the wanted element type.
-	 *
-	 *         Add test for SysML Association
-	 */
-	@Override
-	protected boolean hasWantedType(final EObject eobject, final IElementType wantedType) {
-		boolean result = super.hasWantedType(eobject, wantedType);
-		if (result) {
-			if (eobject instanceof Association) {
-				Association association = (Association) eobject;
-				// Skip incomplete associations: it can't be a duplicate of the current link (Which has a source and a target)
-				if (association.getMemberEnds().size() < 2) {
-					return false;
-				}
-
-				final AggregationKind current = getAssociationAggregationKind((Association) eobject);
-				if (current == AggregationKind.NONE_LITERAL) {
-					if (SysMLElementTypes.ASSOCIATION_NONE.equals(current) || SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.equals(wantedType)) {
-						result = true;
-					}
-				} else if (current == AggregationKind.COMPOSITE_LITERAL) {
-					if (SysMLElementTypes.ASSOCIATION_COMPOSITE.equals(current) || SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.equals(wantedType)) {
-						result = true;
-					}
-				} else if (current == AggregationKind.SHARED_LITERAL) {
-					if (SysMLElementTypes.ASSOCIATION_SHARED.equals(current) || SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.equals(wantedType)) {
-						result = true;
-					}
-				} else {
-					result = false;
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 *
-	 * @param association
-	 *            an association
-	 * @return
-	 * 		the association kind for the association
-	 */
-	private static final AggregationKind getAssociationAggregationKind(final Association association) {
-		// Incomplete associations
-		if (association.getMemberEnds().size() < 2) {
-			return AggregationKind.NONE_LITERAL;
-		}
-
-		final Property source = association.getMemberEnds().get(0);
-		final Property target = association.getMemberEnds().get(1);
-
-		if (source.getAggregation() == AggregationKind.NONE_LITERAL && target.getAggregation() == AggregationKind.NONE_LITERAL) {
-			return AggregationKind.NONE_LITERAL;
-		} else if ((source.getAggregation() == AggregationKind.COMPOSITE_LITERAL) || (target.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {
-			return AggregationKind.COMPOSITE_LITERAL;
-		} else {
-			return AggregationKind.SHARED_LITERAL;
-		}
-
-	}
-
-	/**
-	 * @param request
-	 *            the request for the creation
-	 * @param wantedEClass
-	 * @return
-	 * 		a list of {@link EdgeEndsMapper} referencing the existing links between the source and the target
-	 */
-	@Override
-	protected List<LinkEndsMapper> getExistingLinksBetweenSourceAndTarget(final CreateRelationshipRequest request, final IElementType wantedElementType) {
-		List<LinkEndsMapper> existingElement = null;
-
-		final EClass wantedEClass = wantedElementType.getEClass();
-
-		if (UMLPackage.eINSTANCE.getConnector().equals(wantedEClass)) {
-			EList<Element> ownedElements = ((Element) request.getContainer()).getOwnedElements();
-
-			existingElement = new ArrayList<LinkEndsMapper>();
-
-			for (final Element current : ownedElements) {
-				if (hasWantedType(current, wantedElementType)) {
-					final Collection<?> sources = this.linkMappingHelper.getSource(current);
-					final Collection<?> targets = this.linkMappingHelper.getTarget(current);
-
-					if (sources.contains(request.getSource()) && targets.contains(request.getTarget())) {
-						// we verify the nestedPath before to propose to restore a connector
-						View sourceView = (View) request.getParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_SOURCE_VIEW);
-						View targetView = (View) request.getParameter(RequestParameterConstants.EDGE_CREATE_REQUEST_TARGET_VIEW);
-						boolean canBeDisplayed = ConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) current, sourceView, targetView);
-						if (canBeDisplayed) {
-							existingElement.add(new LinkEndsMapper(current, sources, null, null));
-						}
-					}
-				}
-			}
-
-		} else if (UMLPackage.eINSTANCE.getAssociation().equals(wantedEClass)) {
-			final EList<Element> ownedElements = ((Element) request.getContainer()).getOwnedElements();
-
-			existingElement = new ArrayList<LinkEndsMapper>();
-
-			for (final Element current : ownedElements) {
-				if (hasWantedType(current, wantedElementType)) {
-					final Collection<?> sources = this.linkMappingHelper.getSource(current);
-					final Collection<?> targets = this.linkMappingHelper.getTarget(current);
-
-					if (sources.contains(request.getSource()) && targets.contains(request.getTarget()) && (current instanceof Association)) {
-						boolean identicalAssociation = compareMembers(current, request, wantedElementType);
-
-						if (identicalAssociation) {
-							existingElement.add(new LinkEndsMapper(current, sources, null, null));
-						}
-					}
-				}
-			}
-		} else {
-			existingElement = super.getExistingLinksBetweenSourceAndTarget(request, wantedElementType);
-		}
-
-		return existingElement;
-	}
-
-	/**
-	 * Manages all the members of the current relationship to compare with a new relationship.
-	 * 
-	 * @param current
-	 *            The element to compare with the created element.
-	 * @param request
-	 *            The creation relationship request.
-	 * @param wantedElementType
-	 *            The type of the created relationship.
-	 * @return The result of the comparison.
-	 */
-	private boolean compareMembers(final Element current, final CreateRelationshipRequest request, final IElementType wantedElementType) {
-		boolean identicalAssociation = true;
-
-		final Iterator<Property> iterator = ((Association) current).getMemberEnds().iterator();
-
-		while (iterator.hasNext() && identicalAssociation) {
-			final Property property = iterator.next();
-
-			final boolean source = request.getSource().equals(property.getType());
-
-			boolean expectedNavigable = true;
-			AggregationKind expectedAggregation = AggregationKind.NONE_LITERAL;
-
-			// Handle of all types of Association in SysML
-			if (SysMLElementTypes.ASSOCIATION_NONE_DIRECTED.equals(wantedElementType)) {
-				if (source) {
-					expectedNavigable = false;
-				}
-
-				if (!AssociationUtil.isIdenticalProperties(expectedNavigable, expectedAggregation, property)) {
-					identicalAssociation = false;
-				}
-			} else if (SysMLElementTypes.ASSOCIATION_NONE.equals(wantedElementType)) {
-				if (!AssociationUtil.isIdenticalProperties(expectedNavigable, expectedAggregation, property)) {
-					identicalAssociation = false;
-				}
-			} else if (SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED.equals(wantedElementType)) {
-				if (source) {
-					expectedNavigable = false;
-				} else {
-					expectedAggregation = AggregationKind.COMPOSITE_LITERAL;
-				}
-
-				if (!AssociationUtil.isIdenticalProperties(expectedNavigable, expectedAggregation, property)) {
-					identicalAssociation = false;
-				}
-			} else if (SysMLElementTypes.ASSOCIATION_COMPOSITE.equals(wantedElementType)) {
-				if (!source) {
-					expectedAggregation = AggregationKind.COMPOSITE_LITERAL;
-				}
-
-				if (!AssociationUtil.isIdenticalProperties(expectedNavigable, expectedAggregation, property)) {
-					identicalAssociation = false;
-				}
-			} else if (SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.equals(wantedElementType)) {
-				if (source) {
-					expectedNavigable = false;
-				} else {
-					expectedAggregation = AggregationKind.SHARED_LITERAL;
-				}
-
-				if (!AssociationUtil.isIdenticalProperties(expectedNavigable, expectedAggregation, property)) {
-					identicalAssociation = false;
-				}
-			} else if (SysMLElementTypes.ASSOCIATION_SHARED.equals(wantedElementType)) {
-				if (!source) {
-					expectedAggregation = AggregationKind.SHARED_LITERAL;
-				}
-
-				if (!AssociationUtil.isIdenticalProperties(expectedNavigable, expectedAggregation, property)) {
-					identicalAssociation = false;
-				}
-			}
-		}
-
-		return identicalAssociation;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java
deleted file mode 100644
index 0a3c43d485a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLMultiplicityElementUtil.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.papyrus.sysml.diagram.common.utils;

-

-import java.util.Collection;

-

-import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;

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

-

-

-public class SysMLMultiplicityElementUtil extends org.eclipse.papyrus.uml.tools.utils.MultiplicityElementUtil {

-

-	/**

-	 * If multiplicity is [1] (SysML default), only show when explicitly asked.

-	 */

-	public static String formatMultiplicity(MultiplicityElement element, Collection<String> maskValues) {

-		return formatMultiplicity(element, !maskValues.contains(ILabelPreferenceConstants.DISP_DEFAULT_MULTIPLICITY));

-	}

-

-	public static String formatMultiplicity(MultiplicityElement element, boolean blockDefault) {

-		String result = formatMultiplicity(element);

-		return manageDefaultMultiplicity(result, blockDefault);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java
deleted file mode 100644
index fc6b90e4aff..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.common.utils;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.infra.core.resource.NotFoundException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForSelection;
-import org.eclipse.papyrus.sysml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * This class is a Property tester used to check is current model (meaning the model currently opened in Papyrus) is a SysML Model.
- * This class is used in order to create test for deciding whether a diagram creation command should be visible or not.
- * This property tester assumes that currently active editor is Papyrus, it should be used with care (simultaneously with a test to ensure Papyrus is
- * currently opened and active).
- *
- */
-public class SysMLSelectionTester extends PropertyTester {
-
-	/** Tester ID for SysML Model nature. This is currently a test on: is this a blocks profiles package... */
-	public final static String IS_SYSML_MODEL = "isSysMLModel";
-
-	/** Tester ID for SysML Requirements Model nature */
-	public final static String IS_SYSML_REQUIREMENTS_MODEL = "isSysMLRequirementsModel";
-
-	/** Tester ID for SysML Blocks Model nature */
-	public final static String IS_SYSML_BLOCKS_MODEL = "isSysMLBlocksModel";
-
-	/** Default constructor */
-	public SysMLSelectionTester() {
-	}
-
-	/** Test the receiver against the selected property */
-	@Override
-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-
-		// Ensure Papyrus is the active editor
-		Object currentValue = null;
-		if (IS_SYSML_MODEL.equals(property)) {
-			currentValue = testSysMLModelNature(receiver);
-			return (currentValue == expectedValue);
-		} else if (IS_SYSML_BLOCKS_MODEL.equals(property)) {
-			currentValue = testSysMLBlocksModelNature(receiver);
-			return (currentValue == expectedValue);
-		} else if (IS_SYSML_REQUIREMENTS_MODEL.equals(property)) {
-			currentValue = testSysMLRequirementsModelNature(receiver);
-			return (currentValue == expectedValue);
-		}
-
-		return false;
-	}
-
-	/** True is root object is a UML Model with SysML Profile (and sub profiles) applied */
-	protected boolean testSysMLModelNature(Object receiver) {
-		boolean isSysMLModel = false;
-
-		EObject root = getRoot(receiver);
-		if (root instanceof Package) {
-
-			return (((Package) root).getAppliedProfile("SysML") != null);
-
-			// FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
-			//
-			// Profile sysml = UMLUtil.getProfile(SysmlPackage.eINSTANCE, root);
-			// if(((Package)root).isProfileApplied(sysml)) {
-			// isSysMLModel = true;
-			// }
-		}
-
-		return isSysMLModel;
-	}
-
-	/** True is root object is a UML Model with SysML Requirements Profile applied */
-	protected boolean testSysMLRequirementsModelNature(Object receiver) {
-		boolean isSysMLModel = false;
-
-		EObject root = getRoot(receiver);
-		if (root instanceof Package) {
-			return (((Package) root).getAppliedProfile("SysML::Requirements") != null);
-
-			// FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
-			// Profile sysml = UMLUtil.getProfile(RequirementsPackage.eINSTANCE, root);
-			// if(((Package)root).isProfileApplied(sysml)) {
-			// isSysMLModel = true;
-			// }
-		}
-
-		return isSysMLModel;
-	}
-
-	/** True is root object is a UML Model with SysML Blocks Profile applied */
-	protected boolean testSysMLBlocksModelNature(Object receiver) {
-		boolean isSysMLModel = false;
-
-		EObject root = getRoot(receiver);
-		if (root instanceof Package) {
-			return (((Package) root).getAppliedProfile("SysML::Blocks") != null);
-			// FIX: UMLUtil.getProfile() loads the profile into the resource set. This is not desired.
-			// Profile sysml = UMLUtil.getProfile(BlocksPackage.eINSTANCE, root);
-			// if(((Package)root).isProfileApplied(sysml)) {
-			// isSysMLModel = true;
-			// }
-		}
-
-		return isSysMLModel;
-	}
-
-	/** Returns the root EObject of currently opened model */
-	private EObject getRoot(Object receiver) {
-		EObject root = null;
-
-		if (receiver instanceof ISelection) {
-			ISelection selection = (ISelection) receiver;
-			if (selection.isEmpty()) {
-				return null;
-			}
-
-			try {
-				ServiceUtilsForSelection serviceUtils = ServiceUtilsForSelection.getInstance();
-				UmlModel openedModel = (UmlModel) serviceUtils.getModelSet(selection).getModel(UmlModel.MODEL_ID);
-				if (openedModel != null) {
-					root = openedModel.lookupRoot();
-				}
-			} catch (ServiceException e) {
-				// Ignored: The selection cannot be used to retrieve the ServicesRegistry
-			} catch (NotFoundException e) {
-				Activator.log.error(e);
-			}
-		}
-
-		return root;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project
deleted file mode 100644
index 5221c6d2f7b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.diagram.css</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-	</natures>
-</projectDescription>
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
deleted file mode 100644
index ef1ec14b35e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="[1.2.0,2.0.0)";resolution:=optional

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: SysML Css

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.css;singleton:=true

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/build.properties
deleted file mode 100644
index d92dc103be6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = META-INF/,\

-               plugin.xml,\

-               theme/,\

-               about.html

-src.includes = about.html

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/plugin.xml
deleted file mode 100644
index a141d0a594a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.gmfdiag.css.userAgentStyleSheet">

-      <stylesheet

-            stylesheetPath="theme/sysml.css">

-      </stylesheet>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.gmfdiag.css.theme">

-      <themeContribution

-            id="org.eclipse.papyrus.css.papyrus_theme">

-         <stylesheet

-               stylesheetPath="theme/sysml.css">

-         </stylesheet>

-      </themeContribution>

-      <themeContribution

-            id="org.eclipse.papyrus.css.blacknwhite_theme">

-         <stylesheet

-               stylesheetPath="theme/sysml.css">

-         </stylesheet>

-      </themeContribution>

-   </extension>

-</plugin>

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
deleted file mode 100644
index 893b3c0d351..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.diagram.css</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/theme/sysml.css b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/theme/sysml.css
deleted file mode 100644
index 72a3235b660..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/theme/sysml.css
+++ /dev/null
@@ -1,74 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

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

-

-/**

-*	Configures the default visibility for SysML compartments

-*/

-

-BlockDefinitionDiagram Compartment,

-ParametricDiagram Compartment,

-RequirementDiagram Compartment,

-InternalBlockDiagram Compartment{

-	visible: false;

-	showTitle: true;

-}

-

-Compartment[kind=structure]{

-	showTitle: false;

-}

-

-Package > Compartment[kind=packagedElements],

-Model > Compartment[kind=packagedElements]{

-	visible: true;

-	showTitle: false;

-}

-

-[appliedStereotypes~="Block"] > Compartment[kind=properties],

-[appliedStereotypes~="Block"] > Compartment[kind=operations],

-[appliedStereotypes~="Block"] > Compartment[kind=constraints]{

-	visible: true;

-}

-

-[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=parameters],

-[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=constraints]{

-	visible: true;

-}

-

-BlockDefinitionDiagram DataType > Compartment[kind=properties],

-BlockDefinitionDiagram Enumeration > Compartment[kind=literals],

-BlockDefinitionDiagram InstanceSpecification > Compartment[kind=slots],

-BlockDefinitionDiagram Interface > Compartment[kind=properties],

-BlockDefinitionDiagram Interface > Compartment[kind=operations]{

-	visible: true;

-}

-

-

-[appliedStereotypes~="FlowSpecification"] > Compartment[kind=flowproperties]{

-	visible: true;

-}

-

-[appliedStereotypes~="ValueType"] > Compartment[kind=properties],

-[appliedStereotypes~="ValueType"] > Compartment[kind=operations]{

-	visible: true;

-}

-

-InternalBlockDiagram [appliedStereotypes~="Block"] > Compartment[kind=structure],

-InternalBlockDiagram Property > Compartment[kind=structure]{

-	visible: true;

-}

-

-ParametricDiagram Property > Compartment[kind=structure],

-ParametricDiagram [appliedStereotypes~="Block"] > Compartment[kind=structure],

-ParametricDiagram [appliedStereotypes~="ConstraintBlock"] > Compartment[kind=structure]{

-	visible: true;

-}

-

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.classpath b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.classpath
deleted file mode 100644
index ed2585fb3f4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

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

-</classpath>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.project
deleted file mode 100644
index 170079dcb24..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.diagram.internalblock</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/net.sf.jautodoc.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/net.sf.jautodoc.prefs
deleted file mode 100644
index 2bf16756850..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/net.sf.jautodoc.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Aug 19 13:56:13 CEST 2011

-add_header=true

-eclipse.preferences.version=1

-header_text=/*****************************************************************************\r\n * Copyright (c) 2011 CEA LIST.\r\n *\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *\t\t\r\n *\t\tCEA LIST - Initial API and implementation\r\n *\r\n *****************************************************************************/

-project_specific_settings=true

-replace_header=true

-replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 0892dd3cc43..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,
- org.eclipse.papyrus.sysml.diagram.internalblock.compatibility,
- org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper,
- org.eclipse.papyrus.sysml.diagram.internalblock.edit.part,
- org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy,
- org.eclipse.papyrus.sysml.diagram.internalblock.factory,
- org.eclipse.papyrus.sysml.diagram.internalblock.handler,
- org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice,
- org.eclipse.papyrus.sysml.diagram.internalblock.messages,
- org.eclipse.papyrus.sysml.diagram.internalblock.part,
- org.eclipse.papyrus.sysml.diagram.internalblock.preferences,
- org.eclipse.papyrus.sysml.diagram.internalblock.provider,
- org.eclipse.papyrus.sysml.diagram.internalblock.ui,
- org.eclipse.papyrus.sysml.diagram.internalblock.utils
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.internalblock.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.internalblock;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/build.gen.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/build.gen.properties
deleted file mode 100644
index ca6d14e16f2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/build.gen.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/,\
-           src-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               palettes/,\
-               icons/,\
-               about.html,\
-               plugin.properties
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/build.properties
deleted file mode 100644
index 67890b07140..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               palettes/,\
-               about.html,\
-               plugin.properties,\
-               icons/,\
-               messages.properties,\
-               plugin.xml,\
-               model/
-source..=src/,src-gen/
-bin..=bin/
-src.includes = palettes/,\
-               icons/,\
-               messages.properties,\
-               about.html,\
-               src/,\
-               model/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Diagram_InternalBlock.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Diagram_InternalBlock.gif
deleted file mode 100644
index ca02c19d023..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Diagram_InternalBlock.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Link.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Link.gif
deleted file mode 100644
index 13fb22e4bfe..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Link.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/messages.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/messages.properties
deleted file mode 100644
index 66027e54464..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-Notification_Drop_Title=Drop in diagram
-Notification_Drop_UMLAssociationWarning=The Association ({0}) can not be dropped in this diagram because it is not a SysML Association.\nIt was probably not created in a SysML Diagram.
-
-ShowHideRelatedContentsAction_Message=Choose the elements to show
-ShowHideRelatedContentsAction_Title=Show/Hide Related Contents
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/model/SysML.InternalBlock.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/model/SysML.InternalBlock.idgen
deleted file mode 100644
index e6877d492e1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/model/SysML.InternalBlock.idgen
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<idgen:Diagram 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:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="InternalBlock" type="InternalBlock" icon="icons/obj16/Diagram_InternalBlock.gif" label="SysML Internal Block Diagram" language="sysml" javaPackagePrefix="org.eclipse.papyrus.sysml.diagram.internalblock" javaClassPrefix="InternalBlockDiagram" createCommandLabel="Create a new Internal Block Diagram">

-  <diagramEditPart name="Diagram edit part">

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy" key="EditPolicy.LAYOUT_ROLE"/>

-    <behaviors name="" javaClassQualifiedName="org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultCreationEditPolicy" key="EditPolicyRoles.CREATION_ROLE"/>

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultContainerNodeEditPolicy" key="EditPolicy.GRAPHICAL_NODE_ROLE"/>

-    <behaviors name="" javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.ShowHideRelatedLinkEditPolicy" key="ShowHideRelatedLinkEditPolicy"/>

-  </diagramEditPart>

-  <inheritedDiagrams name="CompositeDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy">

-    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#CompositeStructure"/>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.48"/>

-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Constraint"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.27"/>

-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Comment"/>

-    </genNodes>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.43"/>

-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Comment"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.32"/>

-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Constraint"/>

-    </genNodes>

-    <genLinks>

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@links.1"/>

-    </genLinks>

-    <genLinks>

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@links.2"/>

-    </genLinks>

-  </inheritedDiagrams>

-  <customJavaClasses name="" customEditPolicyProvider="org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomEditPolicyProvider" customPreferenceInitializer="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CustomPreferenceInitializer"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_composite"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>

-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_connector"/>

-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_dependency"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_block_name"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#affixedlabel_sysml_flowport_label"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#affixedlabel_uml_appliedstereotype"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#affixedlabel_uml_port_label"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_structure"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_blockproperty_structure"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#label_uml_property_label"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_appliedstereotype"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_connector_label"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_connector_source_multiplicity"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_connector_target_multiplicity"/>

-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_namedelement_name"/>

-  <diagramConfig>

-    <contains xsi:type="idgen:GraphicalTypeDiagramRef">

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_composite"/>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_structure"/>

-        </contains>

-        <contains>

-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>

-          </contains>

-          <contains>

-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_blockproperty_structure"/>

-            <contains>

-              <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>

-            </contains>

-          </contains>

-        </contains>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_dependency"/>

-      </contains>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_connector"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_structure"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>

-      </contains>

-    </contains>

-    <contains>

-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_blockproperty_structure"/>

-      <contains>

-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>

-      </contains>

-    </contains>

-  </diagramConfig>

-</idgen:Diagram>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration
deleted file mode 100644
index 8ff082216e6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.internalblock.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.internalblock Palette" description="This is the palette of PapyrusSysMLInternalBlockDiagram.">

-  <drawerConfigurations id="internalblock.drawer.nodes" label="Nodes">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.port" label="Port" description="Create a new Port">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_in" label="FlowPort (IN)" description="Create a new FlowPort (IN)">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_IN.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_In"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_out" label="FlowPort (OUT)" description="Create a new FlowPort (OUT)">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_OUT.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_Out"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_inout" label="FlowPort (INOUT)" description="Create a new FlowPort (INOUT)">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_INOUT.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_InOut"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_na" label="FlowPort (Non Atomic)" description="Create a new FlowPort (Non Atomic)">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_NA.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_NA"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.property" label="Property" description="Create a new Property">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.part" label="Part" description="Create a new Part">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.PartProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.reference" label="Reference" description="Create a new Reference">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ReferenceProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.actorpart" label="ActorPart" description="Create a new ActorPart">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ActorPartProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.value" label="Value" description="Create a new Value">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ValueProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.comment" label="Comment" description="Create a new Comment">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.constraint" label="Constraint" description="Create a new Constraint">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="internalblock.drawer.edges" label="Edges">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.connector" label="Connector" description="Create a new Connector" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.comment_constraint_link" label="Comment / Constraint link" description="Create a new Comment / Constraint link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-</paletteconfiguration:PaletteConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/internalblock.palette.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/internalblock.palette.gen.xml
deleted file mode 100644
index 0970689f057..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/internalblock.palette.gen.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.internalblock.SYSML_InternalBlock__Tools" name="Tools">
-			<aspectTool description="Create a new BlockComposite" id="internalblock.tool.blockcomposite"
-				name="BlockComposite" refToolId="internalblock.tool.blockcomposite">
-			</aspectTool>
-			<aspectTool description="Create a new BlockPropertyComposite" id="internalblock.tool.blockpropertycomposite"
-				name="BlockPropertyComposite" refToolId="internalblock.tool.blockpropertycomposite">
-			</aspectTool>
-			<aspectTool description="Create a new FlowPort" id="internalblock.tool.flowport"
-				name="FlowPort" refToolId="internalblock.tool.flowport">
-			</aspectTool>
-			<aspectTool description="Create a new Port" id="internalblock.tool.port"
-				name="Port" refToolId="internalblock.tool.port">
-			</aspectTool>
-			<aspectTool description="Create a new Connector" id="internalblock.tool.connector"
-				name="Connector" refToolId="internalblock.tool.connector">
-			</aspectTool>
-			<aspectTool description="Create a new Dependency" id="internalblock.tool.dependency"
-				name="Dependency" refToolId="internalblock.tool.dependency">
-			</aspectTool>
-			
-			<aspectTool description="Create a new Comment" id="internalblock.tool.comment"
-				name="Comment" refToolId="composite.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="internalblock.tool.constraint"
-				name="Constraint" refToolId="composite.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new CommentAnnotatedElement" id="internalblock.tool.commentannotatedelement"
-				name="CommentAnnotatedElement" refToolId="composite.tool.link">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintConstrainedElement" id="internalblock.tool.constraintconstrainedelement"
-				name="ConstraintConstrainedElement" refToolId="composite.tool.link">
-			</aspectTool>
-			
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/internalblock.palette.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/internalblock.palette.xml
deleted file mode 100644
index a9fff2e2596..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/internalblock.palette.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<paletteDefinition>

-<content>

-

-	<drawer id="internalblock.drawer.nodes" name="Nodes" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-

-		<aspectTool description="Create a new Port" id="internalblock_main.tool.port"

-			name="Port" refToolId="internalblock.tool.port">

-		</aspectTool>

-		<aspectTool description="Create a new FlowPort (IN)" id="internalblock_main.tool.flowport_in"

-			name="FlowPort (IN)" refToolId="internalblock.tool.flowport_in">

-		</aspectTool>

-		<aspectTool description="Create a new FlowPort (OUT)" id="internalblock_main.tool.flowport_out"

-			name="FlowPort (OUT)" refToolId="internalblock.tool.flowport_out">

-		</aspectTool>

-		<aspectTool description="Create a new FlowPort (INOUT)" id="internalblock_main.tool.flowport_inout"

-			name="FlowPort (INOUT)" refToolId="internalblock.tool.flowport_inout">

-		</aspectTool>

-		<aspectTool description="Create a new FlowPort (Non Atomic)" id="internalblock_main.tool.flowport_na"

-			name="FlowPort (Non Atomic)" refToolId="internalblock.tool.flowport_na">

-		</aspectTool>

-		<aspectTool description="Create a new Property" id="internalblock_main.tool.property"

-			name="Property" refToolId="internalblock.tool.property">

-		</aspectTool>

-		<aspectTool description="Create a new Part" id="internalblock_main.tool.part"

-			name="Part" refToolId="internalblock.tool.part">

-		</aspectTool>

-		<aspectTool description="Create a new Reference" id="internalblock_main.tool.reference"

-			name="Reference" refToolId="internalblock.tool.reference">

-		</aspectTool>

-		<aspectTool description="Create a new ActorPart" id="internalblock_main.tool.actorpart"

-			name="ActorPart" refToolId="internalblock.tool.actorpart">

-		</aspectTool>

-		<aspectTool description="Create a new Value" id="internalblock_main.tool.value"

-			name="Value" refToolId="internalblock.tool.value">

-		</aspectTool>

-

-		<aspectTool name="Comment" id="internalblock_main.tool.comment" refToolId="internalblock.tool.comment" description="Create a new Comment" />

-		<aspectTool name="Constraint" id="internalblock_main.tool.constraint" refToolId="internalblock.tool.constraint" description="Create a new Constraint" />

-		

-	</drawer>

-	

-	

-	<drawer id="internalblock.drawer.edges" name="Edges" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-	

-		<aspectTool description="Create a new Connector" id="internalblock_main.tool.connector"

-			name="Connector" refToolId="internalblock.tool.connector">

-		</aspectTool>

-		<aspectTool description="Create a new Dependency" id="internalblock_main.tool.dependency"

-			name="Dependency" refToolId="internalblock.tool.dependency">

-		</aspectTool>

-		<aspectTool description="Create a new Comment / Constraint link" id="internalblock_main.tool.comment_constraint_link"

-			name="Comment / Constraint link" refToolId="internalblock.tool.comment_constraint_link">

-		</aspectTool>

-	</drawer>

-	

-</content>

-</paletteDefinition>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml
deleted file mode 100644
index 98ed6ac30c5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.gen.xml
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.core.papyrusDiagram">
-	<creationCommand
-		creationCommandClass="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCreateCommand"
-		icon="icons/obj16/Diagram_InternalBlock.gif"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand"
-		language="sysml"
-		label="Internal Block Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramEditorFactory"
-		icon="icons/obj16/Diagram_InternalBlock.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand"
-		name="Create a new Internal Block Diagram"
-		description="Create a new Internal Block Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCreateCommand"
-		commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand">
-		<activeWhen>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.core.papyrusEditor" />
-			</with>
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- Diagram creation command registration in menu and toolbar -->
-<extension point="org.eclipse.ui.menus">
-
-	<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
-	<menu id="org.eclipse.papyrus.diagram.ui.menu.diagrams" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand"
-			icon="icons/obj16/Diagram_InternalBlock.gif" label="Create a new Internal Block Diagram"
-			style="push" tooltip="Create a new Internal Block Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-					
-		</command>
-	</menu>
-	</menuContribution>
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.papyrus.diagram.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand"
-			icon="icons/obj16/Diagram_InternalBlock.gif" label="Create a new Internal Block Diagram"
-			style="push" tooltip="Create a new Internal Block Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand"
-			icon="icons/obj16/Diagram_InternalBlock.gif"
-			label="Create a new Internal Block Diagram"
-			style="push"
-			tooltip="Create a new Internal Block Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"
-	name="SYSML_InternalBlock_Predefined_Entries"
-	id="org.eclipse.papyrus.sysml.diagram.blockdefinition.palettedefinition"> 
-		
-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-	<Priority name="Lowest"/> <!-- Lower priority than Palette tool declaration -->
-	
-	<!-- SysML Internal Block Diagram specific tool definition -->
-	<contribution
-		factoryClass="org.eclipse.papyrus.sysml.diagram.internalblock.factory.DiagramPaletteFactory">
-			
-		<!-- internalblock.tool.blockcomposite -->
-		<entry
-			defineOnly="true"
-			description="Create a BlockComposite"
-			id="internalblock.tool.blockcomposite"
-			kind="tool"
-			label="BlockComposite"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif">
-		</entry>
-			
-		<!-- internalblock.tool.blockpropertycomposite -->
-		<entry
-			defineOnly="true"
-			description="Create a BlockPropertyComposite"
-			id="internalblock.tool.blockpropertycomposite"
-			kind="tool"
-			label="BlockPropertyComposite"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-		</entry>
-			
-		<!-- internalblock.tool.flowport -->
-		<entry
-			defineOnly="true"
-			description="Create a FlowPort"
-			id="internalblock.tool.flowport"
-			kind="tool"
-			label="FlowPort"
-			large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"
-			small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif">
-		</entry>
-			
-		<!-- internalblock.tool.port -->
-		<entry
-			defineOnly="true"
-			description="Create a Port"
-			id="internalblock.tool.port"
-			kind="tool"
-			label="Port"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
-		</entry>
-		<!-- Start of user code Custom node button entry
-		-->
-		
-		<!-- End of user code  -->
-		
-			
-		<!-- internalblock.tool.connector -->
-		<entry
-			defineOnly="true"
-			description="Create a Connector"
-			id="internalblock.tool.connector"
-			kind="tool"
-			label="Connector"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
-		</entry>
-			
-		<!-- internalblock.tool.dependency -->
-		<entry
-			defineOnly="true"
-			description="Create a Dependency"
-			id="internalblock.tool.dependency"
-			kind="tool"
-			label="Dependency"
-			large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-			small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-		</entry>
-		<!-- Start of user code Custom edge button entry
-		-->
-			
-		<!-- End of user code  -->
-			
-	</contribution>
-	
-	<!-- Specify diagram this palette tools relate to -->				
-	<editor id="org.eclipse.papyrus.sysml.diagram.internalblock"/>
-	
-	</paletteProvider>	
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
-	name="SYSML_InternalBlock">
-	
-	<paletteDefinition ID="SYSML_InternalBlock"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="SYSML_InternalBlock" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/internalblock.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.sysml.diagram.internalblock"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InternalBlockDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="InternalBlock"/>
-	</viewProvider>
-	
-	<!-- Custom graphical types view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomViewProvider">
-		<Priority name="Medium"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="SysML::ReferenceProperty, SysML::FlowPort_In, UML::Port, SysML::FlowPort_Out, SysML::PartProperty, SysML::FlowPort_InOut, SysML::FlowPort, SysML::Block"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="shape_sysml_flowport_as_affixed, shape_sysml_block_as_composite, shape_uml_port_as_affixed, shape_sysml_blockproperty_as_composite"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="UML::Dependency, UML::Connector"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="link_uml_connector, link_uml_dependency"/>
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Class" -->
-		<object id="uml.Class" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Class"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Class"/>			
-		
-		<!-- "uml.Port" -->
-		<object id="uml.Port" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Port"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Port"/>			
-		
-		<!-- "uml.Property" -->
-		<object id="uml.Property" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Property"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Property"/>			
-		
-		<!-- "uml.Connector" -->
-		<object id="uml.Connector" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Connector"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Connector"/>			
-		
-		<!-- "uml.Dependency" -->
-		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Dependency"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Dependency"/>			
-		
-	</viewProvider>	
-
-	<!-- ViewProvider for inherited elements (from CompositeDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InheritedCompositeDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Constraint_Shape, Comment_Shape_CN, Comment_Shape, Constraint_Shape_CN"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"/>
-		</object>
-		
-		<!-- "uml.Comment" -->
-		<object id="uml.Comment" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Comment"/>
-		</object>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Constraint, uml.Comment"/>
-			
-	</viewProvider>	
-</extension>
-
-<!-- Diagram edit part providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">	
-	<!-- Diagram edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InternalBlockDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.sysml.diagram.internalblock.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="InternalBlock"/>
-		</object>
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.Diagram"/>	
-	</editpartProvider>
-	
-	<!-- Custom graphical types edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomEditPartProvider">
-		<Priority name="Medium"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.internalblock.CustomNodeGraphicalTypes">
-			<method name="getType()" value="shape_sysml_flowport_as_affixed, shape_sysml_block_as_composite, shape_uml_port_as_affixed, shape_sysml_blockproperty_as_composite"/>
-		</object>
-		
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.internalblock.CustomGraphicalTypes_Decorations">
-			<method name="getType()" value="linklabel_uml_connector_target_multiplicity, label_uml_property_label, linklabel_uml_appliedstereotype, label_sysml_block_name, compartment_sysml_structure, affixedlabel_uml_port_label, linklabel_uml_connector_source_multiplicity, linklabel_uml_namedelement_name, linklabel_uml_connector_label, compartment_sysml_blockproperty_structure, affixedlabel_uml_appliedstereotype, affixedlabel_sysml_flowport_label"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.CustomNodeGraphicalTypes"/>
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.CustomGraphicalTypes_Decorations"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Edge(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.internalblock.CustomEdgeGraphicalTypes">
-			<method name="getType()" value="link_uml_connector, link_uml_dependency"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.CustomEdgeGraphicalTypes"/>
-		
-	</editpartProvider>
-	
-	<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InheritedCompositeDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_BodyLabel_CN"/>
-		</object>
-		
-		
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Comment_AnnotatedElementEdge"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Constraint_ConstrainedElementEdge"/>
-		</object>
-		
-		<context views="CONSTRAINT, COMMENT_CN, COMMENT, CONSTRAINT_CN"/>
-		<context views="COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"/>
-		
-	</editpartProvider>
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomEditPolicyProvider">
-		<Priority name="Low"/>
-	</editpolicyProvider>
-</extension>
-
-<!-- Preference pages declaration -->
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-
-	<!-- Diagram Preference pages declaration -->
-	<page
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		name="InternalBlock Diagram"
-		category="org.eclipse.papyrus.preferences.diagrams"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.InternalBlockDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintConstrainedElementPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintConstrainedElementPreferencePage"
-		name="ConstraintConstrainedElement">
-	</page>
-	
-	
-
-
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockCompositePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockCompositePreferencePage"
-		name="BlockComposite">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockPropertyCompositePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockPropertyCompositePreferencePage"
-		name="BlockPropertyComposite">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.FlowPortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.FlowPortPreferencePage"
-		name="FlowPort">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.PortPreferencePage"
-		name="Port">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConnectorPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConnectorPreferencePage"
-		name="Connector">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.DependencyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.DependencyPreferencePage"
-		name="Dependency">
-	</page>
-		
-
-</extension>
-
-<!-- // Start of user code custom extensions 
-  -->
-
-<!-- Insert custom extensions here. -->
-
-<!-- 
-	Handler declaration for the Interface Manager Command. 
-	The handler is enabled only if the selected element is a Port (excluding FlowPort) in an InternalBlockDiagram.
-  -->
-<extension point="org.eclipse.ui.handlers">
-
-	<handler commandId="org.eclipse.papyrus.uml.diagram.composite.command.manage.interfaces"
-		class="org.eclipse.papyrus.uml.diagram.composite.custom.actions.ManageProvidedInterfacesHandler">
-		<activeWhen>
-		<and>
-			<with variable="selection">
-			<iterate>
-				<instanceof value="org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart"/>
-			</iterate>
-			</with>
-			
-			<with variable="activeEditor">
-			<test property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType" value="InternalBlock" forcePluginActivation="true"/>
-			</with>
-			
-			<with variable="selection">
-			<test property="org.eclipse.papyrus.uml.diagram.internalblock.tester.selection.isFlowPort" value="false" forcePluginActivation="true"/>              
-			</with>
-		</and>
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- 
-	Add a property tester for this diagram. 
-	The tested properties allow to enable/disable handlers for commands .
-  -->
-<extension point="org.eclipse.core.expressions.propertyTesters">
-	<propertyTester id="org.eclipse.papyrus.uml.diagram.internalblock.tester.selection" type="org.eclipse.jface.viewers.ISelection"
-		namespace="org.eclipse.papyrus.uml.diagram.internalblock.tester.selection" properties="isFlowPort"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.utils.InternalBlockDiagramTester">
-	</propertyTester>
-</extension>
-
-<!-- // End of user code 
-  -->
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.properties
deleted file mode 100644
index 04f44d4310b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.properties
+++ /dev/null
@@ -1,12 +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:
-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
-##################################################################################
-pluginName=SysML Internal Block Diagram
-providerName=Eclipse Modeling Project
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
deleted file mode 100644
index 1ce2200cd9b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-<!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-	<creationCommand creationCommandClass="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCreateCommand" creationCondition="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCondition" icon="icons/obj16/Diagram_InternalBlock.gif" id="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" language="sysml" label="Internal Block Diagram"></creationCommand>
-	<editorDiagram actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor" factoryClass="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramEditorFactory" icon="icons/obj16/Diagram_InternalBlock.gif"></editorDiagram>
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" name="Create a new Internal Block Diagram" description="Create a new Internal Block Diagram" categoryId="org.eclipse.papyrus.editor.category"></command>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InternalBlockDiagramViewProvider">
-		<Priority name="Low"></Priority>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="InternalBlock"></context>
-	</viewProvider>
-
-	<!-- Custom graphical types view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomViewProvider">
-		<Priority name="Medium"></Priority>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Property, SysML::ActorPartProperty, SysML::ValueProperty, SysML::ReferenceProperty, SysML::FlowPort_In, UML::Port, SysML::FlowPort_Out, SysML::PartProperty, SysML::FlowPort_InOut, SysML::FlowPort, SysML::Block, SysML::FlowPort_NA"></context>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="shape_sysml_flowport_as_affixed, shape_sysml_block_as_composite, shape_uml_port_as_affixed, shape_sysml_blockproperty_as_composite, compartment_sysml_blockproperty_structure"></context>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="UML::Dependency, UML::Connector"></context>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="link_uml_connector, link_uml_dependency"></context>
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Class" -->
-		<object id="uml.Class" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Class"></method>
-		</object>
-		<context
-        elements="uml.Class"
-        viewClass="org.eclipse.gmf.runtime.notation.Node"></context>			
-		
-		<!-- "uml.Port" -->
-		<object id="uml.Port" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Port"></method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="uml.Port"></context>			
-		
-		<!-- "uml.Property" -->
-		<object id="uml.Property" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Property"></method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"  elements="uml.Property"></context>			
-		
-		<!-- "uml.Connector" -->
-		<object id="uml.Connector" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Connector"></method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="uml.Connector"></context>			
-		
-		<!-- "uml.Dependency" -->
-		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Dependency"></method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="uml.Dependency"></context>
- 
- 
- 	 <object id="elementtype.node"
-        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-       
-     <method
-           name="getSemanticHint()"
-           value="UML::Property, SysML::ActorPartProperty, SysML::ValueProperty, SysML::ReferenceProperty, SysML::FlowPort_In, UML::Port, SysML::FlowPort_Out, SysML::PartProperty, SysML::FlowPort_InOut, SysML::FlowPort, SysML::Block, SysML::FlowPort_NA">
-     </method>
-  </object>
-  <context
-        elements="elementtype.node"
-        viewClass="org.eclipse.gmf.runtime.notation.Node">
-  </context>
-  <object id="elementtype.edge"
-        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-     <method
-           name="getSemanticHint()"
-           value="UML::Dependency, UML::Connector">
-     </method>
-  </object>
-  <context
-        elements="elementtype.edge"
-        viewClass="org.eclipse.gmf.runtime.notation.Edge">
-  </context>			
-		
-	</viewProvider>	
-
-	<!-- ViewProvider for inherited elements (from CompositeDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InheritedCompositeDiagramViewProvider">
-		<Priority name="Low"></Priority>
-		
-		<!-- Load the ViewProvider on following SemanticHint related to IElementType(s) used in the palette (also used for legacy elements) -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Comment, UML::Constraint"></context>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"></context>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"></context>
-        
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-        <!-- "uml.Comment" -->
-		<object id="uml.Comment" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Comment"></method>
-		</object>
-
-        <!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"></method>
-		</object>
-
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="uml.Comment, uml.Constraint"></context>
-			
-	</viewProvider>
-	
-</extension>
-
-<!-- Diagram edit part providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-
-	<!-- Diagram edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InternalBlockDiagramEditPartProvider">
-		<Priority name="Low"></Priority>
-		<object id="org.eclipse.papyrus.sysml.diagram.internalblock.Diagram" class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="InternalBlock"></method>
-		</object>
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.Diagram"></context>	
-	</editpartProvider>
-	
-	<!-- Custom graphical types edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomEditPartProvider">
-		<Priority name="Medium"></Priority>
-	
-		<object class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)" id="org.eclipse.papyrus.sysml.diagram.internalblock.CustomNodeGraphicalTypes">
-			<method name="getType()" value="shape_sysml_flowport_as_affixed, shape_sysml_block_as_composite, shape_uml_port_as_affixed, shape_sysml_blockproperty_as_composite"></method>
-		</object>
-		
-		<object class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)" id="org.eclipse.papyrus.sysml.diagram.internalblock.CustomGraphicalTypes_Decorations">
-			<method name="getType()" value="linklabel_uml_connector_target_multiplicity, label_uml_property_label, linklabel_uml_appliedstereotype, label_sysml_block_name, compartment_sysml_structure, affixedlabel_uml_port_label, linklabel_uml_connector_source_multiplicity, linklabel_uml_namedelement_name, linklabel_uml_connector_label, compartment_sysml_blockproperty_structure, affixedlabel_uml_appliedstereotype, affixedlabel_sysml_flowport_label"></method>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.CustomNodeGraphicalTypes"></context>
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.CustomGraphicalTypes_Decorations"></context>
-	
-		<object class="org.eclipse.gmf.runtime.notation.Edge(org.eclipse.gmf.runtime.notation)" id="org.eclipse.papyrus.sysml.diagram.internalblock.CustomEdgeGraphicalTypes">
-			<method name="getType()" value="link_uml_connector, link_uml_dependency"></method>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.internalblock.CustomEdgeGraphicalTypes"></context>
-		
-	</editpartProvider>
-	
-	<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InheritedCompositeDiagramEditPartProvider">
-		<Priority name="Low"></Priority>
-		
-		<object id="COMMENT" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape, Comment_BodyLabel"></method>
-		</object>
-		<object id="COMMENT_CN" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"></method>
-		</object>
-		<object id="CONSTRAINT" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"></method>
-		</object>
-		<object id="CONSTRAINT_CN" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_BodyLabel_CN"></method>
-		</object>
-
-		<object id="COMMENT_ANNOTATED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Comment_AnnotatedElementEdge"></method>
-		</object>
-		<object id="CONSTRAINT_CONSTRAINED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Constraint_ConstrainedElementEdge"></method>
-		</object>
-
-		<context views="COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"></context>
-		<context views="COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"></context>
-		
-	</editpartProvider>
-	
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomEditPolicyProvider">
-		<Priority name="Low"></Priority>
-	</editpolicyProvider>
-</extension>
-
-<!-- Preference pages declaration -->
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-
-	<!-- Diagram Preference pages declaration -->
-	<page id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" name="Internal Block Diagram" category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.InternalBlockDiagramGeneralPreferencePage">
-	</page>
-
-</extension>
-
-<!-- // Start of user code custom extensions 
-  -->
-
-<!-- Insert custom extensions here. -->
-
-
-
-<!-- 
-	Handler declaration for the Interface Manager Command. 
-	The handler is enabled only if the selected element is a Port (excluding FlowPort) in an InternalBlockDiagram.
-  -->
-<extension point="org.eclipse.ui.handlers">
-
-	<handler commandId="org.eclipse.papyrus.sysml.diagram.internalblock.command.manage.interfaces" class="org.eclipse.papyrus.sysml.diagram.internalblock.handler.InternalBlockManageInterfacesHandler">
-		<activeWhen>
-		<and>
-			<with variable="selection">
-			<iterate>
-				<instanceof value="org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart"></instanceof>
-			</iterate>
-			</with>
-			
-			<with variable="activeEditor">
-			<test property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType" value="InternalBlock" forcePluginActivation="true"></test>
-			</with>
-			
-			<with variable="selection">
-			<test property="org.eclipse.papyrus.sysml.diagram.internalblock.tester.selection.isFlowPort" value="false" forcePluginActivation="true"></test>              
-			</with>
-		</and>
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- 
-	Add a property tester for this diagram. 
-	The tested properties allow to enable/disable handlers for commands .
-  -->
-<extension point="org.eclipse.core.expressions.propertyTesters">
-	<propertyTester id="org.eclipse.papyrus.sysml.diagram.internalblock.tester.selection" type="org.eclipse.jface.viewers.ISelection" namespace="org.eclipse.papyrus.sysml.diagram.internalblock.tester.selection" properties="isFlowPort" class="org.eclipse.papyrus.sysml.diagram.internalblock.utils.InternalBlockDiagramTester">
-	</propertyTester>
-</extension>
-
-<!-- The Command to manages the Provided and Required Interfaces for a Port-->
-<extension point="org.eclipse.ui.commands">
-	<command categoryId="org.eclipse.papyrus.editor.category" id="org.eclipse.papyrus.sysml.diagram.internalblock.command.manage.interfaces" name="Manage Provided Interfaces" description="Allows to manage easily provided Interfaces for a Port">
-	</command>
-</extension>
-
-<!-- Add the Menu to manages the Provided and Required Interfaces for a Port-->
-<extension point="org.eclipse.ui.menus">
-	<menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?endof=editMenu" allPopups="false">
-	<command commandId="org.eclipse.papyrus.sysml.diagram.internalblock.command.manage.interfaces" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif" id="org.eclipse.papyrus.sysml.diagram.internalblock.popup.interface.manage.interface" label="Manage Interfaces" mnemonic="&amp;I" style="push" tooltip="The command to manage the interfaces provided and required by a Port">
-		<!-- The action is visible only if there is an active handler for it  -->
-		<visibleWhen checkEnabled="true"></visibleWhen>
-	</command>
-	</menuContribution>
-</extension>
-
-<!-- Parser provider declaration -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
-	<ParserProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.ParserProvider">
-		<Priority name="Low"></Priority>
-	</ParserProvider>
-</extension>
-
-<!-- Diagram specific advices -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-
-	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-
-	<!-- Property specific advices (remove inconsistent views when a Property type is set) -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.internalblock.PropertyHelperAdvice" class="org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice.PropertyHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.Property">
-	</adviceBinding>
-	
-	<!-- Delete moved views advice -->		
-	<adviceBinding id="org.eclipse.papyrus.sysml.diagram.internalblock.DeleteViewDuringMoveHelperAdvice" class="org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice.DeleteViewDuringMoveHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.Element">
-	</adviceBinding>
-				
-	</metamodel>
-</extension>
-
-<!-- UML ElementType bindings to Papyrus shared IClientContext -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-
-	<!-- Bindings declaration to shared IClientContext -->
-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">	
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.internalblock.PropertyHelperAdvice"></elementType>
-		<elementType ref="org.eclipse.papyrus.sysml.diagram.internalblock.DeleteViewDuringMoveHelperAdvice"></elementType>
-	</binding>
-		
-</extension>
-
-<!-- Service for Show/Hide content on Part or Ref. -->
-<extension point="org.eclipse.ui.services">
-	<sourceProvider provider="org.eclipse.papyrus.sysml.diagram.internalblock.provider.ActionStateSourceProvider">
-		<variable name="showHideRelatedContents" priorityLevel="workbench"></variable>
-	</sourceProvider>
-</extension>
-
-<!-- Handler for Show/Hide content on Part or Ref. -->
-<extension point="org.eclipse.ui.handlers">
-	<handler class="org.eclipse.papyrus.sysml.diagram.internalblock.handler.ShowHideRelatedContentsHandler" commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand">
-		<activeWhen>
-		<and>
-			<with variable="activeEditor">
-				<test property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType" value="InternalBlock" forcePluginActivation="true"></test>
-			</with>	
-			<with variable="showHideRelatedContents">
-				<equals value="enabled"></equals>
-			</with>
-			<with variable="selection">
-				<iterate ifEmpty="false" operator="and">
-					<instanceof value="org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomBlockCompositeEditPartTN"></instanceof>
-				</iterate>
-			</with>
-		</and>
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- Validation markers declaration -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-	<MarkerNavigationProvider class="org.eclipse.papyrus.gmf.diagram.common.provider.MarkerNavigationProvider">
-		<MarkerType name="org.eclipse.papyrus.sysml.diagram.internalblock.diagnostic"></MarkerType>
-		<Priority name="Lowest"></Priority>
-	</MarkerNavigationProvider>
-</extension>
-
-<extension id="diagnostic" name="Internal Block Diagram  problems" point="org.eclipse.core.resources.markers">
-	<super type="org.eclipse.core.resources.problemmarker"></super>
-	<super type="org.eclipse.gmf.runtime.common.ui.services.marker"></super>
-	<persistent value="true"></persistent>
-</extension>
-
-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-	<decoratorProvider class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.ValidationDecoratorProvider">
-		<Priority name="Lowest"></Priority>
-		<object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"></object>
-		<context decoratorTargets="PRIMARY_VIEW"></context>
-	</decoratorProvider>
-</extension>
-
-
-
-<!-- // End of user code 
-  -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
-   <diagramMappings diagramID="InternalBlock">
-      <mapping type="InternalBlock" humanReadableType="InternalBlockDiagram"/>
-      <!-- Compartments -->
-      <mapping
-             humanReadableType="structure"
-             type="compartment_sysml_structure">
-      </mapping>
-      
-      <mapping
-             humanReadableType="structure"
-             type="compartment_sysml_blockproperty_structure">
-      </mapping>
-   
-                      <!-- Link labels -->
-
-      <mapping
-             humanReadableType="Name"
-             type="affixedlabel_sysml_flowport_label">
-      </mapping>
-      
-      <mapping
-             humanReadableType="Stereotype"
-             type="affixedlabel_uml_appliedstereotype">
-      </mapping>
-      
-      <mapping
-             humanReadableType="Label"
-             type="affixedlabel_uml_port_label">
-      </mapping>
-   
-      <mapping
-             humanReadableType="Stereotype"
-             type="linklabel_uml_appliedstereotype">
-      </mapping>
-      
-      <mapping
-             humanReadableType="Name"
-             type="linklabel_uml_connector_label">
-      </mapping>
-      
-      <mapping
-             humanReadableType="SourceMultiplicity"
-             type="linklabel_uml_connector_source_multiplicity">
-      </mapping>
-      
-      <mapping
-             humanReadableType="TargetMultiplicity"
-             type="linklabel_uml_connector_target_multiplicity">
-      </mapping>
-      
-      <mapping
-             humanReadableType="Name"
-             type="linklabel_uml_namedelement_name">
-      </mapping>
-   
-          </diagramMappings>
-   </extension>
- 
-<extension id="org.eclipse.papyrus.sysml.diagram.internalblock.migration" name="InternalBlockMigration" point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
-   <diagramReconciler
-         diagramType="InternalBlock"
-         reconcilerClass="org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilerUndefinedTo100"
-         source="undefined"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="InternalBlock"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_1_0"
-         source="1.0.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="InternalBlock"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="InternalBlock"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-</extension>
-
-   <extension
-         point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
-      <visualTypeProvider
-            class="org.eclipse.papyrus.sysml.diagram.internalblock.provider.InternalBlockVisualTypeProvider"
-            diagramType="InternalBlock">
-      </visualTypeProvider>
-   </extension>
-
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<paletteDefinition
-		ID="org.eclipse.papyrus.sysml.diagram.internalblock.paletteconfiguration"
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="Papyrus SysML internalblock editor Plugin Palette" 
-		path="palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram this palette tools relate to -->
-		<editor
-			id="org.eclipse.papyrus.sysml.diagram.internalblock">
-		</editor>
-	</paletteDefinition>
-</extension>
-</plugin>
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
deleted file mode 100644
index 1d33d60bd02..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-	    <artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.sysml.diagram.internalblock</artifactId>

-	<version>3.0.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/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/Activator.java
deleted file mode 100644
index ecd22df38f2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/Activator.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CustomPreferenceInitializer;
-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.sysml.diagram.internalblock";
-
-	/** The plug-in shared instance */
-	private static Activator plugin;
-
-	/** The logging helper */
-	public static LogHelper log;
-
-	/** The plug-in Preference store */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(PLUGIN_ID);
-
-	/** Default constructor */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the login helper
-		log = new LogHelper(plugin);
-
-		// register the preference store
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-
-		// Preferences initialization
-		CustomPreferenceInitializer diagramPreferenceInitializer = new CustomPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (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 getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 *
-	 * @return Shared Preference Store.
-	 */
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
deleted file mode 100644
index 356666f5dd9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *		CEA LIST - Initial API and implementation
- *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.Bounds;
-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.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Represents the creation command for a SysML internal block diagram
- *
- * @author Laurent Wouters
- */
-public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDefaultDiagramName() {
-		return "New Internal Block Diagram"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return ElementTypes.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
-		// Start of user code Custom diagram creation
-		Diagram diagram = null;
-
-		org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class) element;
-		Block block = UMLUtil.getStereotypeApplication(cOwner, Block.class);
-
-		if (block != null) {
-			canvasDomainElement = element;
-			Package owningPackage = ((Element) element).getNearestPackage();
-			diagram = super.doCreateDiagram(diagramResource, owner, owningPackage, prototype, name);
-		}
-
-		return diagram;
-		// End of user code
-	}
-
-	// Start of user code Custom creation command
-	/** Domain Element referenced by canvas if it differs from {@link Package} */
-	protected EObject canvasDomainElement = null;
-
-	/** Default margin for the display of Domain Element referenced by canvas */
-	protected static int DEFAULT_MARGIN = 40;
-
-	/** Default height for the display of Domain Element referenced by canvas */
-	protected static int DEFAULT_HEIGHT = 250;
-
-	/** Default width for the display of Domain Element referenced by canvas */
-	protected static int DEFAULT_WIDTH = 500;
-
-	/**
-	 * Initialize the diagram. The diagram is attached to the element selected on creation.
-	 * Possible element types are: Block.
-	 */
-	@Override
-	protected void initializeDiagram(EObject diagram) {
-		if (diagram instanceof Diagram) {
-			Diagram currentDiagram = (Diagram) diagram;
-			if (canvasDomainElement != null) {
-				currentDiagram.setElement(canvasDomainElement);
-				initializeDiagramContent(currentDiagram);
-			}
-		}
-	}
-
-	/**
-	 * Initialize the diagram with the canvas domain element shown.
-	 *
-	 * @param diagram
-	 *            the diagram to initialize
-	 */
-	protected void initializeDiagramContent(Diagram diagram) {
-
-		// Create a view for the canvasDomainElement in the new diagram
-		View view =
-				ViewService.getInstance().createNode(new SemanticAdapter(canvasDomainElement, null), diagram, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-		view.setElement(diagram.getElement());
-
-		// Update the view position and size (should adapt to canvas current size)
-		Bounds viewBounds = (Bounds) ((Node) view).getLayoutConstraint();
-		viewBounds.setX(DEFAULT_MARGIN);
-		viewBounds.setY(DEFAULT_MARGIN);
-		viewBounds.setHeight(DEFAULT_HEIGHT);
-		viewBounds.setWidth(DEFAULT_WIDTH);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @generated NOT
-	 */
-	@Override
-	public boolean isParentReassignable() {
-		// Bug 374626: [Model Explorer] Moving an IBD from a block to another block shall be forbidden
-		return false;
-	}
-
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
deleted file mode 100644
index 3aa198a1b72..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-public class InternalBlockDiagramEditorFactory extends GmfEditorFactory {
-
-	public InternalBlockDiagramEditorFactory() {
-		super(InternalBlockDiagramForMultiEditor.class, ElementTypes.DIAGRAM_ID);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramForMultiEditor.java
deleted file mode 100644
index b50f917caf6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramForMultiEditor.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *	 CEA LIST - Initial API and implementation
- *   Christian W. Damus (CEA) - bug 392301
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization;
-import org.eclipse.papyrus.sysml.diagram.internalblock.part.InternalBlockDiagramEditor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-
-/**
- * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- *
- */
-public class InternalBlockDiagramForMultiEditor extends InternalBlockDiagramEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/Diagram_InternalBlock.gif";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(InternalBlockDiagramForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	private Image titleImage;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 *
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 *
-	 */
-	public InternalBlockDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
-		super(servicesRegistry, diagram);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		setPartName(LabelInternationalization.getInstance().getDiagramLabel(getDiagram()));
-		titleImage = DIAG_IMG_DESC.createImage();
-		setTitleImage(titleImage);
-	}
-
-	@Override
-	public void dispose() {
-		if (titleImage != null) {
-			titleImage.dispose();
-			titleImage = null;
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setInput(IEditorInput input) {
-		try {
-			// Provide an URI with fragment in order to reuse the same Resource
-			// and set the diagram to the fragment.
-			URIEditorInput uriInput = new URIEditorInput(EcoreUtil.getURI(getDiagram()));
-			doSetInput(uriInput, true);
-		} catch (CoreException x) {
-			String title = "Problem opening";
-			String msg = "Cannot open input element:";
-			Shell shell = getSite().getShell();
-			ErrorDialog.openError(shell, title, msg, x.getStatus());
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createGraphicalViewer(Composite parent) {
-		splitter = parent;
-		super.createGraphicalViewer(parent);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setFocus() {
-		splitter.setFocus();
-		super.setFocus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditingDomainID() {
-		return "org.eclipse.papyrus.sysml.diagram.internalblock.EditingDomain";
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/part/InternalBlockDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/part/InternalBlockDiagramEditPart.java
deleted file mode 100644
index 20c360f2043..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/part/InternalBlockDiagramEditPart.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.part;
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultContainerNodeEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.DiagramSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.ShowHideRelatedLinkEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-
-/**
- *
- * @Generated NOT //change the super class
- */
-public class InternalBlockDiagramEditPart extends PapyrusDiagramEditPart {
-
-	public InternalBlockDiagramEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultContainerNodeEditPolicy());
-		installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, new ShowHideRelatedLinkEditPolicy(this));
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/DiagramSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/DiagramSemanticEditPolicy.java
deleted file mode 100644
index e439b660158..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/DiagramSemanticEditPolicy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-
-public class DiagramSemanticEditPolicy extends DefaultSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRelationshipSourceCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRelationshipTargetCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRefRelationshipSourceCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRefRelationshipTargetCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
deleted file mode 100644
index e0acac9f54d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/InternalBlockDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-
-/** Customization of the DND edit policy for the InternalBlock Diagram */
-public class InternalBlockDiagramDragDropEditPolicy extends CustomDiagramDragDropEditPolicy {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeVisualID(View containerView, EObject domainElement) {
-		String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLinkWithClassVisualID(EObject domainElement) {
-		String domainType = registry.getEdgeGraphicalType(domainElement);
-		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
deleted file mode 100644
index bc27f1d84a3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.factory;
-
-import java.util.Arrays;
-import java.util.HashMap;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-@SuppressWarnings("serial")
-public class DiagramPaletteFactory extends PaletteFactory.Adapter {
-
-	private static HashMap<String, IElementType[]> nodesToolIdTypesMap = new HashMap<String, IElementType[]>() {
-
-		{
-			put("internalblock.tool.blockcomposite", new IElementType[] { SysMLElementTypes.BLOCK });
-			put("internalblock.tool.blockpropertycomposite", new IElementType[] { SysMLElementTypes.PART_PROPERTY, SysMLElementTypes.REFERENCE_PROPERTY, SysMLElementTypes.ACTOR_PART_PROPERTY,
-					SysMLElementTypes.VALUE_PROPERTY, UMLElementTypes.PROPERTY });
-			put("internalblock.tool.flowport", new IElementType[] { SysMLElementTypes.FLOW_PORT });
-			put("internalblock.tool.port", new IElementType[] { UMLElementTypes.PORT });
-			// Start of user code Custom nodes
-			put("internalblock.tool.part", new IElementType[] { SysMLElementTypes.PART_PROPERTY });
-			put("internalblock.tool.reference", new IElementType[] { SysMLElementTypes.REFERENCE_PROPERTY });
-			put("internalblock.tool.actorpart", new IElementType[] { SysMLElementTypes.ACTOR_PART_PROPERTY });
-			put("internalblock.tool.value", new IElementType[] { SysMLElementTypes.VALUE_PROPERTY });
-			put("internalblock.tool.property", new IElementType[] { UMLElementTypes.PROPERTY });
-
-			put("internalblock.tool.flowport_na", new IElementType[] { SysMLElementTypes.FLOW_PORT_NA });
-			put("internalblock.tool.flowport_in", new IElementType[] { SysMLElementTypes.FLOW_PORT_IN });
-			put("internalblock.tool.flowport_out", new IElementType[] { SysMLElementTypes.FLOW_PORT_OUT });
-			put("internalblock.tool.flowport_inout", new IElementType[] { SysMLElementTypes.FLOW_PORT_IN_OUT });
-
-			put("internalblock.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
-			put("internalblock.tool.comment", new IElementType[] { UMLElementTypes.COMMENT });
-			// End of user code
-		}
-	};
-
-	private static HashMap<String, IElementType[]> edgesToolIdTypesMap = new HashMap<String, IElementType[]>() {
-
-		{
-			put("internalblock.tool.connector", new IElementType[] { UMLElementTypes.CONNECTOR });
-			put("internalblock.tool.dependency", new IElementType[] { UMLElementTypes.DEPENDENCY });
-			// Start of user code Custom edges
-			put("internalblock.tool.comment_constraint_link", new IElementType[] { ElementTypes.COMMENT_ANNOTATED_ELEMENT, ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT });
-			// End of user code
-		}
-	};
-
-	@Override
-	public Tool createTool(String toolId) {
-
-		IElementType[] types;
-
-		types = nodesToolIdTypesMap.get(toolId);
-		if (types != null) {
-			return new AspectUnspecifiedTypeCreationTool(Arrays.asList(types));
-		}
-
-		types = edgesToolIdTypesMap.get(toolId);
-		if (types != null) {
-			return new AspectUnspecifiedTypeConnectionTool(Arrays.asList(types));
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
deleted file mode 100644
index 120a1c00a5a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/InternalBlockDiagramViewFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class InternalBlockDiagramViewFactory extends DiagramViewFactory {
-
-	// Start of user code Custom view Factory field
-	public static final String INTERNAL_VERSION = "0.9.1";
-
-	// End of user code
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
deleted file mode 100644
index 5ed04b12383..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.part;
-
-import java.util.EventObject;
-import java.util.Set;
-
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
-import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.commands.util.OperationHistoryDirtyState;
-import org.eclipse.papyrus.gmf.diagram.common.compatibility.IDiagramVersionUpdater;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteViewer;
-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-import org.eclipse.papyrus.sysml.diagram.internalblock.compatibility.DiagramVersionUpdater;
-import org.eclipse.papyrus.sysml.diagram.internalblock.factory.InternalBlockDiagramViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.ShowInContext;
-
-/**
- * @generated
- */
-public class InternalBlockDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.sysml.diagram.internalblock.part.InternalBlockDiagramEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-
-	/**
-	 * @generated
-	 */
-	private OperationHistoryDirtyState dirtyState;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public InternalBlockDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, diagram);
-
-		// Start of user code Custom Editor Constructor
-		// Verify diagram compatibility version
-		verifyDiagramCompatibilityVersion(diagram);
-
-		// Fix Port locations (implementations before 0.8.1 were erroneous see https://bugs.eclipse.org/bugs/show_bug.cgi?id=354815)
-		(new org.eclipse.papyrus.sysml.diagram.internalblock.utils.FixPortsLocationOnOpening()).fix(diagram);
-		// End of user code
-
-		// adds a listener to the palette service, which reacts to palette customizations
-		PapyrusPaletteService.getInstance().addProviderChangeListener(this);
-
-		// Share the same editing provider
-		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);
-		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);
-
-		// overrides editing domain created by super constructor
-		setDocumentProvider(documentProvider);
-	}
-
-	protected void verifyDiagramCompatibilityVersion(Diagram diagram) {
-		IDiagramVersionUpdater updater = new DiagramVersionUpdater();
-
-		String currentVersion = org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils.getCompatibilityVersion(diagram);
-		if (!InternalBlockDiagramViewFactory.INTERNAL_VERSION.equals(currentVersion)) {
-			updater.update(diagram, currentVersion, InternalBlockDiagramViewFactory.INTERNAL_VERSION);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
-		PaletteRoot paletteRoot;
-		if (existingPaletteRoot == null) {
-			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
-		} else {
-			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
-			paletteRoot = existingPaletteRoot;
-		}
-		applyCustomizationsToPalette(paletteRoot);
-		return paletteRoot;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-
-		// Replace diagram contextual menu removing default
-		// delete from model action.
-		DiagramContextMenuProvider provider = (DiagramContextMenuProvider) getDiagramGraphicalViewer().getContextMenu();
-		Set<String> menuExclusions = provider.getExclusionSet();
-		menuExclusions.add(ActionIds.ACTION_DELETE_FROM_MODEL);
-		provider.setExclusionSet(menuExclusions);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		getDirtyState().saved();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected OperationHistoryDirtyState getDirtyState() {
-		if (dirtyState == null) {
-			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());
-		}
-		return dirtyState;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void setUndoContext(IUndoContext context) {
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-
-		super.setUndoContext(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return getDirtyState().isDirty();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void providerChanged(ProviderChangeEvent event) {
-		// update the palette if the palette service has changed
-		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {
-			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PaletteViewerProvider createPaletteViewerProvider() {
-		getEditDomain().setPaletteRoot(createPaletteRoot(null));
-		return new PaletteViewerProvider(getEditDomain()) {
-
-			/**
-			 * Override to provide the additional behavior for the tools. Will intialize with a
-			 * PaletteEditPartFactory that has a TrackDragger that understand how to handle the
-			 * mouseDoubleClick event for shape creation tools. Also will initialize the palette
-			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter
-			 * key which will result in the creation of the shape also.
-			 */
-			@Override
-			protected void configurePaletteViewer(PaletteViewer viewer) {
-				super.configurePaletteViewer(viewer);
-
-				// customize menu...
-				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));
-
-				viewer.getKeyHandler().setParent(getPaletteKeyHandler());
-				viewer.getControl().addMouseListener(getPaletteMouseListener());
-
-				// Add a transfer drag target listener that is supported on
-				// palette template entries whose template is a creation tool.
-				// This will enable drag and drop of the palette shape creation
-				// tools.
-				viewer.addDragSourceListener(new PaletteToolTransferDragSourceListener(viewer));
-				viewer.setCustomizer(createPaletteCustomizer());
-			}
-
-			@Override
-			public PaletteViewer createPaletteViewer(Composite parent) {
-				PaletteViewer pViewer = constructPaletteViewer();
-				pViewer.createControl(parent);
-				configurePaletteViewer(pViewer);
-				hookPaletteViewer(pViewer);
-				return pViewer;
-			}
-
-			/**
-			 * @return Palette Key Handler for the palette
-			 */
-			private KeyHandler getPaletteKeyHandler() {
-
-				if (paletteKeyHandler == null) {
-
-					paletteKeyHandler = new KeyHandler() {
-
-						/**
-						 * Processes a <i>key released </i> event. This method is called by the Tool
-						 * whenever a key is released, and the Tool is in the proper state. Override
-						 * to support pressing the enter key to create a shape or connection
-						 * (between two selected shapes)
-						 *
-						 * @param event
-						 *            the KeyEvent
-						 * @return <code>true</code> if KeyEvent was handled in some way
-						 */
-						@Override
-						public boolean keyReleased(KeyEvent event) {
-
-							if (event.keyCode == SWT.Selection) {
-
-								Tool tool = getPaletteViewer().getActiveTool().createTool();
-
-								if (toolSupportsAccessibility(tool)) {
-
-									tool.keyUp(event, getDiagramGraphicalViewer());
-
-									// deactivate current selection
-									getPaletteViewer().setActiveTool(null);
-
-									return true;
-								}
-
-							}
-							return super.keyReleased(event);
-						}
-
-					};
-
-				}
-				return paletteKeyHandler;
-			}
-
-			/**
-			 * @return Palette Mouse listener for the palette
-			 */
-			private MouseListener getPaletteMouseListener() {
-
-				if (paletteMouseListener == null) {
-
-					paletteMouseListener = new MouseListener() {
-
-						/**
-						 * Flag to indicate that the current active tool should be cleared after a
-						 * mouse double-click event.
-						 */
-						private boolean clearActiveTool = false;
-
-						/**
-						 * Override to support double-clicking a palette tool entry to create a
-						 * shape or connection (between two selected shapes).
-						 *
-						 * @see MouseListener#mouseDoubleClick(MouseEvent)
-						 */
-						public void mouseDoubleClick(MouseEvent e) {
-							Tool tool = getPaletteViewer().getActiveTool().createTool();
-
-							if (toolSupportsAccessibility(tool)) {
-
-								tool.setViewer(getDiagramGraphicalViewer());
-								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());
-								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());
-
-								// Current active tool should be deactivated,
-								// but if it is down here it will get
-								// reactivated deep in GEF palette code after
-								// receiving mouse up events.
-								clearActiveTool = true;
-							}
-						}
-
-						public void mouseDown(MouseEvent e) {
-							// do nothing
-						}
-
-						public void mouseUp(MouseEvent e) {
-							// Deactivate current active tool here if a
-							// double-click was handled.
-							if (clearActiveTool) {
-								getPaletteViewer().setActiveTool(null);
-								clearActiveTool = false;
-							}
-
-						}
-					};
-
-				}
-				return paletteMouseListener;
-			}
-
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public GraphicalViewer getGraphicalViewer() {
-		return super.getGraphicalViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-
-		// Enable Drop
-		getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {
-
-			@Override
-			protected Object getJavaObject(TransferData data) {
-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);
-			}
-
-			@Override
-			protected TransactionalEditingDomain getTransactionalEditingDomain() {
-				return getEditingDomain();
-			}
-		});
-
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
-			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
-			// If not the active editor, ignore selection changed.
-			if (this.equals(editor.getActiveEditor())) {
-				updateActions(getSelectionActions());
-				super.selectionChanged(part, selection);
-			} else {
-				super.selectionChanged(part, selection);
-			}
-		} else {
-			super.selectionChanged(part, selection);
-		}
-		// from
-		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
-		// ISelection)
-		if (part == this) {
-			rebuildStatusLine();
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
deleted file mode 100644
index 007b7281324..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-public class BlockCompositePreferencePage extends InternalBlockDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		compartmentTitleDefaultVisibilityMap.remove("structure"); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.FALSE); //$NON-NLS-1$
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public BlockCompositePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 150);
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
deleted file mode 100644
index 5a5c23309ca..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentAnnotatedElementPreferencePage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-public class CommentAnnotatedElementPreferencePage extends InternalBlockDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public CommentAnnotatedElementPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
deleted file mode 100644
index c5d7285000f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-public class CommentPreferencePage extends InternalBlockDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
deleted file mode 100644
index ad326f4f3ee..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintConstrainedElementPreferencePage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-public class ConstraintConstrainedElementPreferencePage extends InternalBlockDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public ConstraintConstrainedElementPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index 9bc68477487..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-public class ConstraintPreferencePage extends InternalBlockDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
deleted file mode 100644
index bb8f08b1c60..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class DependencyPreferencePage extends InternalBlockDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public DependencyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
deleted file mode 100644
index 45c53e95ea5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-public class InternalBlockDiagramGeneralPreferencePage extends DiagramPreferencePage {
-
-	public InternalBlockDiagramGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-		setPreferenceKey(ElementTypes.DIAGRAM_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramLinkPreferencePage.java
deleted file mode 100644
index 772df6ad26d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramLinkPreferencePage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class InternalBlockDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {

-

-	/** The list of label names for this link */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public InternalBlockDiagramLinkPreferencePage() {

-		labelsList = new ArrayList<String>();

-		initializeLabelsList();

-		Collections.unmodifiableList(labelsList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramNodePreferencePage.java
deleted file mode 100644
index 6d32b239fc9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramNodePreferencePage.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedCompartmentGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class InternalBlockDiagramNodePreferencePage extends AbstractPapyrusNodePreferencePage {

-

-	/** The list owning the names of compartments */

-	protected List<String> compartmentNamesList;

-

-	/** The list owning the names of compartment that have a title */

-	protected List<String> compartmentTitlesList;

-

-	/** The list of label names for this node */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public InternalBlockDiagramNodePreferencePage() {

-		this.labelsList = new ArrayList<String>();

-		this.compartmentNamesList = new ArrayList<String>();

-		this.compartmentTitlesList = new ArrayList<String>();

-

-		initializeLabelsList();

-		initializeCompartmentNamesList();

-		initializeCompartmentTitlesList();

-

-		Collections.unmodifiableList(labelsList);

-		Collections.unmodifiableList(compartmentNamesList);

-		Collections.unmodifiableList(compartmentTitlesList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add compartments visibility group

-		if (!compartmentNamesList.isEmpty()) {

-			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());

-			addPreferenceGroup(compartmentGroup);

-		}

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartments. */

-	protected void initializeCompartmentNamesList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartment that have titles. */

-	protected void initializeCompartmentTitlesList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {

-		return new TreeMap<String, Boolean>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final void initializeCompartmentsList() {

-		compartmentsList = Collections.emptyList();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramPreferenceInitializer.java
deleted file mode 100644
index ba447cfd8d1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramPreferenceInitializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-
-public class InternalBlockDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintConstrainedElementPreferencePage.initDefaults(store);
-		BlockCompositePreferencePage.initDefaults(store);
-		DependencyPreferencePage.initDefaults(store);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPartProvider.java
deleted file mode 100644
index a97c11d427e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPartProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.CustomAbstractEditPartProvider;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyStructureCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.CustomFlowPortAppliedStereotypeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedNodeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.StructureCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeLinkLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelSourceMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelTargetMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementLinkLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyNodeLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
-
-	/** Map containing node view types supported by this provider */
-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
-
-	/** Map containing edge view types supported by this provider */
-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
-
-	/** Default constructor */
-	public CustomEditPartProvider() {
-		super();
-
-		diagramType = ElementTypes.DIAGRAM_ID;
-
-		// Nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, BlockPropertyCompositeEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, BlockCompositeEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeEditPart.class);
-
-		// Decorations
-		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, FlowPortAffixedLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, BlockPropertyStructureCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, StructureCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, BlockLabelNameEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, CustomFlowPortAppliedStereotypeEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, PortAffixedLabelNameEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, PropertyNodeLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeLinkLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, ConnectorLinkLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, ConnectorLinkLabelSourceMultiplicityEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, ConnectorLinkLabelTargetMultiplicityEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, NamedElementLinkLabelNameEditPart.class);
-
-		// Edges
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, ConnectorEditPart.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyEditPart.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View newView = ((IEditPartOperation) operation).getView();
-			if (newView == null) {
-				return false;
-			}
-
-			String graphicalType = newView.getType();
-
-			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
-				return false;
-			}
-
-			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
-				return false;
-			}
-		}
-
-		return super.provides(operation);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getNodeEditPartClass(View view) {
-		return nodeMap.get(view.getType());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getEdgeEditPartClass(View view) {
-		return edgeMap.get(view.getType());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
deleted file mode 100644
index 4333a8fa8cd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomGraphicalTypeRegistry.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
-
-	/** Default constructor */
-	public CustomGraphicalTypeRegistry() {
-
-		super();
-
-		// Nodes
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);
-		// Decorations
-		knownNodes.add(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID);
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID);
-
-		// Edges
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)
-		if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)
-				|| ((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)
-				|| ((ISpecializationType) SysMLElementTypes.ACTOR_PART_PROPERTY).getMatcher().matches(domainElement)
-				|| ((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)
-				|| ((domainElement instanceof org.eclipse.uml2.uml.Property) && !(domainElement instanceof org.eclipse.uml2.uml.Port))) {
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)
-				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_IN).getMatcher().matches(domainElement)
-				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_OUT).getMatcher().matches(domainElement)
-				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_IN_OUT).getMatcher().matches(domainElement)
-				|| ((ISpecializationType) SysMLElementTypes.FLOW_PORT_NA).getMatcher().matches(domainElement)) {
-
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			/*
-			 * if(SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-			 * return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			 * }
-			 */
-			return UNDEFINED_TYPE;
-		}
-		// End of user code
-
-		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			/*
-			 * if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-			 * return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			 * }
-			 */
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PORT.getEClass().isInstance(domainElement)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		return super.getNodeGraphicalType(domainElement, containerType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(String proposedType, String containerType) {
-		// Start of user code getNodeGraphicalType(String proposedType, String containerType)
-		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)
-				|| SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)
-				|| SysMLElementTypes.ACTOR_PART_PROPERTY.getSemanticHint().equals(proposedType)
-				|| SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)
-				|| UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)
-				|| SysMLElementTypes.FLOW_PORT_IN.getSemanticHint().equals(proposedType)
-				|| SysMLElementTypes.FLOW_PORT_OUT.getSemanticHint().equals(proposedType)
-				|| SysMLElementTypes.FLOW_PORT_IN_OUT.getSemanticHint().matches(proposedType)
-				|| SysMLElementTypes.FLOW_PORT_NA.getSemanticHint().matches(proposedType)) {
-
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		// End of user code
-
-		if (SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			/*
-			 * if(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-			 * return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			 * }
-			 */
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.FLOW_PORT.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (UMLElementTypes.PORT.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		return super.getNodeGraphicalType(proposedType, containerType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(EObject domainElement) {
-		// Start of user code getEdgeGraphicalType(EObject domainElement)
-		// End of user code
-
-		if (UMLElementTypes.CONNECTOR.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
-		}
-		if (UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}
-		return super.getEdgeGraphicalType(domainElement);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(String proposedType) {
-		// Start of user code getEdgeGraphicalType(String proposedType)
-		// End of user code
-
-		if (UMLElementTypes.CONNECTOR.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
-		}
-		if (UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}
-		return super.getEdgeGraphicalType(proposedType);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomViewProvider.java
deleted file mode 100644
index 3a842a2f148..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomViewProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.AffixedLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.CompartmentShapeViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.InnerLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.provider.CustomAbstractViewProvider;
-import org.eclipse.papyrus.sysml.diagram.common.factory.BlockCompositeClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.BlockPropertyCompositeClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.FlowPortAffixedNodeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.factory.ConnectorLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.DependencyLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.PortAffixedNodeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class CustomViewProvider extends CustomAbstractViewProvider {
-
-	/** Map containing node view types supported by this provider */
-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
-
-	/** Map containing edge view types supported by this provider */
-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
-
-	/** Default constructor */
-	public CustomViewProvider() {
-		super();
-		this.registry = new CustomGraphicalTypeRegistry();
-
-		diagramType = ElementTypes.DIAGRAM_ID;
-
-		// Custom classifier nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, BlockCompositeClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, BlockPropertyCompositeClassifierViewFactory.class);
-		// Custom affixed nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeViewFactory.class);
-		// Custom child node labels
-		// Custom inner labels
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, InnerLabelViewFactory.class);
-		// Custom compartments
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, CompartmentShapeViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, CompartmentShapeViewFactory.class);
-		// Custom affixed labels
-		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, AffixedLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AffixedLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, AffixedLabelViewFactory.class);
-
-		// Custom edges
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, ConnectorLinkViewFactory.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyLinkViewFactory.class);
-
-		// Custom edge labels
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, ConnectorLabelViewFactory.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getNodeViewClass(IAdaptable semanticAdapter, View containerView, String graphicalType) {
-		return nodeMap.get(graphicalType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getEdgeViewClass(IAdaptable semanticAdapter, View containerView, String graphicalType) {
-		return edgeMap.get(graphicalType);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
deleted file mode 100644
index 06aad1007f6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ElementTypes.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-public class ElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** SysML Internal Block Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** SysML Internal Block Diagram :: Diagram */
-	public static final String DIAGRAM_ID = "InternalBlock";
-
-	/** ********************************************************* */
-	/** SysML Internal Block Diagram - CompositeDiagram related elements */
-	/** ********************************************************* */
-
-	/** CompositeDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_Shape;
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
-
-	public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPart.VISUAL_ID;
-
-	/** CompositeDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
-
-	public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
-
-	/** CompositeDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
-
-	public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
-
-	/** CompositeDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_Shape_CN;
-
-	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
-
-	public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPartCN.VISUAL_ID;
-
-	/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
-
-	/** CompositeDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) UMLElementTypes.Constraint_ConstrainedElementEdge;
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
deleted file mode 100644
index 1956448e6cc..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/GraphicalTypeRegistry.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides graphical type id (used as View type) for
- * domain element according to their actual or expected graphical
- * container type.
- * </pre>
- */
-public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
-
-	/** A Set containing all known node graphical types */
-	protected Set<String> knownNodes = new HashSet<String>();
-
-	/** A Set containing all known edge graphical types */
-	protected Set<String> knownEdges = new HashSet<String>();
-
-	/** Default constructor */
-	public GraphicalTypeRegistry() {
-
-		// Fill known edges set
-		knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint());
-		knownEdges.add(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint());
-
-		// Fill known nodes set (primary nodes)
-		knownNodes.add(UMLElementTypes.CONSTRAINT.getSemanticHint());
-		knownNodes.add(UMLElementTypes.COMMENT.getSemanticHint());
-
-		knownNodes.add(ElementTypes.CONSTRAINT.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT.getSemanticHint());
-		knownNodes.add(ElementTypes.CONSTRAINT_CN.getSemanticHint());
-
-		// Fill known nodes set (child label nodes)
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(EObject domainElement) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if (domainElement == null) {
-			return UNDEFINED_TYPE;
-		}
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(IElementType elementType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getEdgeGraphicalType(semanticHint);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(String proposedType) {
-		if (isKnownEdgeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if ((containerType == null) || (domainElement == null)) {
-			return UNDEFINED_TYPE;
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
-				graphicalType = ElementTypes.COMMENT.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-		}
-
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getNodeGraphicalType(semanticHint, containerType);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(String proposedType, String containerType) {
-		if ((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.COMMENT.getSemanticHint();
-			}
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-		if (isKnownNodeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isKnownEdgeType(String type) {
-		return knownEdges.contains(type);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isKnownNodeType(String type) {
-		return knownNodes.contains(type);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
deleted file mode 100644
index b48b56a78af..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramEditPartProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLEditPartProvider;
-
-public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvider {
-
-	@Override
-	public synchronized boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is a InternalBlock Diagram
-			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
-				return false;
-			}
-
-			// Test supported inherited types
-			EObject eobject = view.getElement();
-
-			/** Nodes (and ChildLabelNodes) *********** */
-			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
-				return true;
-			}
-
-			// Additional test needed here to decide whether to support Feature type links.
-			// As feature type link are not related to a MetaClass from the domain model
-			// they are not already handled by previous tests.
-			// Also concerns NotationType.
-			String hint = view.getType();
-
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-
-		}
-		return false;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
deleted file mode 100644
index 513df2b5aae..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticAdapter;
-//bugs.eclipse.org/bugs/show_bug.cgi?id=432824
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Edge createdEdge = null;
-		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-		if (elementType != null) {
-			createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-		} else {
-			EObject domainElement = EMFHelper.getEObject(semanticAdapter);
-			String domainElementGraphicalType = semanticHint;
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
-				// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-				if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);
-				}
-			}
-		}
-		if (createdEdge == null) {
-			Activator.log.error(new Exception("Could not create Edge."));
-		}
-		return createdEdge;
-	}
-
-	@Override
-	protected boolean provides(CreateViewForKindOperation op) {
-		// Never use this method (often incorrectly implemented due to GMF Tooling choices).
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-		throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
-	}
-
-	@Override
-	protected boolean provides(CreateEdgeViewOperation op) {
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		// This provider is registered for InternalBlock Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			return true;
-		}
-		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
-			return true;
-		}
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean provides(CreateNodeViewOperation op) {
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		// Get the type of the container
-		String containerGraphicalType = op.getContainerView().getType();
-		// This provider is registered for InternalBlock Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the ElementType and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
-		if (elementType == UMLElementTypes.CONSTRAINT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == UMLElementTypes.COMMENT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-			} else {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		// Use the GraphicalTypeRegistry to find the expected type for a domain element
-		// Get the type of the container
-		String containerGraphicalType = containerView.getType();
-		// Get the type of the domain element
-		EObject domainElement = EMFHelper.getEObject(semanticAdapter);
-		if (semanticHint != null) {
-			// Look for a possible graphicalType replacement
-			String graphicalType = registry.getNodeGraphicalType(semanticHint, containerGraphicalType);
-			return super.createNode(new SemanticAdapter(domainElement, null), containerView, graphicalType, index, persisted, preferencesHint);
-		}
-		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-		// Create the expected node
-		if (!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
-			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-		}
-		Activator.log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPartProvider.java
deleted file mode 100644
index 41f6aeccc8e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPartProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.part.InternalBlockDiagramEditPart;
-
-public class InternalBlockDiagramEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is InternalBlock Diagram
-			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-			return InternalBlockDiagramEditPart.class;
-		}
-
-		Activator.log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPolicyProvider.java
deleted file mode 100644
index ae877b5581a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramEditPolicyProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy;
-
-public class InternalBlockDiagramEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
-
-	public boolean provides(IOperation operation) {
-
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
-		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
-			return false;
-		}
-		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
-		String diagramType = gep.getNotationView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPartCN) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public void createEditPolicies(EditPart editPart) {
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramViewProvider.java
deleted file mode 100644
index bd137698953..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockDiagramViewProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-import org.eclipse.papyrus.sysml.diagram.internalblock.factory.InternalBlockDiagramViewFactory;
-
-public class InternalBlockDiagramViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
-			return InternalBlockDiagramViewFactory.class;
-		}
-
-		Activator.log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java
deleted file mode 100644
index a8a6c943e07..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *		CEA LIST - Initial API and implementation

- *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock;

-

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

-import org.eclipse.papyrus.infra.ui.extension.commands.PerspectiveContextDependence;

-

-/**

- * InternalBlockDiagramCondition to set conditions for the diagram creation

- */

-public class InternalBlockDiagramCondition extends PerspectiveContextDependence {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean create(EObject selectedElement) {

-		return false;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
deleted file mode 100644
index d2e9efa8d09..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/compatibility/DiagramVersionUpdater.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.compatibility;

-

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.gmf.diagram.common.compatibility.IDiagramVersionUpdater;

-

-/**

- * Diagram version updater for the Internal Block Diagram.*

- *

- * @Deprecated

- * @link org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilerUndefinedTo100

- */

-@Deprecated

-public class DiagramVersionUpdater implements IDiagramVersionUpdater {

-

-	public static final String VERSION_0_9_1 = "0.9.1";

-

-	public final static String VERSION_0_8_1 = "0.8.1";

-

-	/** Constructor */

-	public DiagramVersionUpdater() {

-	}

-

-	public int update(Diagram diagram, String oldVersion, String newVersion) {

-		// TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(diagram);

-		//

-		// if(DiagramVersioningUtils.UNDEFINED_VERSION.equals(oldVersion)) {

-		// if(VERSION_0_8_1.equals(newVersion)) {

-		// try {

-		// editingDomain.getCommandStack().execute(getUpdateCommandFromUndefinedTo_081(diagram));

-		// } catch (Exception e) {

-		// e.printStackTrace();

-		// }

-		// } else if(VERSION_0_9_1.equals(newVersion)) {

-		// try {

-		// CompoundCommand cc = new CompoundCommand("Update Diagram");

-		// cc.append(getUpdateCommandFromUndefinedTo_081(diagram));

-		// cc.append(getUpdateCommandFrom081To_091(diagram));

-		// editingDomain.getCommandStack().execute(cc);

-		// } catch (Exception e) {

-		// e.printStackTrace();

-		// }

-		// }

-		//

-		// }

-		//

-		// if(VERSION_0_8_1.equals(oldVersion) && (VERSION_0_9_1.equals(newVersion))) {

-		// try {

-		// editingDomain.getCommandStack().execute(getUpdateCommandFrom081To_091(diagram));

-		// } catch (Exception e) {

-		// e.printStackTrace();

-		// }

-		// }

-		//

-		return 0;

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/dnd/helper/CustomLinkMappingHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/dnd/helper/CustomLinkMappingHelper.java
deleted file mode 100644
index ae5f98afe52..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/dnd/helper/CustomLinkMappingHelper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-

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

-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.ILinkMappingHelper;

-import org.eclipse.papyrus.uml.diagram.common.dnd.helper.LinkMappingHelper.CommonSourceUMLSwitch;

-import org.eclipse.papyrus.uml.diagram.common.dnd.helper.LinkMappingHelper.CommonTargetUMLSwitch;

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

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

-

-/**

- * The Class LinkMappingHelper is specialization of the link mapping helper for the Class diagram

- */

-public class CustomLinkMappingHelper implements ILinkMappingHelper {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Collection<?> getSource(Element link) {

-		CommonSourceUMLSwitch umlSwitch = new CommonSourceUMLSwitch() {

-

-			@Override

-			public java.util.Collection<?> caseConnector(org.eclipse.uml2.uml.Connector object) {

-

-				java.util.Collection<?> ends = Collections.emptySet();

-

-				// Support for binary Connector only in this diagram.

-

-				if (object.getEnds().size() == 2) {

-

-					ConnectorEnd semanticSource = object.getEnds().get(0);

-					ends = Arrays.asList(new EObject[] { semanticSource });

-

-				} else {

-					// TODO: log warning here - can only drop binary associations in this diagram...

-				}

-

-				return ends;

-			};

-

-		};

-		return umlSwitch.doSwitch(link);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Collection<?> getTarget(Element link) {

-		CommonTargetUMLSwitch umlSwitch = new CommonTargetUMLSwitch() {

-

-			@Override

-			public java.util.Collection<?> caseConnector(org.eclipse.uml2.uml.Connector object) {

-

-				java.util.Collection<?> ends = Collections.emptySet();

-

-				// Support for binary Connector only in this diagram.

-

-				if (object.getEnds().size() == 2) {

-

-					ConnectorEnd semanticTarget = object.getEnds().get(1);

-					ends = Arrays.asList(new EObject[] { semanticTarget });

-

-				} else {

-					// TODO: log warning here - can only drop binary associations in this diagram...

-				}

-

-				return ends;

-			};

-

-		};

-		return umlSwitch.doSwitch(link);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
deleted file mode 100644
index 281198aa5a9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockCompositeSemanticEditPolicy.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockCompositeSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

-

-/**

- * <pre>

- * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference

- * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

- * </pre>

- */

-public class CustomBlockCompositeSemanticEditPolicy extends BlockCompositeSemanticEditPolicy {

-

-	/** Local graphical type registry for graphical elements */

-	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();

-

-	/** Local graphical type registry for inherited graphical elements */

-	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

-		}

-

-		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

-

-		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		return super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-

-		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

-		}

-

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeDropEditPolicy.java
deleted file mode 100644
index fb551b1d6aa..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeDropEditPolicy.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.PortDropHelper;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.TypeDropHelper;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Port;
-
-/**
- * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables
- * type modification, or creation of new Port and FlowPort by a drop on target.
- * </pre>
- */
-public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public CustomBlockPropertyCompositeDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Set<String> getSpecificDropBehaviorTypes() {
-		Set<String> specificDropBehaviorTypes = super.getSpecificDropBehaviorTypes();
-
-		specificDropBehaviorTypes.add(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);
-		specificDropBehaviorTypes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);
-
-		return specificDropBehaviorTypes;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
-		if ((UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(nodeType)) || (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(nodeType))) {
-			PortDropHelper portDropHelper = new PortDropHelper(getEditingDomain());
-			return portDropHelper.getDropPortOnPart((Port) droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart) getHost());
-		}
-
-		return super.getSpecificDropCommand(dropRequest, droppedEObject, nodeType, edgeType);
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to set the target element type with dropped object
-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {
-				commandChoice.add(dropAsSetType);
-			}
-
-			// 2. Try to create a Port typed by the dropped object
-			Command dropAsTypedPort = helper.getDropAsTypedPortOnPart(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropAsTypedPort != null) && (dropAsTypedPort.canExecute())) {
-				commandChoice.add(dropAsTypedPort);
-			}
-
-			// 3. Try to create a FlowPort (In - Out - InOut) typed by the dropped object
-			Command dropAsTypedFlowPort_In = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT);
-			if ((dropAsTypedFlowPort_In != null) && (dropAsTypedFlowPort_In.canExecute())) {
-				commandChoice.add(dropAsTypedFlowPort_In);
-			}
-			Command dropAsTypedFlowPort_Out = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_IN);
-			if ((dropAsTypedFlowPort_Out != null) && (dropAsTypedFlowPort_Out.canExecute())) {
-				commandChoice.add(dropAsTypedFlowPort_Out);
-			}
-			Command dropAsTypedFlowPort_InOut = helper.getDropAsTypedFlowPortOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_OUT);
-			if ((dropAsTypedFlowPort_InOut != null) && (dropAsTypedFlowPort_InOut.canExecute())) {
-				commandChoice.add(dropAsTypedFlowPort_InOut);
-			}
-
-			// Same behavior for 4 & 5
-			// // 4. Build command to drop Port and FlowPort
-			// PortDropHelper portDropHelper = new PortDropHelper(getEditingDomain());
-			// Command dropPortOnPart = portDropHelper.getDropPortOnPart(dropRequest, (GraphicalEditPart)getHost());
-			// if ((dropPortOnPart != null) && (dropPortOnPart.canExecute())) {
-			// commandChoice.add(dropPortOnPart);
-			// }
-
-			// 5. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
deleted file mode 100644
index 177eb86776c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyCompositeSemanticEditPolicy.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockPropertyCompositeSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLCreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

-import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-

-/**

- * <pre>

- * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference

- * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

- * </pre>

- */

-public class CustomBlockPropertyCompositeSemanticEditPolicy extends BlockPropertyCompositeSemanticEditPolicy {

-

-	/** Local graphical type registry for graphical elements */

-	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();

-

-	/** Local graphical type registry for inherited graphical elements */

-	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();

-

-	private CreateOrShowExistingElementHelper linkHelper = new CreateOrShowExistingElementHelper();

-

-	/** the sysml link helper to use for specific case */

-	private CreateOrShowExistingElementHelper sysmlLinkHelper = new SysMLCreateOrShowExistingElementHelper();

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

-		}

-

-		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

-

-		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		final Command defaultCommand = super.getCreateRelationshipCommand(req);

-		if (defaultCommand.canExecute()) {

-			final IElementType elementType = req.getElementType();

-			if (UMLElementTypes.CONNECTOR.equals(req.getElementType())) {

-				return this.sysmlLinkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			}

-			if (UMLElementTypes.DEPENDENCY.equals(req.getElementType())) {

-				return this.linkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			}

-		}

-		return defaultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-

-		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

-		}

-

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
deleted file mode 100644
index 3be3b13723c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.BlockDropHelper;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.PartDropHelper;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables
- * type modification, or creation of new Port and FlowPort by a drop on target.
- * </pre>
- */
-public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-
-		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Build command to drop BlockProperty
-			PartDropHelper partDropHelper = new PartDropHelper(getEditingDomain());
-			Command dropPartOnPart = partDropHelper.getDropPartOnPart(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropPartOnPart != null) && (dropPartOnPart.canExecute())) {
-				commandChoice.add(dropPartOnPart);
-			}
-
-			// 2. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
-			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
-				commandChoice.add(dropAsTypedPart);
-			}
-
-			// 3. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
-				commandChoice.add(dropAsTypedReference);
-			}
-
-			// 4. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
-				commandChoice.add(dropAsTypedActorPart);
-			}
-
-			// 5. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
-				commandChoice.add(dropAsTypedValue);
-			}
-
-			// 6. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
-			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
-				commandChoice.add(dropAsTypedProperty);
-			}
-
-			// 7. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected View getReferenceViewForConnectorEnd() {
-		return ViewUtil.getContainerView(super.getReferenceViewForConnectorEnd());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
deleted file mode 100644
index 008d39285a3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDefaultSemanticEditPolicy.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLCreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

-import org.eclipse.papyrus.uml.diagram.common.helper.CreateOrShowExistingElementHelper;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-

-/**

- * <pre>

- * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference

- * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

- * </pre>

- */

-public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {

-

-	/** Local graphical type registry for graphical elements */

-	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();

-

-	/** Local graphical type registry for inherited graphical elements */

-	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();

-

-	/** the link helper to use */

-	private CreateOrShowExistingElementHelper linkHelper = new CreateOrShowExistingElementHelper();

-

-	/** the sysml link helper to use for specific case */

-	private CreateOrShowExistingElementHelper sysmlLinkHelper = new SysMLCreateOrShowExistingElementHelper();

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

-		}

-

-		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

-

-		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		final Command defaultCommand = super.getCreateRelationshipCommand(req);

-		if (defaultCommand.canExecute()) {

-			final IElementType elementType = req.getElementType();

-			if (UMLElementTypes.CONNECTOR.equals(req.getElementType())) {

-				return this.sysmlLinkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			}

-

-			if (UMLElementTypes.DEPENDENCY.equals(req.getElementType())) {

-				return this.linkHelper.getCreateOrRestoreElementCommand(req, defaultCommand, elementType);

-			}

-		}

-		return defaultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-

-		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

-		}

-

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDiagramDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDiagramDropEditPolicy.java
deleted file mode 100644
index b0d3fa3dcbf..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDiagramDropEditPolicy.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;

-

-import java.util.Iterator;

-import java.util.Set;

-

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

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

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

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;

-

-/**

- * Custom drag'n'drop edit policy when the target edit part is the diagram itself.

- * <P>

- * In this case, it should be impossible to drop elements in this Internal Block Diagram, except the block context of that diagram, if it is not already displayed in the diagram.

- * </P>

- */

-public class CustomDiagramDropEditPolicy extends CustomDragDropEditPolicy {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Set<String> getSpecificDropBehaviorTypes() {

-		Set<String> specificDropBehaviorTypes = super.getSpecificDropBehaviorTypes();

-		specificDropBehaviorTypes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);

-		return specificDropBehaviorTypes;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {

-		if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(nodeType)) {

-			// should not be possible to execute, unless 2 conditions:

-			// 1. the block is the context of the diagram

-			// 2. the block is not already displayed in the diagram

-			BlockMatcher matcher = new BlockMatcher();

-			if (!matcher.matches(droppedEObject)) { // should check for additional free elements, like comments, constraints.

-				return UnexecutableCommand.INSTANCE;

-			}

-

-			// this is a block. checking if the element context of the diagram is the block dropped

-			Object model = getHost().getModel();

-			if (model instanceof Diagram) { // should be...

-				EObject element = ((Diagram) model).getElement();

-				if (droppedEObject.equals(element)) {

-					// check no view exists for this block already

-					@SuppressWarnings("unchecked")

-					Iterator<View> it = ((Diagram) model).getChildren().iterator();

-					while (it.hasNext()) {

-						View view = it.next();

-						if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(view.getType())) {

-							// there is already a block displayed in the diagram. Should be unexecutable.

-							return UnexecutableCommand.INSTANCE;

-						}

-					}

-				} else {

-					// block that do not corresponds to block the context of the diagram.

-					return UnexecutableCommand.INSTANCE;

-				}

-			} else {

-				return UnexecutableCommand.INSTANCE;

-			}

-

-			// it should be possible to create a view for the block now. It is not displayed and this is the context of the diagram

-			return getDefaultDropNodeCommand(nodeType, dropRequest.getLocation(), droppedEObject);

-

-		}

-		return super.getSpecificDropCommand(dropRequest, droppedEObject, nodeType, edgeType);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDragDropEditPolicy.java
deleted file mode 100644
index a8e2388952b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomDragDropEditPolicy.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

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

-import org.eclipse.draw2d.geometry.Point;

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.UnexecutableCommand;

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

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

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

-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.CommonDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.CommonDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper.CustomLinkMappingHelper;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.PortDropHelper;

-import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementNodeLabelEditPart;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

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

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

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

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

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

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

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

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

-

-/** Customization of the DND edit policy for the Internal Block Diagram */

-public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {

-

-	private ConnectorUtils utils = new ConnectorUtils();

-

-	/** Default constructor. */

-	public CustomDragDropEditPolicy() {

-		super(new CustomLinkMappingHelper());

-		registry = new CustomGraphicalTypeRegistry();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Set<String> getSpecificDropBehaviorTypes() {

-		Set<String> specificDropBehaviorTypes = new HashSet<String>();

-

-		specificDropBehaviorTypes.add(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);

-

-		return specificDropBehaviorTypes;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {

-		if ((UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(edgeType)) && (droppedEObject instanceof Connector)) {

-			return getConnectorDropCommand(dropRequest, (Connector) droppedEObject, edgeType);

-		}

-

-		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-	}

-

-	protected ICommand getConnectorDropCommand(DropObjectsRequest dropRequest, Connector droppedEObject, String edgeType) {

-

-		// Only manage binary link during drop

-		if (droppedEObject.getEnds().size() != 2) {

-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-		}

-

-		ConnectorEnd source = droppedEObject.getEnds().get(0);

-		ConnectorEnd target = droppedEObject.getEnds().get(1);

-

-		return dropBinaryLink(new CompositeCommand("drop Connector"), source.getRole(), target.getRole(), edgeType, dropRequest.getLocation(), droppedEObject);

-	}

-

-	/**

-	 * the method provides command to create the binary link into the diagram.

-	 * If the source and the target views do not exist, these views will be

-	 * created.

-	 *

-	 * @param cc

-	 *            the composite command that will contain the set of command to

-	 *            create the binary link

-	 * @param source

-	 *            the source the element source of the link

-	 * @param target

-	 *            the target the element target of the link

-	 * @param linkVISUALID

-	 *            the link VISUALID used to create the view

-	 * @param location

-	 *            the location the location where the view will be be created

-	 * @param semanticLink

-	 *            the semantic link that will be attached to the view

-	 *

-	 * @return the composite command

-	 */

-	protected CompositeCommand dropBinaryLink(CompositeCommand cc, Element source, Element target, String edgeType, Point absoluteLocation, Element semanticLink) {

-		IAdaptable sourceViewAdapter = findAdapter(cc, source, getLinkSourceDropLocation(absoluteLocation, source, target), edgeType);

-		IAdaptable targetViewAdapter = findAdapter(cc, target, getLinkTargetDropLocation(absoluteLocation, source, target), edgeType);

-		IAdaptable droppedViewAdapter = new SemanticAdapter(semanticLink, null);

-

-		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(droppedViewAdapter, edgeType, getDiagramPreferencesHint());

-		CommonDeferredCreateConnectionViewCommand createConnectionViewCommand = new CommonDeferredCreateConnectionViewCommand(getEditingDomain(), edgeType, sourceViewAdapter, targetViewAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor, null);

-		createConnectionViewCommand.setElement(semanticLink);

-		cc.compose(createConnectionViewCommand);

-		return cc;

-	}

-

-	/**

-	 * This method allows to specify a location for the creation of a node at

-	 * the source of a dropped link. Overriding implementations must not modify

-	 * the absoluteLocation parameter (use {@link Point#getCopy()})

-	 *

-	 * @param absoluteLocation

-	 *            the request's drop location

-	 * @param source

-	 *            the source of the dropped link

-	 * @param target

-	 *            the target of the dropped link

-	 * @return the new location for the node

-	 */

-	protected Point getLinkSourceDropLocation(Point absoluteLocation, Element source, Element target) {

-		return absoluteLocation;

-	}

-

-	/**

-	 * This method allows to specify a location for the creation of a node at

-	 * the target of a dropped link. Overriding implementations must not modify

-	 * the absoluteLocation parameter (use {@link Point#getCopy()})

-	 *

-	 * @param absoluteLocation

-	 *            the request's drop location

-	 * @param source

-	 *            the source of the dropped link

-	 * @param target

-	 *            the target of the dropped link

-	 * @return the new location for the node

-	 */

-	protected Point getLinkTargetDropLocation(Point absoluteLocation, Element source, Element target) {

-		if (lookForEditPart(source) == null && lookForEditPart(target) == null) {

-			return absoluteLocation.getTranslated(100, 0);

-		}

-		return absoluteLocation;

-	}

-

-	/**

-	 * the method provides command to create the binary link into the diagram.

-	 * Find source/target adapter

-	 * If the source and the target views do not exist, these views will be

-	 * created.

-	 * 

-	 * @see dropBinaryLink(CompositeCommand cc, Element source, Element target, int linkVISUALID

-	 *      , Point absoluteLocation, Element semanticLink)

-	 *

-	 * @param cc

-	 *            the composite command that will contain the set of command to

-	 *            create the binary link

-	 * @param source

-	 *            source/target link node

-	 * @param point

-	 *            source/target node location

-	 */

-	private IAdaptable findAdapter(CompositeCommand cc, Element source, Point dropLocation, String edgeType) {

-		IAdaptable result = getElement2IAdaptableRegistryHelper().findAdapter(source);

-		if (result != null) {

-			return result;

-		}

-		GraphicalEditPart editPart = (GraphicalEditPart) lookForEditPart(source);

-		if (editPart != null) {

-			return new SemanticAdapter(null, editPart.getModel());

-		}

-		if (isPortSource(source)) {

-			ICommand createPortCommand = createPortViewCommand(source, dropLocation);

-			cc.add(createPortCommand);

-			return (IAdaptable) createPortCommand.getCommandResult().getReturnValue();

-		}

-		ICommand createCommand = getDefaultDropNodeCommand(edgeType, dropLocation, source);

-		cc.add(createCommand);

-		return (IAdaptable) createCommand.getCommandResult().getReturnValue();

-	}

-

-	protected boolean isPortSource(Element source) {

-		return source instanceof Port;

-	}

-

-	private ICommand createPortViewCommand(Element source, Point dropLocation) {

-		if (false == source instanceof Port) {

-			return new CommandProxy(UnexecutableCommand.INSTANCE);

-		}

-		EditPart portContainer = lookForEditPart(source.eContainer(), true);

-		if (portContainer == null) {

-			return new CommandProxy(UnexecutableCommand.INSTANCE);

-		}

-		PortDropHelper portDropHelper = new PortDropHelper(getEditingDomain());

-		return portDropHelper.getDropPortOnPart((Port) source, dropLocation.getCopy(), (GraphicalEditPart) portContainer);

-	}

-

-	protected EditPart lookForEditPart(EObject semantic) {

-		return lookForEditPart(semantic, false);

-	}

-

-	/**

-	 * Look for editPart from his semantic.

-	 *

-	 * @param semantic

-	 *            the semantic

-	 *

-	 * @return the edits the part or null if not found

-	 */

-	protected EditPart lookForEditPart(EObject semantic, boolean byType) {

-		Collection<EditPart> editPartSet = getHost().getViewer().getEditPartRegistry().values();

-		Iterator<EditPart> editPartIterator = editPartSet.iterator();

-		while (editPartIterator.hasNext()) {

-			EditPart nextEditPart = editPartIterator.next();

-			if (!isEditPartTypeAdapted(nextEditPart.getClass(), semantic.eClass())) {

-				continue;

-			}

-			EObject nextSemantic = ((GraphicalEditPart) nextEditPart).resolveSemanticElement();

-			if (semantic.equals(nextSemantic)) {

-				return nextEditPart;

-			}

-			if (byType && nextSemantic instanceof TypedElement && ((TypedElement) nextSemantic).getType() != null) {

-				EObject nextSemanticType = ((TypedElement) nextSemantic).getType();

-				if (semantic.equals(nextSemanticType)) {

-					return nextEditPart;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Check if the edit part type is the best one to represent an object of the

-	 * given EClass type

-	 *

-	 * @param editPartClass

-	 *            the type of EditPart which may represent a semantic element

-	 * @param eClass

-	 *            the EClass type of the represented semantic element

-	 * @return true if an edit part of this type should be selected

-	 */

-	private boolean isEditPartTypeAdapted(Class<? extends EditPart> editPartClass, EClass eClass) {

-		if (DiagramEditPart.class.isAssignableFrom(editPartClass) || CompartmentEditPart.class.isAssignableFrom(editPartClass)) {

-			// the edit part is disqualified, as a compartment or a diagram can not be dropped

-			return false;

-		} else if (AbstractElementNodeLabelEditPart.class.isAssignableFrom(editPartClass)) {

-			return false;

-		} else if (GraphicalEditPart.class.isAssignableFrom(editPartClass)) {

-			// check the edit part type against advised ones

-			return isEditPartTypeSuitableForEClass(editPartClass.asSubclass(GraphicalEditPart.class), eClass);

-		}

-		return false;

-	}

-

-	/**

-	 * Check if an edit part type correctly represent a semantic element of the

-	 * given EClass. Subclasses should implement this method to restrict the

-	 * possibilities during drop of a link. If an edit part is not of a suitable

-	 * type, returning false will eliminate it to represent the element as a

-	 * source or target edit part. This can be used for example to disable label

-	 * edit parts, which may represent the same model element as the main node.

-	 *

-	 * @param editPartClass

-	 *            the type of EditPart which must be checked

-	 * @param eClass

-	 *            the EClass type of the element which the edit part must

-	 *            represent

-	 * @return the only edit part type which can be selected (return a common

-	 *         super type if several edit parts can be chosen)

-	 */

-	protected boolean isEditPartTypeSuitableForEClass(Class<? extends GraphicalEditPart> editPartClass, EClass eClass) {

-		return true;

-	}

-

-	/**

-	 * get the first valid target view for the given source. the couple source/target is valid if the path to them from the future container is valid

-	 *

-	 * @param sourceView

-	 * @param targetViews

-	 * @return

-	 */

-	private View getFirstValidTargetViewForSource(View sourceView, Collection<View> targetViews, Connector droppedConnector) {

-		for (View targetView : targetViews) {

-			if (isValidTargetViewForSource(sourceView, targetView, droppedConnector)) {

-				return targetView;

-			}

-		}

-

-		return null;

-	}

-

-	private boolean isValidTargetViewForSource(View sourceView, View targetView, Connector droppedConnector) {

-		if (!(utils.isCrossingEncapsulation(sourceView, targetView))) {

-			// no encapsulation. Computes the end paths

-			List<Property> sourceNestedPaths = utils.getNestedPropertyPath(sourceView, targetView);

-			List<Property> targetNestedPaths = utils.getNestedPropertyPath(targetView, sourceView);

-

-			// check this is compatible with current connector

-			ConnectorEnd sourceConnectorEnd = utils.getSourceConnectorEnd(droppedConnector);

-			NestedConnectorEnd nestedSourceConnectorEnd = UMLUtil.getStereotypeApplication(sourceConnectorEnd, NestedConnectorEnd.class);

-			if (nestedSourceConnectorEnd != null) {

-				List<Property> currentSourceConnectorPropertyPath = nestedSourceConnectorEnd.getPropertyPath();

-				// compare the 2 list

-				if (!sourceNestedPaths.equals(currentSourceConnectorPropertyPath)) {

-					return false;

-				}

-

-			} else { // no end for the current connector, so the sourceNestedPath should be empty

-				if (!sourceNestedPaths.isEmpty()) {

-					return false;

-				}

-			}

-

-

-			ConnectorEnd targetConnectorEnd = utils.getTargetConnectorEnd(droppedConnector);

-			NestedConnectorEnd nestedTargetConnectorEnd = UMLUtil.getStereotypeApplication(targetConnectorEnd, NestedConnectorEnd.class);

-			if (nestedTargetConnectorEnd != null) {

-				List<Property> currentTargetConnectorPropertyPath = nestedTargetConnectorEnd.getPropertyPath();

-				// compare the 2 list

-				if (!targetNestedPaths.equals(currentTargetConnectorPropertyPath)) {

-					return false;

-				}

-

-			} else { // no end for the current connector, so the targetNestedPaths should be empty

-				if (!targetNestedPaths.isEmpty()) {

-					return false;

-				}

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * This methods looks for views representing a given {@link ConnectorEnd} in the host diagram.

-	 *

-	 * @param end

-	 *            the {@link ConnectorEnd} to look for.

-	 * @return the list of {@link View} representing the eObject.

-	 */

-	protected Set<View> getViewsForConnectorEnd(ConnectorEnd end) {

-		Set<View> views = new HashSet<View>();

-

-		// Retrieve host diagram

-		View hostView = ((IGraphicalEditPart) getHost()).getNotationView();

-		View hostDiagram = (hostView instanceof Diagram) ? hostView : hostView.getDiagram();

-

-		// Retrieve all views for the ConnectorEnd role

-		EReference[] refs = { NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> relatedViews = EMFCoreUtil.getReferencers(end.getRole(), refs);

-

-		// TODO: We should filter views not only for the current diagram,

-		// but also consider only views nested within the owner of the connector that are closest to the host view

-		// (in case there are several instances of a Part within which the connector could appear).

-		// Connector connector = (Connector)end.getOwner();

-		// StructuredClassifier connectorOwner = (StructuredClassifier)connector.getOwner();

-		// Parse and select views from host diagram only

-		Iterator<View> it = relatedViews.iterator();

-		while (it.hasNext()) {

-			View currentView = it.next();

-			if (currentView.getDiagram() == hostDiagram) { // FIXME: Cf TODO above.

-

-				boolean isInView = false;

-				View containerView = currentView;

-				while (containerView != null && !(containerView instanceof Diagram)) {

-					if (containerView == getReferenceViewForConnectorEnd()) {

-						isInView = true;

-					}

-					containerView = ViewUtil.getContainerView(containerView);

-				}

-

-				if (isInView) {

-

-					EObject containerElement = ViewUtil.getContainerView(currentView).getElement();

-

-					// If the ConnectorEnd partWithPort is not null, only select Views for which

-					// the graphical parent reference partWithPort.

-					if (end.getPartWithPort() != null) {

-						if (containerElement == end.getPartWithPort()) {

-							views.add(currentView);

-						}

-					} else {

-						// If the role is a Port, its graphical parent is a EncapsulatedClassifier

-						if (end.getRole() instanceof Port) {

-							if (containerElement instanceof EncapsulatedClassifier) {

-								views.add(currentView);

-							} else if (containerElement instanceof Property) {

-								Property property = (Property) containerElement;

-								if (property.getType() == end.getRole().getOwner()) {

-									views.add(currentView);

-								}

-							}

-						} else { // No further test needed

-							views.add(currentView);

-						}

-

-					}

-				}

-			}

-		}

-

-		return views;

-	}

-

-	protected View getReferenceViewForConnectorEnd() {

-		return ((IGraphicalEditPart) getHost()).getNotationView();

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
deleted file mode 100644
index 7b659b42d00..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/CustomNestedBlockPropertyCompositeSemanticEditPolicy.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.NestedBlockPropertyCompositeSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.CustomGraphicalTypeRegistry;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.GraphicalTypeRegistry;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsReorientCommand;

-

-/**

- * <pre>

- * Custom semantic edit policy that replace DefaultSemanticEditPolicy

- * in order to manage Class Diagram specific elements (reference

- * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).

- * </pre>

- */

-@Deprecated

-public class CustomNestedBlockPropertyCompositeSemanticEditPolicy extends NestedBlockPropertyCompositeSemanticEditPolicy {

-

-	/** Local graphical type registry for graphical elements */

-	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();

-

-	/** Local graphical type registry for inherited graphical elements */

-	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementsCreateCommand(req));

-		}

-

-		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());

-

-		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		return super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-

-		View reconnectedView = (View) req.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);

-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;

-

-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));

-		}

-

-		if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {

-			return getGEFWrapper(new ConstraintConstrainedElementsReorientCommand(req));

-		}

-

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/EncapsulatedClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/EncapsulatedClassifierDropEditPolicy.java
deleted file mode 100644
index 29acc513d95..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/EncapsulatedClassifierDropEditPolicy.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.TypeDropHelper;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * <pre>
- * Customization of the DND edit policy for the EncapsulatedClassifier, that enables the direct
- * creation of typed Port or FlowPort by dragging types over diagram figure.
- * </pre>
- */
-public class EncapsulatedClassifierDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public EncapsulatedClassifierDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-
-		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to create a Port typed by the dropped object
-			Command dropAsTypedPort = helper.getDropAsTypedPort(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropAsTypedPort != null) && (dropAsTypedPort.canExecute())) {
-				commandChoice.add(dropAsTypedPort);
-			}
-
-			// 2. Try to create a FlowPort (In - Out - InOut) typed by the dropped object
-			Command dropAsTypedFlowPort_In = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT);
-			if ((dropAsTypedFlowPort_In != null) && (dropAsTypedFlowPort_In.canExecute())) {
-				commandChoice.add(dropAsTypedFlowPort_In);
-			}
-			Command dropAsTypedFlowPort_Out = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_IN);
-			if ((dropAsTypedFlowPort_Out != null) && (dropAsTypedFlowPort_Out.canExecute())) {
-				commandChoice.add(dropAsTypedFlowPort_Out);
-			}
-			Command dropAsTypedFlowPort_InOut = helper.getDropAsTypedFlowPort(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.FLOW_PORT_OUT);
-			if ((dropAsTypedFlowPort_InOut != null) && (dropAsTypedFlowPort_InOut.canExecute())) {
-				commandChoice.add(dropAsTypedFlowPort_InOut);
-			}
-
-			// 3. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/ShowHideRelatedLinkEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/ShowHideRelatedLinkEditPolicy.java
deleted file mode 100644
index 8dbef1143c2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/ShowHideRelatedLinkEditPolicy.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.structure.DiagramStructure;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.UpdaterLinkDescriptor;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.Domain2Notation;
-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
-import org.eclipse.papyrus.sysml.diagram.internalblock.part.SysMLDiagramUpdater;
-import org.eclipse.papyrus.sysml.diagram.internalblock.part.SysMLVisualIDRegistry;
-import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractUMLShowHideRelatedLinkEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Property;
-
-// TODO: Auto-generated Javadoc
-/**
- * The edit policy to use in the IBD diagram to restore existing links.
- */
-public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLinkEditPolicy {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param host
-	 *            the host
-	 */
-	public ShowHideRelatedLinkEditPolicy(DiagramEditPart host) {
-		super(host);
-	}
-
-	/**
-	 * Gets the diagram updater.
-	 *
-	 * @return the diagram updater
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramUpdater()
-	 */
-	public DiagramUpdater getDiagramUpdater() {
-		return SysMLDiagramUpdater.TYPED_INSTANCE;
-	}
-
-	/**
-	 * Gets the diagram structure.
-	 *
-	 * @return the diagram structure
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramStructure()
-	 */
-	public DiagramStructure getDiagramStructure() {
-		return SysMLVisualIDRegistry.TYPED_INSTANCE;
-	}
-
-	/**
-	 * Gets the semantic hint.
-	 *
-	 * @param eobject
-	 *            the eobject
-	 * @return the semantic hint
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#getSemanticHint(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	protected String getSemanticHint(final EObject eobject) {
-		return SysMLVisualIDRegistry.getLinkWithClassVisualID(eobject);
-	}
-
-	/**
-	 * Clean add.
-	 *
-	 * @param result
-	 *            the result
-	 * @param view
-	 *            the view
-	 * @param descriptors
-	 *            the descriptors
-	 * @param domain2NotationMap
-	 *            the domain2 notation map
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#cleanAdd(java.util.Collection, org.eclipse.gmf.runtime.notation.View, java.util.List, java.util.Map)
-	 */
-	@Override
-	protected void cleanAdd(final Collection<UpdaterLinkDescriptor> result, final View view, final List<? extends UpdaterLinkDescriptor> descriptors, final Domain2Notation domain2NotationMap) {
-		cleanAddForConnector(result, view, descriptors, domain2NotationMap);
-		super.cleanAdd(result, view, descriptors, domain2NotationMap);
-	}
-
-	/**
-	 * This method manages descriptors representing Connector to verify that it
-	 * can be displayed according to the nestedPath of the {@link ConnectorEnd} If the connector can be displayed :
-	 * <ul>
-	 * <li>
-	 * the link descriptor is removed from descriptors and added to result</li>
-	 * <li>
-	 * the view associated to the role of the connector are added to domain2NotationMap (using the ConnectorEnd as key)</li>
-	 * </ul>
-	 * .
-	 *
-	 * @param result
-	 *            the result of the method
-	 * @param view
-	 *            a view
-	 * @param descriptors
-	 *            the link descriptors
-	 * @param domain2NotationMap
-	 *            the map between model element and views
-	 */
-	protected void cleanAddForConnector(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Domain2Notation domain2NotationMap) {
-		final List<UpdaterLinkDescriptor> toRemove = new ArrayList<UpdaterLinkDescriptor>();
-		for (final Object current : descriptors) {
-			if (current instanceof UpdaterLinkDescriptor) {
-				final UpdaterLinkDescriptor descriptor = (UpdaterLinkDescriptor) current;
-				final EObject element = descriptor.getModelElement();
-				if (element instanceof Connector) {
-					if (canBeDisplayed((Connector) element, view, domain2NotationMap)) {
-						result.add((UpdaterLinkDescriptor) current);
-					}
-					toRemove.add((UpdaterLinkDescriptor) current);
-				}
-			}
-		}
-		descriptors.removeAll(toRemove);
-	}
-
-	/**
-	 * Checks if is correct graphical view.
-	 *
-	 * @param connectorEnd
-	 *            a connector end
-	 * @param view
-	 *            a view
-	 * @return <code>true</code> if the view represents the role of the
-	 *         connector AND if the view is encapsulated as required by the
-	 *         nested path of the connector end
-	 */
-	protected boolean isCorrectGraphicalView(final ConnectorEnd connectorEnd, final View view) {
-		final NestedConnectorEnd nestedConnectorEnd = org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(connectorEnd, NestedConnectorEnd.class);
-		final Property partWithPort = connectorEnd.getPartWithPort();
-		// final ConnectableElement role = end.getRole();
-		// 1. we get the top view of this view with the same semantic element
-		View localView = getTopViewWithSameSemanticElement(view);
-
-		// 2. we verify the part with port
-		if (partWithPort != null) {
-			View parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(localView));
-			if (parent.getElement() != partWithPort) {
-				return false;
-			}
-		}
-
-		// 3. we verify the nested path
-		if (nestedConnectorEnd != null && nestedConnectorEnd.getPropertyPath().size() > 0) {
-			View parent = view;
-			final List<Property> paths = nestedConnectorEnd.getPropertyPath();
-			for (int i = paths.size() - 1; i >= 0; i--) {
-				final Property currentProperty = paths.get(i);
-				parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(parent));
-				if (parent.getElement() != currentProperty) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Can be displayed.
-	 *
-	 * @param connector
-	 *            a connector
-	 * @param selectedView
-	 *            a view used as source or target for the connector to display
-	 * @param domain2NotationMap
-	 *            the map to complete if we found source and target View on the
-	 *            diagram to diplsay the connector
-	 * @return <code>true</code> if the view can be used as source/target for
-	 *         the connector according to the nested path AND if we found a
-	 *         second view for the 2nd connector end according to the nested
-	 *         path
-	 */
-	protected boolean canBeDisplayed(final Connector connector, final View selectedView, final Domain2Notation domain2NotationMap) {
-		// we need to verify the selected view
-		final EObject semanticElement = selectedView.getElement();
-		ConnectorEnd endForView = null;
-
-		// 1. look for the connector end represented by the selected view
-		for (final ConnectorEnd current : connector.getEnds()) {
-			if (current.getRole() == semanticElement) {
-				endForView = current;
-				break;
-			}
-		}
-		Assert.isNotNull(endForView);
-		// 2. verify the view of the selected connector end
-		if (!isCorrectGraphicalView(endForView, selectedView)) {
-			return false;
-		}
-
-		// 3. try to find a view for the second connector end
-		View secondView = null;
-		for (final ConnectorEnd end : connector.getEnds()) {
-			final ConnectableElement role = end.getRole();
-			if (role == null) {
-				return false;
-			}
-			if (end == endForView) {
-				continue;
-			}
-
-			final Set<View> views = CrossReferencerUtil.getCrossReferencingViewsInDiagram(role, getCurrentDiagram());
-			final Iterator<View> iterOnView = views.iterator();
-			while (secondView == null && iterOnView.hasNext()) {
-				final View currentView = iterOnView.next();
-				if (isCorrectGraphicalView(end, currentView)) {
-					domain2NotationMap.putView(endForView, selectedView);
-					domain2NotationMap.putView(end, currentView);
-					secondView = currentView;
-				}
-			}
-		}
-		return secondView != null;
-	}
-
-	/**
-	 * Gets the show link command.
-	 *
-	 * @param domain
-	 *            the editing domain to use for this command
-	 * @param linkToShow
-	 *            a link to show
-	 * @param domain2NotationMap
-	 *            the domain2 notation map
-	 * @param linkDescriptors
-	 *            the link descriptors
-	 * @return the command to display the link on the diagram
-	 */
-	@Override
-	protected ICommand getShowLinkCommand(final TransactionalEditingDomain domain, final EObject linkToShow, final Domain2Notation domain2NotationMap, final Collection<? extends UpdaterLinkDescriptor> linkDescriptors) {
-
-		if (!(linkToShow instanceof Connector)) {
-			return super.getShowLinkCommand(domain, linkToShow, domain2NotationMap, linkDescriptors);
-		}
-		domain2NotationMap.mapModel((View) getHost().getAdapter(View.class));
-
-		// we look for the link descriptor
-		UpdaterLinkDescriptor updaterLinkDescriptor = getLinkDescriptor(linkToShow, linkDescriptors);
-		ICommand showLinkCommandFromUpdaterLinkDescriptor = getShowLinkCommandFromUpdaterLinkDescriptor(linkToShow, domain2NotationMap, updaterLinkDescriptor);
-		return showLinkCommandFromUpdaterLinkDescriptor;
-	}
-
-
-	/**
-	 * Gets the show link command from updater link descriptor.
-	 *
-	 * @param linkToShow
-	 *            the link to show
-	 * @param domain2NotationMap
-	 *            the domain2 notation map
-	 * @param descriptor
-	 *            the descriptor
-	 * @return the show link command from updater link descriptor
-	 */
-	private ICommand getShowLinkCommandFromUpdaterLinkDescriptor(final EObject linkToShow, final Domain2Notation domain2NotationMap, UpdaterLinkDescriptor descriptor) {
-		ConnectorUtils connectorUtils = new ConnectorUtils();
-
-		if (descriptor != null) {
-
-			Set<View> sourceViewList = domain2NotationMap.get(descriptor.getSource());
-			Set<View> targetViewList = domain2NotationMap.get(descriptor.getDestination());
-
-
-			final Set<View> linkSet = domain2NotationMap.get(linkToShow);
-
-			CompositeCommand compositeCommand = new CompositeCommand("Restore All Related Links");
-			for (View sourceView : sourceViewList) {
-				for (View targetView : targetViewList) {
-					if (canDisplayExistingLinkBetweenViews(linkToShow, sourceView, targetView)) {
-
-						if (ConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) linkToShow, sourceView, targetView)) {
-							boolean alreadyDisplayed = false;
-							if (linkSet != null) {
-								for (View viewLink : linkSet) {
-									boolean linkForViews = isLinkForViews((org.eclipse.gmf.runtime.notation.Connector) viewLink, sourceView, targetView);
-									alreadyDisplayed = alreadyDisplayed || linkForViews;
-								}
-							}
-
-							if (!alreadyDisplayed) {
-								EditPart sourceEditPart = getEditPartFromView(sourceView);
-								EditPart targetEditPart = getEditPartFromView(targetView);
-
-								// If the parts are still null...
-								if (sourceEditPart == null || targetEditPart == null) {
-									return null;
-								}
-								String semanticHint = getSemanticHint(linkToShow);
-								CreateConnectionViewRequest.ConnectionViewDescriptor viewDescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(descriptor.getSemanticAdapter(), semanticHint, ViewUtil.APPEND, false,
-										((GraphicalEditPart) getHost()).getDiagramPreferencesHint());
-								CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(viewDescriptor);
-								ccr.setType(org.eclipse.gef.RequestConstants.REQ_CONNECTION_START);
-								ccr.setSourceEditPart(sourceEditPart);
-								sourceEditPart.getCommand(ccr);
-								ccr.setTargetEditPart(targetEditPart);
-								ccr.setType(org.eclipse.gef.RequestConstants.REQ_CONNECTION_END);
-								CommandProxy commandProxy = new CommandProxy(targetEditPart.getCommand(ccr));
-								compositeCommand.add(commandProxy);
-							}
-						}
-					}
-				}
-			}
-			return compositeCommand;
-		}
-		return null;
-	}
-
-
-
-
-
-	/**
-	 * Can display existing link between views.
-	 *
-	 * @param connector
-	 *            the connector
-	 * @param sourceView
-	 *            the source view
-	 * @param targetView
-	 *            the target view
-	 * @return true, if successful
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#canDisplayExistingLinkBetweenViews(org.eclipse.uml2.uml.Connector, org.eclipse.gmf.runtime.notation.View, org.eclipse.gmf.runtime.notation.View)
-	 */
-
-	@Override
-	public boolean canDisplayExistingLinkBetweenViews(final EObject element, final View sourceView, final View targetView) {
-		return (element instanceof Connector) && ConnectorUtils.canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths((Connector) element, sourceView, targetView);
-	}
-
-	/**
-	 * Checks if is link for views.
-	 *
-	 * @param link
-	 *            a connector existing in the model
-	 * @param sourceView
-	 *            a potential source for this connector
-	 * @param targetView
-	 *            a potential target for this connector
-	 * @return true, if is link for views <code>true</code> if displaying the existing connector between this source and this target view is correct
-	 */
-	public final boolean isLinkForViews(final org.eclipse.gmf.runtime.notation.Connector link, final View sourceView, final View targetView) {
-		View source = link.getSource();
-		View target = link.getTarget();
-		boolean isDrawingAllowed = source.equals(sourceView) && target.equals(targetView);
-		boolean isReverseDrawingAllowed = source.equals(targetView) && target.equals(sourceView);
-		return isDrawingAllowed || isReverseDrawingAllowed;
-	}
-
-
-
-	/**
-	 * Gets the top view with same semantic element.
-	 *
-	 * @param view
-	 *            a view
-	 * @return the last parent of this view referencing the same semantic
-	 *         element
-	 */
-	protected View getTopViewWithSameSemanticElement(final View view) {
-		final EObject semanticElement = view.getElement();
-		View parent = view;
-		View lastParent = view;
-		while (parent.getElement() == semanticElement) {
-			lastParent = parent;
-			parent = (View) parent.eContainer();
-		}
-		return lastParent;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/StructureClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/StructureClassifierDropEditPolicy.java
deleted file mode 100644
index 5cc31f8aba1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/StructureClassifierDropEditPolicy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.BlockDropHelper;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * <pre>
- * Customization of the DND edit policy for the StructureClassifier compartments, that enables the direct
- * creation of typed Part, Reference, Value, ActorPart or Property by dragging types in a Block structure compartment.
- * </pre>
- */
-public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public StructureClassifierDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-
-		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
-			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
-				commandChoice.add(dropAsTypedPart);
-			}
-
-			// 2. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
-				commandChoice.add(dropAsTypedReference);
-			}
-
-			// 3. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
-				commandChoice.add(dropAsTypedActorPart);
-			}
-
-			// 4. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
-				commandChoice.add(dropAsTypedValue);
-			}
-
-			// 5. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
-			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
-				commandChoice.add(dropAsTypedProperty);
-			}
-
-			// 6. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected View getReferenceViewForConnectorEnd() {
-		return ViewUtil.getContainerView(super.getReferenceViewForConnectorEnd());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/TypedElementDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/TypedElementDropEditPolicy.java
deleted file mode 100644
index 3bebb6a8502..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/edit/policy/TypedElementDropEditPolicy.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.TypeDropHelper;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * <pre>
- * Customization of the DND edit policy for TypedElement (Port, Part, Reference, FlowPort), that enables
- * type modification by a drop on target.
- * </pre>
- */
-public class TypedElementDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public TypedElementDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to set the target element type with dropped object
-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {
-				commandChoice.add(dropAsSetType);
-			}
-
-			// 3. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/InternalBlockManageInterfacesHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/InternalBlockManageInterfacesHandler.java
deleted file mode 100644
index d3a6bfd50ce..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/InternalBlockManageInterfacesHandler.java
+++ /dev/null
@@ -1,46 +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:
- *	Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.internalblock.handler;
-
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.papyrus.sysml.diagram.internalblock.ui.InternalBlockInterfaceManagerDialog;
-import org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler;
-import org.eclipse.papyrus.uml.diagram.common.dialogs.IPortInterfaceManagerDialog;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Usage;
-
-/**
- * <pre>
- * This handler provides the handler to manage the provided and required {@link Interface}
- * of a {@link Port} without graphically creating {@link InterfaceRealization} and
- * {@link Usage} relationships.
- * </pre>
- */
-public class InternalBlockManageInterfacesHandler extends ManagePortInterfacesHandler {
-
-
-
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler#getInterfaceManagerDialog(org.eclipse.uml2.uml.Port)
-	 *
-	 * @param port
-	 * @return
-	 */
-	@Override
-	public IPortInterfaceManagerDialog getInterfaceManagerDialog(Port port) {
-		return new InternalBlockInterfaceManagerDialog(DisplayUtils.getDefaultShell(), port);
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsAction.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsAction.java
deleted file mode 100644
index 86b6498219e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.handler;

-

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.internalblock.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.common.actions.ShowHideContentsAction;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

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

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

-

-public class ShowHideRelatedContentsAction extends ShowHideContentsAction {

-

-	/** Constructor. */

-	public ShowHideRelatedContentsAction() {

-		super(Messages.ShowHideRelatedContentsAction_Title, Messages.ShowHideRelatedContentsAction_Message, ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.diagram.common.actions.AbstractShowHideAction#initAction()

-	 */

-	@Override

-	protected void initAction() {

-		super.initAction();

-

-		for (IGraphicalEditPart current : this.selectedElements) {

-			// the selected elements which aren't Classifier are ignored

-			if (((View) current.getModel()).getElement() instanceof Property) {

-				Property property = (Property) ((View) current.getModel()).getElement();

-				if (property.getType() instanceof Classifier) {

-					this.representations.add(new RootEditPartRepresentation(current, (Classifier) property.getType()));

-				}

-			}

-		}

-		// setEditorLabelProvider(new EditorLabelProvider());

-		// this.representations = new ArrayList<AbstractShowHideAction.EditPartRepresentation>();

-		//

-		// for(EditPart current : this.selectedElements) {

-		// //the selected elements which aren't Classifier are ignored

-		// EObject element = ((View)current.getModel()).getElement();

-		// if(element instanceof Property) {

-		// Type type = ((Property)element).getType();

-		// if(type instanceof Classifier) {

-		// this.representations.add(new CustomEditPartRepresentation(current, (Classifier)type));

-		// }

-		// }

-		// }

-		// this.setEditorLabelProvider(new CustomEditorLabelProvider());

-		// this.setContentProvider(new CustomContentProvider());

-

-	}

-

-	// protected class CustomContentProvider extends ShowHideContentsAction.ContentProvider {

-	//

-	// /**

-	// * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	// *

-	// * @param element

-	// * @return

-	// */

-	// @Override

-	// public Object getParent(Object element) {

-	// if(!(element instanceof EditPartRepresentation)) {

-	// EditPartRepresentation rep = findEditPartRepresentation(element);

-	// if(rep != null) {

-	// //element can be owned by the class (rep), or by a superclass (ClassifierRepresentation)

-	// List<ClassifierRepresentation> classes = ((CustomEditPartRepresentation)rep).getSuperClasses();

-	// for(ClassifierRepresentation classifierRepresentation : classes) {

-	// if(classifierRepresentation.getRepresentedClassifier().getOwnedMembers().contains(element)) {

-	// return classifierRepresentation;

-	// }

-	// }

-	// }

-	// return rep;

-	// }

-	// return null;

-	// }

-	// }

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsHandler.java
deleted file mode 100644
index 382fbcf2207..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/handler/ShowHideRelatedContentsHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.handler;

-

-import org.eclipse.papyrus.uml.diagram.common.actions.handlers.AbstractShowHideHandler;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

-

-/**

- * Handler for the {@link ShowHideRelatedContentsAction}

- */

-public class ShowHideRelatedContentsHandler extends AbstractShowHideHandler {

-

-	/** Constructor. */

-	public ShowHideRelatedContentsHandler() {

-		super(new ShowHideRelatedContentsAction(), ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/DeleteViewDuringMoveHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/DeleteViewDuringMoveHelperAdvice.java
deleted file mode 100644
index 3963b3f7047..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/DeleteViewDuringMoveHelperAdvice.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-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.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * <pre>
- * Edit helper advice that delete views from diagram when an element is
- * moved in a new container (in the model explorer).
- *
- * Block is an exception as the IBD is attached to the Block itself, removing it
- * would result in an unusable IBD.
- * </pre>
- */
-public class DeleteViewDuringMoveHelperAdvice extends AbstractEditHelperAdvice {
-
-	@Override
-	protected ICommand getBeforeMoveCommand(MoveRequest request) {
-
-		ICommand moveCommand = super.getBeforeMoveCommand(request);
-
-		Set<View> viewsToDestroy = new HashSet<View>();
-
-		@SuppressWarnings("unchecked")
-		Iterator<EObject> it = request.getElementsToMove().keySet().iterator();
-		while (it.hasNext()) {
-			EObject eObject = it.next();
-
-			// If current eObject is a Block do nothing.
-			if (!((eObject instanceof Property && ((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(((Property) eObject).getType())))) {
-				viewsToDestroy.addAll(getViewsToDestroy(eObject));
-			}
-		}
-
-		if (!viewsToDestroy.isEmpty()) {
-			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getTargetContainer(), false);
-			ddr.setClientContext(request.getClientContext());
-			ddr.addParameters(request.getParameters());
-			ICommand destroyViewsCommand = ddr.getDestroyDependentsCommand(viewsToDestroy);
-			moveCommand = CompositeCommand.compose(moveCommand, destroyViewsCommand);
-		}
-
-		return moveCommand;
-	}
-
-	/**
-	 * This methods looks for inconsistent views to delete in case a semantic move done in the model explorer.
-	 *
-	 * @param movedObject
-	 *            the moved {@link EObject}
-	 * @return the list of {@link View} to delete
-	 */
-	protected Set<View> getViewsToDestroy(EObject movedObject) {
-		Set<View> viewsToDestroy = new HashSet<View>();
-
-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(movedObject, ElementTypes.DIAGRAM_ID).iterator();
-		while (viewIt.hasNext()) {
-			View view = viewIt.next();
-
-			String containerType = ViewUtil.getViewContainer(view) != null ? ViewUtil.getViewContainer(view).getType() : null;
-
-			// Views are to be destroyed if they are not the diagram itself (containerType == null)
-			// and not a view directly owned by the diagram (the current policy in Papyrus allows
-			// to drop nearly anything in the diagram whatever the semantic container).
-			if ((containerType != null) && !ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				viewsToDestroy.add(view);
-			}
-		}
-
-		return viewsToDestroy;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/PropertyHelperAdvice.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/PropertyHelperAdvice.java
deleted file mode 100644
index 8ab5132b02a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/helper/advice/PropertyHelperAdvice.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.helper.advice;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

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

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

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

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

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.DecorationNode;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;

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

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

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

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

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

-

-/**

- *

- * This advice is used to remove the view of the parts which become inconsistent when we change the type of the property

- *

- */

-public class PropertyHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * Returns the command to destroy the views of the parts which are not owned by the new type

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeSetCommand(org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)

-	 *

-	 * @param request

-	 *            the request to modify the model

-	 * @return

-	 * 		the command to destroy the views of the parts which are not owned by the new type

-	 *

-	 */

-	@Override

-	protected ICommand getBeforeSetCommand(SetRequest request) {

-		Type oldType = null;

-		Type newType = null;

-

-		EObject elementToEdit = request.getElementToEdit();

-		Set<View> viewsToDelete = new HashSet<View>();

-		if ((elementToEdit instanceof Property) && (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && ((request.getValue() == null) || (request.getValue() instanceof Type))) {

-

-			Property propertyToEdit = (Property) elementToEdit;

-

-			oldType = propertyToEdit.getType();

-			newType = (Type) request.getValue();

-

-			if ((oldType != null) && (oldType instanceof Classifier) && ((request.getValue() == null) || (newType instanceof Classifier))) {

-

-				EList<NamedElement> newTypeMembers = (newType != null) ? ((Classifier) newType).getMembers() : new BasicEList<NamedElement>();

-				EList<NamedElement> oldTypeMembers = ((Classifier) oldType).getMembers();

-

-				// Remove members of the new type from the list.

-				// oldTypeMembers now contains the list of members for which views will become

-				// inconsistent (if shown in the propertyToEdit) after setting the new type.

-				Set<NamedElement> possiblyInconsistentMembers = new HashSet<NamedElement>();

-				possiblyInconsistentMembers.addAll(oldTypeMembers);

-				possiblyInconsistentMembers.removeAll(newTypeMembers);

-

-				if (!possiblyInconsistentMembers.isEmpty()) {

-

-					Set<View> propertyToEditViews = null;

-

-					// Parse the list of possibly inconsistent members

-					for (NamedElement possiblyInconsistentMember : possiblyInconsistentMembers) {

-

-						// Retrieve views of the current possiblyInconsistentMember

-						Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(possiblyInconsistentMember, ElementTypes.DIAGRAM_ID).iterator();

-						while (viewIt.hasNext()) {

-							if (propertyToEditViews == null) {

-								propertyToEditViews = CrossReferencerUtil.getCrossReferencingViews(propertyToEdit, ElementTypes.DIAGRAM_ID);

-							}

-

-							View possiblyInconsistentMemberView = viewIt.next();

-							if (isConcerned(possiblyInconsistentMemberView, propertyToEditViews)) {

-								viewsToDelete.add(possiblyInconsistentMemberView);

-							}

-						}

-					}

-				}

-			}

-		}

-

-		if ((viewsToDelete != null) && !(viewsToDelete.isEmpty())) {

-			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

-			req.setClientContext(request.getClientContext());

-			req.addParameters(request.getParameters());

-			return req.getDestroyDependentsCommand(viewsToDelete);

-		}

-

-		return null;

-	}

-

-	/**

-	 * Tests if the view must be deleted

-	 *

-	 * @param view

-	 *            the view to test

-	 * @param list

-	 *            the list of the property view

-	 * @return

-	 * 		<code>true</code> if the view need to be removed <code>false</code> if not

-	 */

-	protected boolean isConcerned(View view, Set<View> propertyViews) {

-

-		EObject parentView = view.eContainer();

-		if (parentView instanceof DecorationNode) {

-			parentView = parentView.eContainer();

-		}

-		return propertyViews.contains(parentView);

-

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/messages/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/messages/Messages.java
deleted file mode 100644
index d0d0e618f72..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/messages/Messages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	public static String Notification_Drop_Title;
-
-	public static String Notification_Drop_UMLAssociationWarning;
-
-	public static String ShowHideRelatedContentsAction_Title;
-
-	public static String ShowHideRelatedContentsAction_Message;
-
-	static {
-		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
-	}
-
-	private Messages() {
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilerUndefinedTo100.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilerUndefinedTo100.java
deleted file mode 100644
index 5831b5728f6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/InternalBlockDiagramReconcilerUndefinedTo100.java
+++ /dev/null
@@ -1,238 +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:

- *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.migration;

-

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

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

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

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

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

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

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

-import org.eclipse.emf.transaction.util.TransactionUtil;

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

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

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-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.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewServiceUtil;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

-

-/**

- * Internal Block Diagram Reconciler from undefined to 1.0.0

- */

-public class InternalBlockDiagramReconcilerUndefinedTo100 extends DiagramReconciler {

-

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		try {

-

-			CompoundCommand cc = new CompoundCommand("Update Internal Block Diagram From Undefined To 1.0.0");

-

-			Command updateCommandFromUndefinedTo_081 = getUpdateCommandFromUndefinedTo_081(diagram);

-			Command updateCommandFrom081To_091 = getUpdateCommandFrom081To_091(diagram);

-			cc.append(updateCommandFromUndefinedTo_081);

-			cc.append(updateCommandFrom081To_091);

-

-			return EMFtoGMFCommandWrapper.wrap(cc);

-		} catch (Exception e) {

-			Activator.log.error(e);

-			return UnexecutableCommand.INSTANCE;

-		}

-	}

-

-

-	public static Command getUpdateCommandFromUndefinedTo_081(final Diagram diagram) throws Exception {

-

-		Command command = new RecordingCommand(TransactionUtil.getEditingDomain(diagram), "Diagram version updater (from undefined to 0.8.1)") {

-

-			private Map<String, String> conversionMapping = new HashMap<String, String>();

-

-			private void initializeMappings() {

-

-				conversionMapping.put(OldElementTypes.CLASS_HINT, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);

-				conversionMapping.put(OldElementTypes.CLASS_LABEL_COMPOSITE_NAME_HINT, SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);

-				conversionMapping.put(OldElementTypes.CLASS_COMPARTMENT_STRUCTURE_HINT, SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID);

-

-				conversionMapping.put(OldElementTypes.PROPERTY_CN_HINT, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);

-				conversionMapping.put(OldElementTypes.PROPERTY_CN_LABEL_PART_NAME_HINT, UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);

-				conversionMapping.put(OldElementTypes.PROPERTY_CN_COMPARTMENT_STRUCTURE_HINT, SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);

-

-				conversionMapping.put(OldElementTypes.PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID);

-

-				conversionMapping.put(OldElementTypes.CONNECTOR_HINT, UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);

-				conversionMapping.put(OldElementTypes.CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID);

-				conversionMapping.put(OldElementTypes.CONNECTOR_LABEL_NAME_HINT, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID);

-				conversionMapping.put(OldElementTypes.CONNECTOR_LABEL_MULTIPLICITY_SOURCE_HINT, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID);

-				conversionMapping.put(OldElementTypes.CONNECTOR_LABEL_MULTIPLICITY_TARGET_HINT, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID);

-

-			}

-

-			@Override

-			protected void doExecute() {

-				initializeMappings();

-

-				List<View> blockViews = new ArrayList<View>();

-				List<View> portViews = new ArrayList<View>();

-

-				// Update diagram compatibility version

-				// DiagramVersioningUtils.setCompatibilityVersion(diagram, "0.8.1");

-

-				// Update view types

-				Iterator<EObject> it = diagram.eAllContents();

-				while (it.hasNext()) {

-					EObject currentEObject = it.next();

-					if (currentEObject instanceof View) {

-						View currentView = (View) currentEObject;

-

-						if (conversionMapping.containsKey(currentView.getType())) {

-							if (currentView.getType().equals(OldElementTypes.CLASS_HINT)) {

-								blockViews.add(currentView);

-							}

-

-							currentView.setType(conversionMapping.get(currentView.getType()));

-						}

-

-						// Port require specific conversion

-						if (currentView.getType().equals(OldElementTypes.PORT_CN_HINT) || currentView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

-							portViews.add(currentView);

-						}

-					}

-				}

-

-				// Specific conversion cases

-				for (View portView : portViews) {

-					EObject eObject = portView.getElement();

-

-					if (((ISpecializationType) SysMLElementTypes.FLOW_PORT).getMatcher().matches(eObject)) {

-

-						if (portView.getType().equals(OldElementTypes.PORT_CN_HINT)) {

-							portView.setType(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);

-						}

-

-						if (portView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

-							portView.setType(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);

-						}

-

-					} else { // if (eObject instanceof Port)

-

-						if (portView.getType().equals(OldElementTypes.PORT_CN_HINT)) {

-							portView.setType(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);

-						}

-

-						if (portView.getType().equals(OldElementTypes.PORT_CN_LABEL_NAME_HINT)) {

-							portView.setType(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);

-						}

-					}

-				}

-

-				// Update settings

-				for (View blockView : blockViews) {

-					EAnnotation stereotypeAnnotation = blockView.getEAnnotation("Stereotype_Annotation");

-					blockView.getEAnnotations().remove(stereotypeAnnotation);

-				}

-			}

-

-			@Override

-			public boolean canUndo() {

-				return false;

-			}

-		};

-

-		return command;

-	}

-

-	public static Command getUpdateCommandFrom081To_091(final Diagram diagram) throws Exception {

-

-		Command command = new RecordingCommand(TransactionUtil.getEditingDomain(diagram), "Diagram version updater (from 0.8.1 to 0.9.1)") {

-

-			private Map<String, String> conversionMapping = new HashMap<String, String>();

-

-			private List<IStatus> results = new ArrayList<IStatus>();

-

-			private void initializeMappings() {

-

-				conversionMapping.put(OldElementTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID, SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);

-

-			}

-

-			@Override

-			protected void doExecute() {

-				initializeMappings();

-				ViewServiceUtil.forceLoad();

-				List<View> nestedPropertyViews = new ArrayList<View>();

-				List<View> failedPropertyUpdates = new ArrayList<View>();

-

-				// Update diagram compatibility version

-				// DiagramVersioningUtils.setCompatibilityVersion(diagram, "0.8.1");

-

-				// Update view types

-				Iterator<EObject> it = diagram.eAllContents();

-				while (it.hasNext()) {

-					EObject currentEObject = it.next();

-					if (currentEObject instanceof View) {

-						View currentView = (View) currentEObject;

-						String currentViewType = currentView.getType();

-						if (conversionMapping.containsKey(currentViewType)) {

-

-							// update nested properties

-							if (OldElementTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID.equals(currentViewType)) {

-								currentView.setType(conversionMapping.get(currentView.getType()));

-								nestedPropertyViews.add(currentView);

-								// need to create child structure compartment, enven not visible

-

-								Node compartment = ViewService.createNode(currentView, SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, PreferencesHint.USE_DEFAULTS);

-								if (compartment == null) {

-									failedPropertyUpdates.add(currentView);

-								}

-							}

-						}

-					}

-				}

-

-				if (!failedPropertyUpdates.isEmpty()) {

-					org.eclipse.papyrus.sysml.diagram.internalblock.Activator.log.warn("Impossible to create a compartment for the properties: " + failedPropertyUpdates);

-				}

-

-			}

-

-			@Override

-			public boolean canUndo() {

-				return false;

-			}

-

-			@Override

-			public java.util.Collection<IStatus> getResult() {

-				return results;

-			};

-		};

-

-		return command;

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
deleted file mode 100644
index 57209961a93..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/migration/OldElementTypes.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.migration;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-/**
- * This class list element hints previously used by the Internal Block Diagram.
- */
-public class OldElementTypes extends AbstractElementTypeEnumerator {
-
-	/** CompositeDiagram :: CLASS */
-	public static final String CLASS_HINT = "2073"; //$NON-NLS-1$
-
-	public static final String CLASS_COMPARTMENT_STRUCTURE_HINT = "7073"; //$NON-NLS-1$
-
-	public static final String CLASS_LABEL_COMPOSITE_NAME_HINT = "5156"; //$NON-NLS-1$
-
-	/** CompositeDiagram :: PORT_CN */
-	public static final String PORT_CN_HINT = "3069"; //$NON-NLS-1$
-
-	public static final String PORT_CN_LABEL_NAME_HINT = "5125"; //$NON-NLS-1$
-
-	public static final String PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT = "6029"; //$NON-NLS-1$
-
-	/** CompositeDiagram :: PROPERTY_CN */
-	public static final String PROPERTY_CN_HINT = "3070"; //$NON-NLS-1$
-
-	public static final String PROPERTY_CN_COMPARTMENT_STRUCTURE_HINT = "7077"; //$NON-NLS-1$
-
-	public static final String PROPERTY_CN_LABEL_PART_NAME_HINT = "5126"; //$NON-NLS-1$
-
-	/** CompositeDiagram :: CONNECTOR */
-	public static final String CONNECTOR_HINT = "4013"; //$NON-NLS-1$
-
-	public static final String CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT = "6025"; //$NON-NLS-1$
-
-	public static final String CONNECTOR_LABEL_NAME_HINT = "6050"; //$NON-NLS-1$
-
-	public static final String CONNECTOR_LABEL_MULTIPLICITY_SOURCE_HINT = "6051"; //$NON-NLS-1$
-
-	public static final String CONNECTOR_LABEL_MULTIPLICITY_TARGET_HINT = "6052"; //$NON-NLS-1$
-
-
-	// 0.8.1 --> 0.9.1
-	public static final String SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID = "shape_sysml_nestedblockproperty_as_composite";//$NON-NLS-1$
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
deleted file mode 100644
index 0063255da82..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLDiagramUpdater.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *      Christian W. Damus (CEA) - bug 410909

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.part;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

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

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

-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.UpdaterLinkDescriptor;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLLinkDescriptor;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

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

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

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

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

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

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

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

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

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

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

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

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

-

-

-/**

- *

- * @author vl222926

- *         Adapted code from generated code for UML Diagram

- *         The name of the methods are not java compliant, but it is done to be consistent with the generated classes which use the id of the elements

- */

-public class SysMLDiagramUpdater {

-

-	/**

-	 * @generated

-	 */

-	public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {

-

-		/**

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getSemanticChildren(org.eclipse.gmf.runtime.notation.View)

-		 *

-		 * @param view

-		 * @return

-		 */

-		public List<UpdaterLinkDescriptor> getSemanticChildren(View view) {

-			return SysMLDiagramUpdater.getSemanticChildren(view);

-		}

-

-		/**

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getContainedLinks(org.eclipse.gmf.runtime.notation.View)

-		 *

-		 * @param view

-		 * @return

-		 */

-		public List<UpdaterLinkDescriptor> getContainedLinks(View view) {

-			return SysMLDiagramUpdater.getContainedLinks(view);

-		}

-

-		/**

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getIncomingLinks(org.eclipse.gmf.runtime.notation.View)

-		 *

-		 * @param view

-		 * @return

-		 */

-		public List<UpdaterLinkDescriptor> getIncomingLinks(View view) {

-			return SysMLDiagramUpdater.getIncomingLinks(view);

-		}

-

-		/**

-		 *

-		 * @see org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater#getOutgoingLinks(org.eclipse.gmf.runtime.notation.View)

-		 *

-		 * @param view

-		 * @return

-		 */

-		public List<UpdaterLinkDescriptor> getOutgoingLinks(View view) {

-			return SysMLDiagramUpdater.getOutgoingLinks(view);

-		}

-	};

-

-	public static List<UpdaterLinkDescriptor> getContainedLinks(final View view) {

-		throw new UnsupportedOperationException("Not yet implemented"); //$NON-NLS-1$

-	}

-

-	public static List<UpdaterLinkDescriptor> getSemanticChildren(final View view) {

-		throw new UnsupportedOperationException("Not yet implemented"); //$NON-NLS-1$

-	}

-

-	/**

-	 *

-	 * @param view

-	 *            a view

-	 * @return

-	 *         the list of the incoming links for this view

-	 */

-	public static List<UpdaterLinkDescriptor> getIncomingLinks(final View view) {

-		final String id = view.getType();// TODO : could be done by the SysMLVisualIdRegistry...

-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

-			return getPort_shape_uml_port_as_affixed_IncominkLink(view);

-		}

-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

-			return getFlowPort_shape_sysml_flowport_as_affixed_IncominkLink(view);

-		}

-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID)) {

-			return getProperty_shape_sysml_blockproperty_as_composite_IncomingLink(view);

-		}

-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID)) {

-			return getBlock_shape_sysml_block_as_composite_IncomingLink(view);

-		}

-		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

-			return getDependency_link_uml_dependency_IncomingLink(view);

-		}

-		if (id.equals(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID)) {

-			return getConnector_link_uml_connector_IncomingLink(view);

-		}

-		if (id.equals(CommentEditPart.VISUAL_ID)) {

-			return getComment_Shape_IncomingLinks(view);

-		}

-		if (id.equals(CommentEditPartCN.VISUAL_ID)) {

-			return getComment_Shape_CN_IncomingLinks(view);

-		}

-		if (id.equals(ConstraintEditPart.VISUAL_ID)) {

-			return getConstraint_Shape_IncomingLinks(view);

-		}

-		if (id.equals(ConstraintEditPartCN.VISUAL_ID)) {

-			return getConstraint_Shape_CN_IncomingLinks(view);

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 *

-	 * @param view

-	 *            a view

-	 * @return

-	 *         the list of the outgoing links for this view

-	 */

-	public static List<UpdaterLinkDescriptor> getOutgoingLinks(final View view) {

-		final String id = view.getType();// TODO : could be done by the SysMLVisualIdRegistry...

-		if (id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

-			return getPort_shape_uml_port_as_affixed_OutgoingLink(view);

-		}

-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

-			return getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLink(view);

-		}

-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID)) {

-			return getProperty_shape_sysml_blockproperty_as_composite_OutgoingLink(view);

-		}

-		if (id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID)) {

-			return getBlock_shape_sysml_block_as_composite_OutgoingLink(view);

-		}

-		if (id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

-			return getDependency_link_uml_dependency_OutgoingLink(view);

-		}

-		if (id.equals(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID)) {

-			return getConnector_link_uml_connector_OutgoingLink(view);

-		}

-		if (id.equals(CommentEditPart.VISUAL_ID)) {

-			return getComment_Shape_OutgoingLinks(view);

-		}

-		if (id.equals(CommentEditPartCN.VISUAL_ID)) {

-			return getComment_Shape_CN_OutgoingLinks(view);

-		}

-		if (id.equals(ConstraintEditPart.VISUAL_ID)) {

-			return getConstraint_Shape_OutgoingLinks(view);

-		}

-		if (id.equals(ConstraintEditPartCN.VISUAL_ID)) {

-			return getConstraint_Shape_CN_OutgoingLinks(view);

-		}

-		return Collections.emptyList();

-	}

-

-	private static List<UpdaterLinkDescriptor> getConnector_link_uml_connector_IncomingLink(View view) {

-		Connector modelElement = (Connector) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));

-		return result;

-

-	}

-

-	private static List<UpdaterLinkDescriptor> getConnector_link_uml_connector_OutgoingLink(View view) {

-		Connector modelElement = (Connector) view.getElement();

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_IncomingLink(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_OutgoingLink(View view) {

-		Dependency modelElement = (Dependency) view.getElement();

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

-		return result;

-	}

-

-

-	private static List<UpdaterLinkDescriptor> getComment_Shape_CN_IncomingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getComment_Shape_CN_OutgoingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getComment_Shape_IncomingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getComment_Shape_OutgoingLinks(View view) {

-		Comment modelElement = (Comment) view.getElement();

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getConstraint_Shape_IncomingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getConstraint_Shape_OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getConstraint_Shape_CN_IncomingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));

-		return result;

-	}

-

-

-	private static List<UpdaterLinkDescriptor> getConstraint_Shape_CN_OutgoingLinks(View view) {

-		Constraint modelElement = (Constraint) view.getElement();

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_composite_IncomingLink(final View view) {

-		final Class modelElement = (Class) view.getElement();

-		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_composite_OutgoingLink(final View view) {

-		final Class modelElement = (Class) view.getElement();

-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

-		return result;

-	}

-

-	/**

-	 *

-	 * @param view

-	 *            a view

-	 * @return

-	 *         common method to get the incoming link for a property in the SysML IBD Diagram

-	 */

-	private static List<UpdaterLinkDescriptor> getProperty_IncomingLink(final View view) {

-		final Property modelElement = (Property) view.getElement();

-		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetsLinks_Connector_link_uml_connector(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(modelElement, crossReferencer));

-		return result;

-	}

-

-	/**

-	 *

-	 * @param view

-	 *            a view

-	 * @return

-	 *         common method to get the outgoing link for a property in the SysML IBD Diagram

-	 */

-	private static List<UpdaterLinkDescriptor> getProperty_OutgoingLink(final View view) {

-		final Property modelElement = (Property) view.getElement();

-		final CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

-		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetsLinks_Connector_link_uml_connector(modelElement, crossReferencer));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

-		return result;

-	}

-

-	private static Collection<? extends UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(final Element target, final CrossReferenceAdapter crossReferencer) {

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

-				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));

-			}

-		}

-		return result;

-	}

-

-

-	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(Comment source) {

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

-			Element destination = (Element) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Element target, CrossReferenceAdapter crossReferencer) {

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));

-			}

-		}

-		return result;

-	}

-

-

-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(Constraint source) {

-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

-			Element destination = (Element) destinations.next();

-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID));

-		}

-		return result;

-	}

-

-	private static List<UpdaterLinkDescriptor> getProperty_shape_sysml_blockproperty_as_composite_IncomingLink(final View view) {

-		return getProperty_IncomingLink(view);

-	}

-

-	private static List<UpdaterLinkDescriptor> getProperty_shape_sysml_blockproperty_as_composite_OutgoingLink(final View view) {

-		return getProperty_OutgoingLink(view);

-	}

-

-	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_affixed_IncominkLink(View view) {

-		return getProperty_IncomingLink(view);

-	}

-

-	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLink(View view) {

-		return getProperty_OutgoingLink(view);

-	}

-

-	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_affixed_IncominkLink(View view) {

-		return getProperty_IncomingLink(view);

-	}

-

-	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_affixed_OutgoingLink(View view) {

-		return getProperty_OutgoingLink(view);

-	}

-

-	private static Collection<? extends UpdaterLinkDescriptor> getIncomingTypeModelFacetsLinks_Connector_link_uml_connector(final ConnectableElement target, CrossReferenceAdapter crossReferencer) {

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getConnectorEnd_Role() || false == setting.getEObject() instanceof ConnectorEnd) {

-				continue;

-			}

-			final ConnectorEnd connectorEnd = (ConnectorEnd) setting.getEObject();

-			if (!UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(connectorEnd.eContainer()))) {

-				continue;

-			}

-			final Connector connector = (Connector) connectorEnd.eContainer();

-

-			// FIXME : verify the path

-			for (final ConnectorEnd current : connector.getEnds()) {

-				if (current == connectorEnd) {

-					continue;

-				}

-				final ConnectableElement src = current.getRole();

-				result.add(new UpdaterLinkDescriptor(src, target, connector, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Connector_Edge, null));

-			}

-		}

-		return result;

-	}

-

-	private static Collection<? extends UpdaterLinkDescriptor> getOutgoingTypeModelFacetsLinks_Connector_link_uml_connector(final ConnectableElement source, CrossReferenceAdapter crossReferencer) {

-		// I don't know how to adapt the common case to connector, so this way works properly...

-		return getIncomingTypeModelFacetsLinks_Connector_link_uml_connector(source, crossReferencer);

-	}

-

-	private static Collection<? extends UpdaterLinkDescriptor> getIncomingTypeModelFacetsLinks_Dependency_link_uml_dependency(NamedElement target, CrossReferenceAdapter crossReferencer) {

-		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

-		for (EStructuralFeature.Setting setting : settings) {

-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

-				continue;

-			}

-			Dependency link = (Dependency) setting.getEObject();

-			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

-				continue;

-			}

-

-			List<?> sources = link.getClients();

-			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

-				continue;

-			}

-			NamedElement src = (NamedElement) theSource;

-			result.add(new UpdaterLinkDescriptor(src, target, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_Edge, null));

-		}

-		return result;

-	}

-

-	private static Collection<? extends UpdaterLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(NamedElement source) {

-		Package container = null;

-		// Find container element for the link.

-		// Climb up by containment hierarchy starting from the source

-		// and return the first element that is instance of the container class.

-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {

-			if (element instanceof Package) {

-				container = (Package) element;

-			}

-		}

-		if (container == null) {

-			return Collections.emptyList();

-		}

-		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

-			EObject linkObject = (EObject) links.next();

-			if (false == linkObject instanceof Dependency) {

-				continue;

-			}

-			Dependency link = (Dependency) linkObject;

-			if (!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

-				continue;

-			}

-			List<?> targets = link.getSuppliers();

-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

-			if (false == theTarget instanceof NamedElement) {

-				continue;

-			}

-			NamedElement dst = (NamedElement) theTarget;

-			List<?> sources = link.getClients();

-			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

-			if (false == theSource instanceof NamedElement) {

-				continue;

-			}

-			NamedElement src = (NamedElement) theSource;

-			if (src != source) {

-				continue;

-			}

-			result.add(new UpdaterLinkDescriptor(src, dst, link, org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.Dependency_Edge, null));

-		}

-		return result;

-	}

-

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLVisualIDRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLVisualIDRegistry.java
deleted file mode 100644
index a4ecd50fdb7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/part/SysMLVisualIDRegistry.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.part;

-

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

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.structure.DiagramStructure;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

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

-

-/**

- *

- * @author vl222926

- *         Adapted code for the code generated for the UML Diagrams

- */

-public class SysMLVisualIDRegistry {

-

-	private static final String UNKNOWN = "-1"; //$NON-NLS-1$

-

-	public static String getLinkWithClassVisualID(EObject domainElement) {

-		if (domainElement == null) {

-			return UNKNOWN;

-		}

-		if (UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

-			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;

-		}

-		// if(UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

-		// return AssociationClassLinkEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		// return AssociationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

-		// return AssociationBranchEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

-		// return GeneralizationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

-		// return InterfaceRealizationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

-		// return SubstitutionEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

-		// return RealizationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

-		// return AbstractionEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

-		// return UsageEditPart.VISUAL_ID;

-		// }

-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;

-		}

-		// if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

-		// return DependencyBranchEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

-		// return ElementImportEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

-		// return PackageImportEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

-		// return PackageMergeEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

-		// return ProfileApplicationEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

-		// return TemplateBindingEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

-		// return GeneralizationSetEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

-		// return InstanceSpecificationLinkEditPart.VISUAL_ID;

-		// }

-		// if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

-		// return InformationFlowEditPart.VISUAL_ID;

-		// }

-		return UNKNOWN;

-	}

-

-	// TODO : this class as not been tested...

-	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

-

-		public String getVisualIDAsString(final View view) {

-			return view.getType();

-		}

-

-		@Override

-		public String getVisualID(View view) {// TODO : not useful with sysml, because we are using String!

-			final String type = view.getType();

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);

-		}

-

-

-		@Override

-		public String getModelID(View view) {

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);

-		}

-

-

-		@Override

-		public String getNodeVisualID(View containerView, EObject domainElement) {

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

-		}

-

-

-		@Override

-		public boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) {

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

-		}

-

-

-		@Override

-		public boolean isCompartmentVisualID(String visualID) {

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

-		}

-

-

-		@Override

-		public boolean isSemanticLeafVisualID(String visualID) {

-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

-		}

-	};

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockPropertyCompositePreferencePage.java
deleted file mode 100644
index 11ba36d852a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockPropertyCompositePreferencePage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Composite;
-
-public class BlockPropertyCompositePreferencePage extends AbstractPreferencePage {
-
-	/** Constructor */
-	public BlockPropertyCompositePreferencePage() {
-		super();
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		CustomBlockPropertyCompositePreferencePage.initDefaults(store);
-		/* CustomNestedBlockPropertyCompositePreferencePage.initDefaults(store); */
-	}
-
-	@Override
-	protected void addFields(Composite parent) {
-
-	}
-
-	@Override
-	protected void initHelp() {
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
deleted file mode 100644
index 4b0f5df8347..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * Preference page for Part and References.
- */
-public class CustomBlockPropertyCompositePreferencePage extends InternalBlockDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		compartmentTitleDefaultVisibilityMap.remove("structure"); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.FALSE); //$NON-NLS-1$
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public CustomBlockPropertyCompositePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
deleted file mode 100644
index 519f2418b64..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * {@link Connector} preference page.
- */
-public class CustomConnectorPreferencePage extends InternalBlockDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_CONNECTOR_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public CustomConnectorPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_CONNECTOR_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomNestedBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomNestedBlockPropertyCompositePreferencePage.java
deleted file mode 100644
index 9bd2356b71c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomNestedBlockPropertyCompositePreferencePage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * Preference page for Part and References.
- */
-@Deprecated
-public class CustomNestedBlockPropertyCompositePreferencePage extends InternalBlockDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_NESTEDBLOCKPROPERTY_AS_COMPOSITE_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public CustomNestedBlockPropertyCompositePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 160);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 80);
-		// End of user code
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
deleted file mode 100644
index 0f0eff9a4ac..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;

-

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

-

-/**

- * Custom preferences initializer.

- */

-public class CustomPreferenceInitializer extends InternalBlockDiagramPreferenceInitializer {

-

-	@Override

-	protected IPreferenceStore getPreferenceStore() {

-		return Activator.getInstance().getPreferenceStore();

-	}

-

-	@Override

-	public void initializeDefaultPreferences() {

-		super.initializeDefaultPreferences();

-

-		IPreferenceStore store = getPreferenceStore();

-

-		PortAsBorderItemPreferencePage.initDefaults(store);

-		FlowPortAsBorderItemPreferencePage.initDefaults(store);

-		BlockPropertyCompositePreferencePage.initDefaults(store);

-		CustomConnectorPreferencePage.initDefaults(store);

-

-		// Initialize default positions for labels.

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, 0, -10);

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);

-

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, 0, -10);

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, 0, 10);

-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, 0, 10);

-

-		initDefaultPosition(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, 30, 0);

-		initDefaultPosition(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, 30, -20);

-

-		initDefaultPosition(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, 30, 0);

-		initDefaultPosition(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, 30, -20);

-	}

-

-	/**

-	 * Initialize default position of a link label in preferences.

-	 *

-	 * @param parentGraphicalType

-	 *            the graphical type of the view owning the label

-	 * @param graphicalType

-	 *            the graphical type of the label

-	 * @param x

-	 * @param y

-	 */

-	protected void initDefaultPosition(String parentGraphicalType, String graphicalType, int x, int y) {

-		IPreferenceStore store = getPreferenceStore();

-

-		String xKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_X);

-		String yKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_Y);

-

-		store.setDefault(xKey, x);

-		store.setDefault(yKey, y);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/FlowPortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/FlowPortAsBorderItemPreferencePage.java
deleted file mode 100644
index 0446c67fd01..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/FlowPortAsBorderItemPreferencePage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-
-/**
- * FlowPort preference page.
- */
-public class FlowPortAsBorderItemPreferencePage extends InternalBlockDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public FlowPortAsBorderItemPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/PortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/PortAsBorderItemPreferencePage.java
deleted file mode 100644
index d3d446ba4f9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/PortAsBorderItemPreferencePage.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Port;
-
-/**
- * {@link Port} preference page.
- */
-public class PortAsBorderItemPreferencePage extends InternalBlockDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public PortAsBorderItemPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ActionStateSourceProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ActionStateSourceProvider.java
deleted file mode 100644
index c8f11aeb056..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ActionStateSourceProvider.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;

-

-import org.eclipse.papyrus.uml.diagram.common.providers.AbstractActionStateSourceProvider;

-import org.eclipse.papyrus.uml.diagram.composite.custom.actions.ShowHideRelatedContentsHandler;

-import org.eclipse.ui.ISources;

-

-/**

- * This class provides the state of the actions. It's used to refresh

- * the status of these actions in the menu. (in toolbar and popup, it's not needed)

- *

- * To get the status, we listen the selection service AND the part service!

- * The part service is used to know if the selection is in the Model Explorer or not!

- * When the selection is not in the model explorer, the handlers listening the variable need to be disabled

- */

-public class ActionStateSourceProvider extends AbstractActionStateSourceProvider {

-

-	/**

-	 * The name of the variable to check.

-	 */

-	public static final String SHOW_HIDE_RELATED_CONTENTS = "showHideRelatedContents"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public ActionStateSourceProvider() {

-		super();

-		currentState.put(SHOW_HIDE_RELATED_CONTENTS, DISABLED);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.ISourceProvider#getProvidedSourceNames()

-	 *

-	 * @return

-	 */

-	@Override

-	public String[] getProvidedSourceNames() {

-		return new String[] { SHOW_HIDE_RELATED_CONTENTS };

-	}

-

-	/**

-	 * Refresh the state of the Delete Action

-	 */

-	protected void refreshShowHideRelatedContentsAction() {

-		String oldState = currentState.get(SHOW_HIDE_RELATED_CONTENTS);

-		String newState = (testShowHideRelatedContents() ? ENABLED : DISABLED);

-

-		if (oldState != newState) {

-			currentState.put(SHOW_HIDE_RELATED_CONTENTS, newState);

-			fireSourceChanged(ISources.WORKBENCH, currentState);

-		}

-	}

-

-	/**

-	 * Tests if the action DeleteFromDiagram (now called Delete Selected Element can be executed

-	 *

-	 * @return

-	 *         <code>true</code> if the action DeleteFromDiagram (now called Delete Selected Element can be executed <code>false</code> if not

-	 */

-	protected boolean testShowHideRelatedContents() {

-		ShowHideRelatedContentsHandler handler = new ShowHideRelatedContentsHandler();

-		return isSelectionInDiagram() && handler.isEnabled();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.diagram.common.providers.AbstractActionStateSourceProvider#refreshActions()

-	 *

-	 */

-	@Override

-	protected void refreshActions() {

-		refreshShowHideRelatedContentsAction();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPolicyProvider.java
deleted file mode 100644
index 068741f8739..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/CustomEditPolicyProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockCompositeEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyStructureCompartmentEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedNodeEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.StructureCompartmentEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.CustomDuplicatePasteEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.part.InternalBlockDiagramEditPart;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomBlockCompositeSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomBlockPropertyCompositeDropEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomBlockPropertyCompositeSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDefaultSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDiagramDropEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.EncapsulatedClassifierDropEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.StructureClassifierDropEditPolicy;

-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.TypedElementDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementBorderEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLinkEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPartCN;

-

-/**

- * Custom edit policy provider.

- */

-public class CustomEditPolicyProvider extends InternalBlockDiagramEditPolicyProvider {

-

-	@Override

-	public boolean provides(IOperation operation) {

-

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

-			return false;

-		}

-

-		// Make sure this concern Internal Block Diagram only

-		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();

-		String diagramType = gep.getNotationView().getDiagram().getType();

-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

-			return false;

-		}

-

-		// provides for the main diagram edit part

-		if (gep instanceof InternalBlockDiagramEditPart) {

-			return true;

-		}

-

-		// Provides for edit parts that represent nodes in Internal Block diagram

-		if (gep instanceof AbstractElementEditPart) {

-			return true;

-		}

-		if (gep instanceof AbstractElementBorderEditPart) {

-			return true;

-		}

-

-		// Provides for edit parts that represent edges in Internal Block diagram

-		if (gep instanceof AbstractElementLinkEditPart) {

-			return true;

-		}

-

-		if (gep instanceof ResizableCompartmentEditPart) {

-			return true;

-		}

-

-		return super.provides(operation);

-	}

-

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		super.createEditPolicies(editPart);

-

-		if (editPart instanceof InternalBlockDiagramEditPart) {

-			editPart.installEditPolicy(PasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDropEditPolicy());

-			// no installation of other policies.

-			return;

-		}

-

-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());

-

-		if ((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

-		}

-

-		if ((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());

-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());

-		}

-

-		if (editPart instanceof FlowPortAffixedNodeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new TypedElementDropEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof PortAffixedNodeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new TypedElementDropEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof BlockPropertyCompositeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyCompositeDropEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockPropertyCompositeSemanticEditPolicy());

-		}

-

-		/*

-		 * if(editPart instanceof NestedBlockPropertyCompositeEditPart) {

-		 * editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyCompositeDropEditPolicy());

-		 * editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomNestedBlockPropertyCompositeSemanticEditPolicy());

-		 * }

-		 */

-

-		if (editPart instanceof BlockPropertyStructureCompartmentEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy());

-			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

-		}

-

-		if (editPart instanceof BlockCompositeEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new EncapsulatedClassifierDropEditPolicy());

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockCompositeSemanticEditPolicy());

-		}

-

-		if (editPart instanceof StructureCompartmentEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new StructureClassifierDropEditPolicy());

-			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());

-		}

-

-		if (editPart instanceof DependencyEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-		if (editPart instanceof ConnectorEditPart) {

-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());

-		}

-

-

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockVisualTypeProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockVisualTypeProvider.java
deleted file mode 100644
index a4bbbbd463e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InternalBlockVisualTypeProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;
-
-import org.eclipse.papyrus.gmf.diagram.common.provider.SysMLVisualTypeProvider;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLVisualTypeProvider;
-
-/**
- * Visual type provider for the SysML Internal Block Diagram.
- */
-public class InternalBlockVisualTypeProvider extends SysMLVisualTypeProvider {
-
-	public InternalBlockVisualTypeProvider() {
-		super(new CustomGraphicalTypeRegistry(), new UMLVisualTypeProvider());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ParserProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ParserProvider.java
deleted file mode 100644
index 170f851b47b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ParserProvider.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;

-

-import java.util.HashMap;

-import java.util.Map;

-

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

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.common.parser.FlowPortLabelParser;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.uml.diagram.common.parser.ConnectorLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.MultiplicityElementLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.PropertyLabelParser;

-import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

-

-/**

- * Parser provider for labels used by this diagram.

- */

-public class ParserProvider extends AbstractProvider implements IParserProvider {

-

-	/** map from graphical hint to parsers */

-	private static final Map<String, IParser> graphicalHintToParser = new HashMap<String, IParser>();

-

-	static {

-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, new PropertyLabelParser());

-

-		graphicalHintToParser.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, new PropertyLabelParser());

-		graphicalHintToParser.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, new FlowPortLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, new AppliedStereotypeParser());

-

-

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, new NamedElementLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, new ConnectorLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, new MultiplicityElementLabelParser());

-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, new MultiplicityElementLabelParser());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean provides(IOperation operation) {

-		if (operation instanceof GetParserOperation) {

-			IAdaptable hint = ((GetParserOperation) operation).getHint();

-

-			if (!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {

-				return false;

-			}

-

-			return getParser(hint) != null;

-		}

-		return false;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IParser getParser(IAdaptable hint) {

-		String parserHint = hint.getAdapter(String.class);

-		if (parserHint != null) {

-			IParser parser = graphicalHintToParser.get(parserHint);

-			if (parser != null) {

-				return parser;

-			}

-		}

-

-		View view = hint.getAdapter(View.class);

-		if (view != null) {

-			IParser parser = graphicalHintToParser.get(view.getType());

-			if (parser != null) {

-				return parser;

-			}

-		}

-

-		return null;

-	}

-

-	private String getDiagramType(IAdaptable hint) {

-		Diagram diagram = hint.getAdapter(Diagram.class);

-		if (diagram != null) {

-			return diagram.getType();

-		}

-

-		return "undefined";

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationDecoratorProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationDecoratorProvider.java
deleted file mode 100644
index 12ee0edc5db..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationDecoratorProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;

-

-import org.eclipse.gef.EditDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

-

-public class ValidationDecoratorProvider extends org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider implements IDecoratorProvider {

-

-	@Override

-	public void createDecorators(IDecoratorTarget decoratorTarget) {

-		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

-		if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

-			Object model = editPart.getModel();

-			if ((model instanceof View)) {

-				View view = (View) model;

-				if (!(view instanceof Edge) && !view.isSetElement()) {

-					return;

-				}

-			}

-			EditDomain ed = editPart.getViewer().getEditDomain();

-			if (!(ed instanceof DiagramEditDomain)) {

-				return;

-			}

-			if (((DiagramEditDomain) ed).getEditorPart() instanceof UmlGmfDiagramEditor) {

-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

-			}

-		}

-	}

-

-	@Override

-	public boolean provides(IOperation operation) {

-		if (!(operation instanceof CreateDecoratorsOperation)) {

-			return false;

-		}

-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

-		View view = (View) decoratorTarget.getAdapter(View.class);

-		return view != null && ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType());

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationProvider.java
deleted file mode 100644
index 124bd97eadd..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/provider/ValidationProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.provider;

-

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

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

-

-public class ValidationProvider {

-

-	private static boolean constraintsActive = false;

-

-	public static boolean shouldConstraintsBePrivate() {

-		return false;

-	}

-

-	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {

-		final Runnable op = operation;

-		Runnable task = new Runnable() {

-

-			public void run() {

-				try {

-					constraintsActive = true;

-					op.run();

-				} finally {

-					constraintsActive = false;

-				}

-			}

-		};

-		if (editingDomain != null) {

-			try {

-				editingDomain.runExclusive(task);

-			} catch (Exception e) {

-				Activator.log.error("Validation failed", e); //$NON-NLS-1$

-			}

-		} else {

-			task.run();

-		}

-	}

-

-	static boolean isInDefaultEditorContext(Object object) {

-		if (shouldConstraintsBePrivate() && !constraintsActive) {

-			return false;

-		}

-		if (object instanceof View) {

-			return constraintsActive && ElementTypes.DIAGRAM_ID.equals(((View) object).getDiagram().getType());

-		}

-		return true;

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/ui/InternalBlockInterfaceManagerDialog.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/ui/InternalBlockInterfaceManagerDialog.java
deleted file mode 100644
index ca7ea88656e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/ui/InternalBlockInterfaceManagerDialog.java
+++ /dev/null
@@ -1,77 +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:
- *	Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.internalblock.ui;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
-import org.eclipse.papyrus.uml.diagram.common.dialogs.InterfaceManagerDialog;
-import org.eclipse.papyrus.uml.diagram.common.util.Visitor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * <pre>
- * This class provides a Dialog to manage easily the provided and
- * the required Interfaces for a {@link Port}.
- * </pre>
- */
-public class InternalBlockInterfaceManagerDialog extends InterfaceManagerDialog {
-
-
-	/**
-	 * Constructor.
-	 *
-	 * @param parentShell
-	 * @param port
-	 */
-	public InternalBlockInterfaceManagerDialog(Shell parentShell, Port port) {
-		super(parentShell, port);
-	}
-
-	/**
-	 * Returns all the available Interfaces (except {@link FlowSpecification})
-	 *
-	 * @return
-	 *         all the available Interfaces
-	 *         //TODO add the interfaces from the package import!
-	 */
-	@Override
-	protected List<Interface> getAllAvailableInterfaces(Package pack) {
-		Set<Interface> otherInterfaces = new HashSet<Interface>();
-		List<Element> interfaces = Visitor.getOwnedAndImportedElement(pack, Interface.class);
-		for (Namespace namespace : Visitor.getOwnedAndImportedNamespaces(pack)) {
-			interfaces.addAll(Visitor.getOwnedAndImportedElement(namespace, Interface.class));
-
-		}
-
-		for (Element element : interfaces) {
-			// Test if the interface is a FlowSpecification
-			FlowSpecification flowSpec = UMLUtil.getStereotypeApplication(element, FlowSpecification.class);
-			if (flowSpec == null) {
-				otherInterfaces.add((Interface) element);
-			}
-		}
-
-		return Arrays.asList(otherInterfaces.toArray(new Interface[otherInterfaces.size()]));
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
deleted file mode 100644
index 588e79cc3f3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/BlockDropHelper.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.utils;

-

-import java.util.Collections;

-

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

-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.gmf.runtime.common.core.command.ICommand;

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

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.DeferredSnapToGridCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

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

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

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

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

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

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

-

-/**

- * This class provides convenience methods to create Block specific drop action (Part or Reference creation).

- */

-public class BlockDropHelper extends ElementHelper {

-

-	public BlockDropHelper(TransactionalEditingDomain editDomain) {

-		this.editDomain = editDomain;

-	}

-

-	public Command getDropAsStructureItemOnPart(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {

-		String label = "";

-		if (elementType == SysMLElementTypes.PART_PROPERTY) {

-			label = "Create a new Part";

-		}

-		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			label = "Create a new Reference";

-		}

-		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

-			label = "Create a new ActorPart";

-		}

-		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			label = "Create a new Value";

-		}

-		if (elementType == UMLElementTypes.PROPERTY) {

-			label = "Create a new Property";

-		}

-		CompoundCommand cc = new CompoundCommand(label);

-

-		Object droppedEObject = request.getObjects().get(0);

-		if (!isValidStructureItemType(droppedEObject, elementType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Verify target nature

-		EObject target = getHostEObject(host);

-		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// The target type has to be a Block (will hold the created Port)

-		Type targetType = ((TypedElement) target).getType();

-		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Prepare a command for the element creation and the drop in diagram

-

-		// 1. Prepare creation command

-		ICommand createElementCommand = null;

-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);

-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);

-		if (provider != null) {

-			createElementCommand = provider.getEditCommand(createElementRequest);

-		}

-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

-

-		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

-		createViewRequest.setLocation(request.getLocation().getCopy());

-		Command viewCreateCommand = host.getCommand(createViewRequest);

-

-		// 3. Create the compound command

-		cc.add(new ICommandProxy(createElementCommand));

-		cc.add(viewCreateCommand);

-

-		final Object value = request.getExtendedData().get(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT);

-		if (value instanceof Boolean && Boolean.TRUE.equals(value)) {

-			DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), Collections.singletonList(descriptor), host);

-			cc.add(new ICommandProxy(snapCommand));

-		}

-

-		return cc;

-	}

-

-	public Command getDropAsStructureItem(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {

-		String label = "";

-		if (elementType == SysMLElementTypes.PART_PROPERTY) {

-			label = "Create a new Part";

-		}

-		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			label = "Create a new Reference";

-		}

-		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

-			label = "Create a new ActorPart";

-		}

-		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			label = "Create a new Value";

-		}

-		if (elementType == UMLElementTypes.PROPERTY) {

-			label = "Create a new Property";

-		}

-		CompoundCommand cc = new CompoundCommand(label);

-

-		Object droppedEObject = request.getObjects().get(0);

-		if (!isValidStructureItemType(droppedEObject, elementType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Prepare a command for the element creation and the drop in diagram

-

-		// 1. Prepare creation command

-		ICommand createElementCommand = null;

-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);

-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));

-		if (provider != null) {

-			createElementCommand = provider.getEditCommand(createElementRequest);

-		}

-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

-

-		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

-		createViewRequest.setLocation(request.getLocation().getCopy());

-		Command viewCreateCommand = host.getCommand(createViewRequest);

-

-

-		// 3. Create the compound command

-		cc.add(new ICommandProxy(createElementCommand));

-		cc.add(viewCreateCommand);

-

-		final Object value = request.getExtendedData().get(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT);

-		if (value instanceof Boolean && Boolean.TRUE.equals(value)) {

-			DeferredSnapToGridCommand snapCommand = new DeferredSnapToGridCommand(getEditingDomain(), Collections.singletonList(descriptor), host);

-			cc.add(new ICommandProxy(snapCommand));

-		}

-

-		return cc;

-	}

-

-	private boolean isValidStructureItemType(Object object, IElementType elementType) {

-		boolean isValid = false;

-

-		if ((object != null) && (object instanceof Type) && !(object instanceof Association)) {

-

-			Type type = (Type) object;

-			if ((elementType == SysMLElementTypes.PART_PROPERTY) || (elementType == SysMLElementTypes.REFERENCE_PROPERTY)) {

-				if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {

-					isValid = true;

-				}

-			}

-			if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

-				if (type instanceof Actor) {

-					isValid = true;

-				}

-			}

-			if (elementType == SysMLElementTypes.VALUE_PROPERTY) {

-				if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type) || (type instanceof DataType)) {

-					isValid = true;

-				}

-			}

-			if (elementType == UMLElementTypes.PROPERTY) {

-				if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)

-						&& !(type instanceof Actor)

-						&& !(type instanceof DataType)

-						&& !((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {

-					isValid = true;

-				}

-			}

-		}

-

-		return isValid;

-	}

-

-	/**

-	 * return the host Edit Part's semantic element, if the semantic element

-	 * is <code>null</code> or unresolvable it will return <code>null</code>

-	 *

-	 * @return EObject

-	 */

-	protected EObject getHostEObject(GraphicalEditPart host) {

-		return ViewUtil.resolveSemanticElement((View) host.getModel());

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
deleted file mode 100644
index 1fec49d594d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.utils;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocatorUtils;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * This class fix Port and FlowPort location during diagram opening (no edit part exists yet).
- */
-public class FixPortsLocationOnOpening {
-
-	/**
-	 * This method fix the diagram Port and FlowPort locations.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 */
-	public void fix(Diagram diagram) {
-
-		// Parse diagram content
-		Iterator<EObject> it = diagram.eAllContents();
-		while (it.hasNext()) {
-			EObject current = it.next();
-
-			// Select Port and FlowPorts
-			if (!(current instanceof Shape)) {
-				continue;
-			}
-
-			Shape portView = (Shape) current;
-			String currentType = portView.getType();
-			if (SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID.equals(currentType) || UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID.equals(currentType)) {
-
-				int borderItemOffset = 10;
-				View parentView = ViewUtil.getViewContainer(portView);
-
-				if (parentView instanceof Shape) {
-					Shape parentShape = (Shape) parentView;
-
-					Bounds portViewBounds = (Bounds) portView.getLayoutConstraint();
-					Bounds parentViewBounds = (Bounds) parentShape.getLayoutConstraint();
-
-					final Rectangle portBounds = new Rectangle(portViewBounds.getX(), portViewBounds.getY(), portViewBounds.getWidth(), portViewBounds.getHeight());
-
-					int parentWidth = parentViewBounds.getWidth();
-					int parentHeight = parentViewBounds.getHeight();
-					if ((parentWidth == -1) && (parentHeight == -1)) {
-						// warning the size may not be set in notation (default size), in such a case get default size from preferences.
-						String parentPrefKey = ElementTypes.DIAGRAM_ID + "_" + parentShape.getType();
-						parentWidth = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.WIDTH));
-						parentHeight = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.HEIGHT));
-					}
-					final Rectangle parentBounds = new Rectangle(parentViewBounds.getX(), parentViewBounds.getY(), parentWidth, parentHeight);
-
-					// Calculate the valid location based on currently stored location and parent bounds
-					final Rectangle validLocation = PortPositionLocatorUtils.getBorderLocation(parentBounds, portBounds, borderItemOffset);
-
-					// Fix when current location is not the valid location (only possible if parent size is set)
-					if ((!portBounds.equals(validLocation)) && (parentViewBounds.getWidth() != -1) && (parentViewBounds.getHeight() != -1)) {
-
-						TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(diagram);
-						Command fixCommand = new FixLocationCommand(editingDomain, "Fix Port location on opening", portViewBounds, validLocation);
-						editingDomain.getCommandStack().execute(fixCommand);
-					}
-				}
-
-
-			}
-		}
-	}
-
-	/**
-	 * This command set the Port view with valid locations.
-	 */
-	public class FixLocationCommand extends RecordingCommand {
-
-		/** Port view bounds. */
-		private Bounds portViewBounds;
-
-		/** Port valid bounds (only the location is used here). */
-		private Rectangle portValidBounds;
-
-		/** Constructor. */
-		public FixLocationCommand(TransactionalEditingDomain domain, String label, Bounds portViewBounds, Rectangle portValidBounds) {
-			super(domain, label);
-			this.portViewBounds = portViewBounds;
-			this.portValidBounds = portValidBounds;
-		}
-
-		@Override
-		protected void doExecute() {
-			portViewBounds.setX(portValidBounds.x());
-			portViewBounds.setY(portValidBounds.y());
-		}
-
-		@Override
-		public boolean canUndo() {
-			return false;
-		}
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/InternalBlockDiagramTester.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/InternalBlockDiagramTester.java
deleted file mode 100644
index 1db1f6b8558..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/InternalBlockDiagramTester.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.utils;

-

-import java.util.Iterator;

-

-import org.eclipse.core.expressions.PropertyTester;

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

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

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

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

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

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

-

-/**

- * Tester for the Internal Block Diagram

- * This tester provides 2 tests :

- * <ul>

- * <li>isFlowPort : return <code>true</code> if the Port is stereotyped with the stereotype SysML::PortAndFlows::FlowPort</li>

- * </ul>

- */

-public class InternalBlockDiagramTester extends PropertyTester {

-

-	/** id for the test isFlowPort */

-	public static final String IS_FLOW_PORT = "isFlowPort"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

-	 *

-	 * @param receiver

-	 * @param property

-	 * @param args

-	 * @param expectedValue

-	 * @return

-	 */

-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

-		if (IS_FLOW_PORT.equals(property) && receiver instanceof ISelection) {

-			return testFlowPort((ISelection) receiver, expectedValue);

-		}

-		return false;

-	}

-

-	/**

-	 * Tests if the current port is stereotyped with "SysML::PortAndFlows::FlowPort"

-	 *

-	 * @param selection

-	 *            the current selection

-	 * @return

-	 *         <code>true</code> if a Port is stereotyped with "SysML::PortAndFlows::FlowPort"

-	 */

-	protected boolean testFlowPort(ISelection selection, Object expectedValue) {

-		if (selection instanceof StructuredSelection && expectedValue != null) {

-			@SuppressWarnings("unchecked")

-			Iterator<Object> iter = ((StructuredSelection) selection).iterator();

-			while (iter.hasNext()) {

-				Object current = iter.next();

-				if (current instanceof IAdaptable) {

-					Element port = (Element) ((IAdaptable) current).getAdapter(Element.class);

-					FlowPort fp = UMLUtil.getStereotypeApplication(port, FlowPort.class);

-					boolean value = fp != null;

-					return expectedValue.equals(value);

-				}

-			}

-		}

-		return false;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
deleted file mode 100644
index 00c9b708f46..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PartDropHelper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.internalblock.utils;

-

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

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

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

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

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

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

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

-

-/**

- * This class provides convenience methods to create Type specific drop action (Show BlockProperty on BlockPropertyComposite).

- */

-public class PartDropHelper extends ElementHelper {

-

-	public PartDropHelper(TransactionalEditingDomain editDomain) {

-		this.editDomain = editDomain;

-	}

-

-	public Command getDropPartOnPart(DropObjectsRequest request, GraphicalEditPart host) {

-

-		Object droppedEObject = request.getObjects().get(0);

-		if (!isValidPart(droppedEObject, getHostEObject(host))) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Prepare the view creation command

-		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter((EObject) droppedEObject, null), Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

-		createViewRequest.setLocation(request.getLocation().getCopy());

-		Command viewCreateCommand = host.getCommand(createViewRequest);

-

-		return viewCreateCommand;

-	}

-

-	private boolean isValidPart(Object object, EObject dropTarget) {

-		boolean isValid = false;

-

-		// The drop object is supposed to be a Property

-		if ((object != null) && (object instanceof Property) && !(object instanceof Port)) {

-

-			// The dropTarget has to be a TypedElement with a non-null Type

-			if ((dropTarget != null) && (dropTarget instanceof TypedElement) && (((TypedElement) dropTarget).getType() != null)) {

-

-				Type targetType = ((TypedElement) dropTarget).getType();

-				// The dropped object is owned by the target type

-				if (((Property) object).eContainer() == targetType) {

-					isValid = true;

-				}

-			}

-		}

-

-		return isValid;

-	}

-

-	/**

-	 * return the host Edit Part's semantic element, if the semantic element

-	 * is <code>null</code> or unresolvable it will return <code>null</code>

-	 *

-	 * @return EObject

-	 */

-	protected EObject getHostEObject(GraphicalEditPart host) {

-		return ViewUtil.resolveSemanticElement((View) host.getModel());

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
deleted file mode 100644
index 558ddbd4789..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/PortDropHelper.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.utils;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.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.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.CommandProxyWithResult;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;
-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.TypedElement;
-
-/**
- * This class provides convenience methods to create Type specific drop action (Show Port on BlockPropertyComposite).
- */
-public class PortDropHelper extends ElementHelper {
-
-	public PortDropHelper(TransactionalEditingDomain editDomain) {
-		this.editDomain = editDomain;
-	}
-
-	public ICommand getDropPortOnPart(DropObjectsRequest request, GraphicalEditPart host) {
-
-		Object droppedEObject = request.getObjects().get(0);
-		if (!isValidPort(droppedEObject, getHostEObject(host))) {
-			return new CommandProxy(UnexecutableCommand.INSTANCE);
-		}
-
-		return getDropPortOnPart((Port) droppedEObject, request.getLocation().getCopy(), host);
-	}
-
-	public ICommand getDropPortOnPart(Port droppedPort, Point location, GraphicalEditPart host) {
-
-		if (!isValidPort(droppedPort, getHostEObject(host))) {
-			return new CommandProxy(UnexecutableCommand.INSTANCE);
-		}
-
-		// Prepare the view creation command
-		ViewDescriptor descriptor = new ViewDescriptor(new EObjectAdapter(droppedPort), Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(location);
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		return new CommandProxyWithResult(viewCreateCommand, descriptor);
-	}
-
-	private boolean isValidPort(Object object, EObject dropTarget) {
-		boolean isValid = false;
-
-		// The drop object is supposed to be a Port (or FlowPort)
-		if ((object != null) && (object instanceof Port)) {
-
-			Port port = (Port) object;
-			// The dropTarget has to be a TypedElement with a non-null Type
-			if ((dropTarget != null) && (dropTarget instanceof TypedElement) && (((TypedElement) dropTarget).getType() != null)) {
-
-				Type targetType = ((TypedElement) dropTarget).getType();
-				// The dropped object is owned by the target type
-
-				if (targetType instanceof Classifier) {
-					Classifier classifier = (Classifier) targetType;
-					isValid = classifier.getAllAttributes().contains(port);
-				}
-			}
-		}
-
-		return isValid;
-	}
-
-	/**
-	 * return the host Edit Part's semantic element, if the semantic element
-	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 *
-	 * @return EObject
-	 */
-	protected EObject getHostEObject(GraphicalEditPart host) {
-		return ViewUtil.resolveSemanticElement((View) host.getModel());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
deleted file mode 100644
index 9bdbb15a493..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *		Christian W. Damus - bug 470296
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.internalblock.utils;
-
-import org.eclipse.core.runtime.IAdaptable;
-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.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
-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.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.TypedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * This class provides convenience methods to create Type specific drop action (Set new Type, Port creation, ...).
- */
-public class TypeDropHelper extends ElementHelper {
-
-	public TypeDropHelper(TransactionalEditingDomain editDomain) {
-		this.editDomain = editDomain;
-	}
-
-	public Command getDropAsTypedElementType(DropObjectsRequest request, GraphicalEditPart host) {
-		CompoundCommand cc = new CompoundCommand("Set a new Type");
-		ICommand setCommand = null;
-
-		// The dropped object must be a Type and the target a TypedElement
-		Type newType = (request.getObjects().get(0) instanceof Type) ? (Type) request.getObjects().get(0) : null;
-		TypedElement typedElementDropTarget = (getHostEObject(host) instanceof TypedElement) ? (TypedElement) getHostEObject(host) : null;
-
-		if ((newType == null) || (typedElementDropTarget == null)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		IClientContext context;
-		try {
-			context = TypeContext.getContext(typedElementDropTarget);
-		} catch (ServiceException e) {
-			Activator.log.error(e);
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		if (newType == typedElementDropTarget.getType()) {
-			setCommand = IdentityCommand.INSTANCE;
-		}
-
-		// Prepare a command to set the new type
-		SetRequest req = new SetRequest(typedElementDropTarget, UMLPackage.eINSTANCE.getTypedElement_Type(), newType);
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.TYPED_ELEMENT, context);
-		if (provider != null) {
-			setCommand = provider.getEditCommand(req);
-		}
-
-		cc.add(new ICommandProxy(setCommand));
-
-		return cc;
-	}
-
-	public Command getDropAsTypedPort(DropObjectsRequest request, GraphicalEditPart host) {
-		CompoundCommand cc = new CompoundCommand("Create a new Port");
-
-		Object droppedEObject = request.getObjects().get(0);
-		if (!isValidPortType(droppedEObject)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Prepare a command for the FlowPort creation and the drop in diagram
-
-		// 1. Prepare creation command
-		ICommand createElementCommand = null;
-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), UMLElementTypes.PORT);
-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));
-		if (provider != null) {
-			createElementCommand = provider.getEditCommand(createElementRequest);
-		}
-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
-
-		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(request.getLocation().getCopy());
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		// 3. Create the compound command
-		cc.add(new ICommandProxy(createElementCommand));
-		cc.add(viewCreateCommand);
-
-		return cc;
-	}
-
-	public Command getDropAsTypedPortOnPart(DropObjectsRequest request, GraphicalEditPart host) {
-		CompoundCommand cc = new CompoundCommand("Create a new Port");
-
-		Object droppedEObject = request.getObjects().get(0);
-		if (!isValidPortType(droppedEObject)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Verify target nature
-		EObject target = getHostEObject(host);
-		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// The target type has to be a Block (will hold the created Port)
-		Type targetType = ((TypedElement) target).getType();
-		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Prepare a command for the FlowPort creation and the drop in diagram
-
-		// 1. Prepare creation command
-		ICommand createElementCommand = null;
-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, UMLElementTypes.PORT);
-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);
-		if (provider != null) {
-			createElementCommand = provider.getEditCommand(createElementRequest);
-		}
-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
-
-		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(request.getLocation().getCopy());
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		// 3. Create the compound command
-		cc.add(new ICommandProxy(createElementCommand));
-		cc.add(viewCreateCommand);
-
-		return cc;
-	}
-
-	public Command getDropAsTypedFlowPort(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
-		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");
-
-		Object droppedEObject = request.getObjects().get(0);
-		if (!isValidFlowPortType(droppedEObject, elementType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Prepare a command for the FlowPort creation and the drop in diagram
-
-		// 1. Prepare creation command
-		ICommand createElementCommand = null;
-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);
-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));
-		if (provider != null) {
-			createElementCommand = provider.getEditCommand(createElementRequest);
-		}
-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
-
-		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(request.getLocation().getCopy());
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		// 3. Create the compound command
-		cc.add(new ICommandProxy(createElementCommand));
-		cc.add(viewCreateCommand);
-
-		return cc;
-	}
-
-	public Command getDropAsTypedFlowPortOnPart(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
-		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");
-
-		Object droppedEObject = request.getObjects().get(0);
-		if (!isValidFlowPortType(droppedEObject, elementType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Verify target nature
-		EObject target = getHostEObject(host);
-		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// The target type has to be a Block (will hold the created Port)
-		Type targetType = ((TypedElement) target).getType();
-		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Prepare a command for the FlowPort creation and the drop in diagram
-
-		// 1. Prepare creation command
-		ICommand createElementCommand = null;
-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);
-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);
-		if (provider != null) {
-			createElementCommand = provider.getEditCommand(createElementRequest);
-		}
-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
-
-		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(request.getLocation().getCopy());
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		// 3. Create the compound command
-		cc.add(new ICommandProxy(createElementCommand));
-		cc.add(viewCreateCommand);
-
-		return cc;
-	}
-
-	private boolean isValidFlowPortType(Object object, IElementType elementType) {
-		boolean isValid = false;
-
-		if ((object != null) && (object instanceof Type)) {
-			Type type = (Type) object;
-
-			// Test valid type
-			if (type instanceof DataType) {
-				isValid = true;
-			}
-
-			if (type instanceof Signal) {
-				isValid = true;
-			}
-
-			if (((ISpecializationType) SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(type)) {
-				// Non-atomic flow port, the direction is meaningless in this case
-				if (elementType == SysMLElementTypes.FLOW_PORT) {
-					isValid = true;
-				}
-			}
-
-			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
-				isValid = true;
-			}
-
-			if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {
-				isValid = true;
-			}
-
-		}
-
-		return isValid;
-	}
-
-	private boolean isValidPortType(Object object) {
-		boolean isValid = false;
-
-		// Bug 470296: Associations are not useful types for ports or any kind of property. Note that this
-		// deliberately excludes association-classes, also, because their primary semantics is that of an association
-		if ((object != null) && (object instanceof Type) && !(object instanceof Association)) {
-			isValid = true;
-		}
-
-		return isValid;
-	}
-
-	/**
-	 * return the host Edit Part's semantic element, if the semantic element
-	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 *
-	 * @return EObject
-	 */
-	protected EObject getHostEObject(GraphicalEditPart host) {
-		return ViewUtil.resolveSemanticElement((View) host.getModel());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath
deleted file mode 100644
index f0c55498599..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.project
deleted file mode 100644
index a0701c1e4fb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.diagram.parametric</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f08be2b06c4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 26bfc574664..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.parametric,
- org.eclipse.papyrus.sysml.diagram.parametric.commands,
- org.eclipse.papyrus.sysml.diagram.parametric.edit.part,
- org.eclipse.papyrus.sysml.diagram.parametric.edit.policy,
- org.eclipse.papyrus.sysml.diagram.parametric.factory,
- org.eclipse.papyrus.sysml.diagram.parametric.figures,
- org.eclipse.papyrus.sysml.diagram.parametric.parser,
- org.eclipse.papyrus.sysml.diagram.parametric.part,
- org.eclipse.papyrus.sysml.diagram.parametric.policies,
- org.eclipse.papyrus.sysml.diagram.parametric.preferences,
- org.eclipse.papyrus.sysml.diagram.parametric.provider,
- org.eclipse.papyrus.sysml.diagram.parametric.utils
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-Version: 2.0.0.qualifier
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.parametric.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.parametric;singleton:=true
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/build.properties
deleted file mode 100644
index 70eddf30d23..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/,\
-           src-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               palettes/,\
-               icons/,\
-               about.html,\
-               model/
-src.includes = model/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png
deleted file mode 100644
index 2b3e965c7e1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/icons/wizban/NewResourceWizard.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/icons/wizban/NewResourceWizard.gif
deleted file mode 100644
index 93641ae9d67..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/icons/wizban/NewResourceWizard.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/model/SysML.Parametric.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/model/SysML.Parametric.idgen
deleted file mode 100644
index 4db68156930..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/model/SysML.Parametric.idgen
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<idgen:Diagram 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:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="Parametric" type="Parametric" icon="icons/obj16/Diagram_Parametric.gif" label="SysML Parametric Diagram" language="sysml" javaPackagePrefix="org.eclipse.papyrus.sysml.diagram.parametric" javaClassPrefix="ParametricDiagram" createCommandLabel="Create a new Parametric Diagram">
-  <diagramEditPart name="Diagram edit part">
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy" key="EditPolicy.LAYOUT_ROLE"/>
-    <behaviors name="" javaClassQualifiedName="org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultCreationEditPolicy" key="EditPolicyRoles.CREATION_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultContainerNodeEditPolicy" key="EditPolicy.GRAPHICAL_NODE_ROLE"/>
-  </diagramEditPart>
-  <inheritedDiagrams name="CompositeDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy">
-    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#CompositeStructure"/>
-    <genNodes>
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.48"/>
-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Constraint"/>
-    </genNodes>
-    <genNodes generatePreferencePage="false" generateTool="false">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.27"/>
-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Comment"/>
-    </genNodes>
-    <genNodes>
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.43"/>
-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Comment"/>
-    </genNodes>
-    <genNodes generatePreferencePage="false" generateTool="false">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.32"/>
-      <semanticType href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#org.eclipse.papyrus.uml.Constraint"/>
-    </genNodes>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@links.1"/>
-    </genLinks>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@links.2"/>
-    </genLinks>
-  </inheritedDiagrams>
-  <customJavaClasses name="" customEditPolicyProvider="org.eclipse.papyrus.sysml.diagram.internalblock.CustomEditPolicyProvider" customPreferenceInitializer="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CustomPreferenceInitializer"/>
-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_composite"/>
-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>
-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>
-  <usedCustomNodes href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>
-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_connector"/>
-  <usedCustomEdges href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_dependency"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#label_sysml_block_name"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#affixedlabel_sysml_flowport_label"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#affixedlabel_uml_appliedstereotype"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#affixedlabel_uml_port_label"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_structure"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_blockproperty_structure"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#label_uml_property_label"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_appliedstereotype"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_connector_label"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_connector_source_multiplicity"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_connector_target_multiplicity"/>
-  <usedCustomDecorations href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#linklabel_uml_namedelement_name"/>
-  <diagramConfig>
-    <contains xsi:type="idgen:GraphicalTypeDiagramRef">
-      <contains>
-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_block_as_composite"/>
-        <contains>
-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>
-        </contains>
-        <contains>
-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>
-        </contains>
-        <contains>
-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_structure"/>
-        </contains>
-        <contains>
-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>
-          <contains>
-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_flowport_as_affixed"/>
-          </contains>
-          <contains>
-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_port_as_affixed"/>
-          </contains>
-          <contains>
-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_blockproperty_structure"/>
-            <contains>
-              <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>
-            </contains>
-          </contains>
-        </contains>
-        <contains>
-          <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblockproperty_as_composite"/>
-          <contains>
-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#shape_uml_property_as_label"/>
-          </contains>
-          <contains>
-            <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_blockproperty_structure"/>
-            <contains>
-              <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblockproperty_as_composite"/>
-            </contains>
-            <contains>
-              <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#label_uml_property_label"/>
-            </contains>
-          </contains>
-        </contains>
-      </contains>
-      <contains>
-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_dependency"/>
-      </contains>
-      <contains>
-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/UML.ReusableParts.idgen#link_uml_connector"/>
-      </contains>
-    </contains>
-    <contains>
-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_structure"/>
-      <contains>
-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>
-      </contains>
-      <contains>
-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblockproperty_as_composite"/>
-      </contains>
-    </contains>
-    <contains>
-      <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#compartment_sysml_blockproperty_structure"/>
-      <contains>
-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_blockproperty_as_composite"/>
-      </contains>
-      <contains>
-        <ref href="../../org.eclipse.papyrus.sysml.diagram.common/model/SysML.ReusableParts.idgen#shape_sysml_constraintblockproperty_as_composite"/>
-      </contains>
-    </contains>
-  </diagramConfig>
-</idgen:Diagram>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration
deleted file mode 100644
index e23ba26ed7c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.parametric.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.parametric Palette" description="This is the palette of PapyrusSysMLParametricDiagram">

-  <drawerConfigurations id="parametric.drawer.nodes" label="Nodes">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.constraintblockpropertycomposite" label="ConstraintProperty" description="Create a new ConstraintProperty">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Block.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ConstraintProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.parameter" label="ConstraintParameter" description="Create a new ConstraintParameter">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.blockpropertycomposite" label="Part" description="Create a new Part">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.PartProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.reference" label="Reference" description="Create a new Reference">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ReferenceProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.value" label="Value" description="Create a new Value">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ValueProperty"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="parametric.drawer.edges" label="Edges">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.connector" label="BindingConnector" description="Create a new BindingConnector" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="parametric.drawer.others" label="Others">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.comment" label="Comment" description="Create a new Comment">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16//Comment.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.constraint" label="Constraint" description="Create a new Constraint">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.commentannotatedelement" label="CommentAnnotatedElement" description="Create a new CommentAnnotatedElement" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.context_link" label="ContextLink" description="Create a new ContextLink" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-</paletteconfiguration:PaletteConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/parametric.palette.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/parametric.palette.xml
deleted file mode 100644
index f385c0ec607..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/parametric.palette.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer id="parametric.drawer.nodes" name="Nodes" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-			<aspectTool description="Create a new ConstraintProperty" id="parametric.tool.constraintblockpropertycomposite"
-				name="ConstraintProperty" refToolId="parametric.tool.constraintblockpropertycomposite">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintParameter" id="parametric.tool.parameter"
-				name="ConstraintParameter" refToolId="parametric.tool.parameter">
-			</aspectTool>
-			<aspectTool description="Create a new Part" id="parametric.tool.blockpropertycomposite"
-				name="Part" refToolId="parametric.tool.blockpropertycomposite">
-			</aspectTool>
-			<aspectTool description="Create a new Reference" id="parametric.tool.reference"
-				name="Reference" refToolId="parametric.tool.reference">
-			</aspectTool>
-			<aspectTool description="Create a new Value" id="parametric.tool.value"
-				name="Value" refToolId="parametric.tool.value">
-			</aspectTool>
-		</drawer>
-		<drawer id="parametric.drawer.edges" name="Edges" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-			<aspectTool description="Create a new BindingConnector" id="parametric.tool.connector"
-				name="BindingConnector" refToolId="parametric.tool.connector">
-			</aspectTool>
-		</drawer>
-		<drawer id="parametric.drawer.others" name="Others" iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-			<aspectTool description="Create a new Dependency" id="parametric.tool.dependency"
-				name="Dependency" refToolId="parametric.tool.dependency">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="parametric.tool.comment"
-				name="Comment" refToolId="parametric.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="parametric.tool.constraint"
-				name="Constraint" refToolId="parametric.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new CommentAnnotatedElement" id="parametric.tool.commentannotatedelement"
-				name="CommentAnnotatedElement" refToolId="parametric.tool.comment_constraint_link">
-			</aspectTool>			
-			<aspectTool description="Create a new ContextLink" id="parametric.tool.context_link"
-				name="ContextLink" refToolId="parametric.tool.context_link">
-			</aspectTool>			
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.properties
deleted file mode 100644
index 6f678bf8b44..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.properties
+++ /dev/null
@@ -1,14 +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:
-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
-##################################################################################
-pluginName=SysML Parametric Diagram
-providerName=Eclipse Modeling Project
-context.description=Papyrus SysML Parametric Diagram Editing
-context.name=In Papyrus SysML Parametric Diagram Editor
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
deleted file mode 100644
index 44487bcb7a8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<extension point="org.eclipse.ui.contexts" id="ui-context">
-  <?gmfgen generated="true"?>
-  <context
-     description="%context.description"
-     id="org.eclipse.papyrus.sysml.diagram.parametric.ui.diagramContext"
-     name="%context.name"
-     parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
-  </context>
-</extension>
-   
-<!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-	<creationCommand
-		creationCommandClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramCreateCommand"
-		icon="icons/obj16/Diagram_Parametric.png"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.CreateCommand"
-		language="sysml"
-		label="Parametric Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramEditorFactory"
-		icon="icons/obj16/Diagram_Parametric.png" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.sysml.diagram.parametric.CreateCommand"
-		name="Create a new Parametric Diagram"
-		description="Create a new Parametric Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-    <command
-		categoryId="org.eclipse.papyrus.editor.category"
-		description="Switch ConstraintProperty Representation"
-		defaultHandler="org.eclipse.papyrus.sysml.diagram.parametric.commands.switchrepresentation.SwitchConstraintPropertyRepresentationCommandHandler"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.custom.switchConstraintProperty"
-		name="Switch ConstraintProperty Representation"/>
-    <command
-		categoryId="org.eclipse.papyrus.editor.category"
-		description="Show/Hide ConstraintExpression"
-		defaultHandler="org.eclipse.papyrus.sysml.diagram.parametric.commands.switchrepresentation.ShowHideConstraintExpressionCommandHandler"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.custom.showHideConstraintExpression"
-		name="Show/Hide Constraint expression"/>
-</extension>
-
-
-<!-- Diagram creation command registration in menu and toolbar -->
-<extension point="org.eclipse.ui.menus">
-
-
-  	<menuContribution locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.format">
-      <menu
-            label="Representation"
-            tooltip="Representation">
-   	    <command
-	        commandId="org.eclipse.papyrus.sysml.diagram.parametric.custom.switchConstraintProperty"
-	        label="Switch ConstraintProperty representation"
-	        style="push"
-	        tooltip="Switch ConstraintProperty representation">
-	        <visibleWhen>
-            <and>
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart">
-                  </instanceof>
-               </iterate>
-               <with
-                     variable="selection">
-                  <not>
-                     <count
-                           value="0">
-                     </count>
-                  </not>
-               </with>
-            </and>
-         </visibleWhen>
-	    </command>
-	  </menu>
-	  <separator
-            name="org.eclipse.papyrus.uml.diagram.menu.popup.separatorRepresentation"
-            visible="true">
-      </separator>
-  	</menuContribution>       
-
-  	<menuContribution locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters">
-	    <command
-	        commandId="org.eclipse.papyrus.sysml.diagram.parametric.custom.showHideConstraintExpression"
-    		icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-	        label="Show/Hide Constraint expression"
-	        style="push"
-	        tooltip="Show/Hide Constraint expression">
-	        <visibleWhen>
-            <and>
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart">
-                  </instanceof>
-               </iterate>
-               <with
-                     variable="selection">
-                  <not>
-                     <count
-                           value="0">
-                     </count>
-                  </not>
-               </with>
-            </and>
-         </visibleWhen>
-	    </command>
-  	</menuContribution>       
-</extension>
-
-
-<extension
-      id="update-cmd-binding"
-      point="org.eclipse.ui.bindings">
-   <key
-         commandId="org.eclipse.papyrus.sysml.diagram.parametric.custom.switchConstraintProperty"
-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-         sequence="CTRL+R">
-   </key>
-</extension>
-
-<!-- Handler for Show/Hide content on Part or Ref. -->
-<extension point="org.eclipse.ui.handlers">
-	<handler class="org.eclipse.papyrus.sysml.diagram.parametric.handler.ShowHideRelatedContentsHandler" commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand">
-		<activeWhen>
-		<and>
-			<with variable="activeEditor">
-				<test property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType" value="Parametric" forcePluginActivation="true"></test>
-			</with>	
-			<with variable="showHideRelatedContents">
-				<equals value="enabled"></equals>
-			</with>
-			<with variable="selection">
-				<iterate ifEmpty="false" operator="and">
-					<instanceof value="org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockPropertyCompositeEditPart"></instanceof>
-				</iterate>
-			</with>
-		</and>
-		
-		</activeWhen>
-	</handler>
-	<handler class="org.eclipse.papyrus.sysml.diagram.parametric.handler.ShowHideRelatedContentsHandler" commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand">
-		<activeWhen>
-		<and>
-			<with variable="activeEditor">
-				<test property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType" value="Parametric" forcePluginActivation="true"></test>
-			</with>	
-			<with variable="showHideRelatedContents">
-				<equals value="enabled"></equals>
-			</with>
-			<with variable="selection">
-				<iterate ifEmpty="false" operator="and">
-					<instanceof value="org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomBlockCompositeEditPartTN"></instanceof>
-				</iterate>
-			</with>
-		</and>
-		
-		</activeWhen>
-	</handler>
-	<handler class="org.eclipse.papyrus.sysml.diagram.parametric.handler.ShowHideRelatedContentsHandler" commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand">
-		<activeWhen>
-		<and>
-			<with variable="activeEditor">
-				<test property="org.eclipse.papyrus.uml.diagram.common.diagram.tester.diagramType" value="Parametric" forcePluginActivation="true"></test>
-			</with>	
-			<with variable="showHideRelatedContents">
-				<equals value="enabled"></equals>
-			</with>
-			<with variable="selection">
-				<iterate ifEmpty="false" operator="and">
-					<instanceof value="org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart"></instanceof>
-				</iterate>
-			</with>
-		</and>
-		
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.ParametricDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="Parametric"/>
-	</viewProvider>
-	
-	<!-- Custom graphical types view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomViewProvider">
-		<Priority name="Medium"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Property, UML::Port, SysML::ReferenceProperty, SysML::FlowPort, SysML::FlowPort_Out, SysML::Block, SysML::FlowPort_In, SysML::FlowPort_InOut, SysML::PartProperty, SysML::ConstraintProperty"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="shape_sysml_flowport_as_affixed, shape_uml_port_as_affixed, shape_sysml_block_as_composite, shape_sysml_blockproperty_as_composite, shape_sysml_constraintblockproperty_as_composite"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="UML::Connector, UML::Dependency"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="link_uml_dependency, link_uml_connector"/>
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Class" -->
-		<object id="uml.Class" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Class"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Class"/>			
-		
-		<!-- "uml.Port" -->
-		<object id="uml.Port" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Port"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Port"/>			
-		
-		<!-- "uml.Property" -->
-		<object id="uml.Property" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Property"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="uml.Property"/>			
-		
-		<!-- "uml.Connector" -->
-		<object id="uml.Connector" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Connector"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Connector"/>			
-		
-		<!-- "uml.Dependency" -->
-		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Dependency"/>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="uml.Dependency"/>			
-		<object id="elementtype.node"
-          class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-       
-     		<method
-           		name="getSemanticHint()"
-           		value="UML::Property, SysML::ActorPartProperty, SysML::ValueProperty, SysML::ReferenceProperty, SysML::FlowPort_In, UML::Port, SysML::FlowPort_Out, SysML::PartProperty, SysML::FlowPort_InOut, SysML::FlowPort, SysML::Block, SysML::FlowPort_NA">
-     		</method>
-  		</object>
-  		<context
-        	elements="elementtype.node"
-        	viewClass="org.eclipse.gmf.runtime.notation.Node">
-  		</context>
-  		<object id="elementtype.edge"
-        	class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-    	 	<method
-        		name="getSemanticHint()"
-           		value="UML::Dependency, UML::Connector">
-     		</method>
-	  	</object>
-	  	<context
-	        elements="elementtype.edge"
-	        viewClass="org.eclipse.gmf.runtime.notation.Edge">
-	  	</context>			
-		
-	</viewProvider>	
-
-	<!-- ViewProvider for inherited elements (from CompositeDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.InheritedCompositeDiagramViewProvider">
-		<Priority name="Low"></Priority>
-		
-		<!-- Load the ViewProvider on following SemanticHint related to IElementType(s) used in the palette (also used for legacy elements) -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="UML::Comment, UML::Constraint"></context>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"></context>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"></context>
-        
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-        <!-- "uml.Comment" -->
-		<object id="uml.Comment" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Comment"></method>
-		</object>
-
-        <!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"></method>
-		</object>
-
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="uml.Comment, uml.Constraint"></context>
-			
-	</viewProvider>
-</extension>
-
-<!-- Diagram edit part providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">	
-	<!-- Diagram edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.ParametricDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.sysml.diagram.parametric.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="Parametric"/>
-		</object>
-		<context views="org.eclipse.papyrus.sysml.diagram.parametric.Diagram"/>	
-	</editpartProvider>
-	
-	<!-- Custom graphical types edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomEditPartProvider">
-		<Priority name="Medium"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.parametric.CustomNodeGraphicalTypes">
-			<method name="getType()" value="shape_sysml_flowport_as_affixed, shape_uml_port_as_affixed, shape_sysml_block_as_composite, shape_sysml_blockproperty_as_composite, shape_sysml_constraintblockproperty_as_composite"/>
-		</object>
-		
-		<object
-			class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.parametric.CustomGraphicalTypes_Decorations">
-			<method name="getType()" value="linklabel_uml_connector_source_multiplicity, compartment_sysml_blockproperty_structure, linklabel_uml_connector_target_multiplicity, affixedlabel_sysml_flowport_label, compartment_sysml_structure, affixedlabel_uml_port_label, label_sysml_block_name, linklabel_uml_appliedstereotype, linklabel_uml_namedelement_name, linklabel_uml_connector_label, label_uml_property_label, shape_uml_constraint_as_label, affixedlabel_uml_appliedstereotype"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.parametric.CustomNodeGraphicalTypes"/>
-		<context views="org.eclipse.papyrus.sysml.diagram.parametric.CustomGraphicalTypes_Decorations"/>
-	
-		<object
-			class="org.eclipse.gmf.runtime.notation.Edge(org.eclipse.gmf.runtime.notation)"
-			id="org.eclipse.papyrus.sysml.diagram.parametric.CustomEdgeGraphicalTypes">
-			<method name="getType()" value="link_uml_dependency, link_uml_connector"/>
-		</object>
-		
-		<context views="org.eclipse.papyrus.sysml.diagram.parametric.CustomEdgeGraphicalTypes"/>
-		
-	</editpartProvider>
-	
-	<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.InheritedCompositeDiagramEditPartProvider">
-		<Priority name="Low"></Priority>
-		
-		<object id="COMMENT" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape, Comment_BodyLabel"></method>
-		</object>
-		<object id="COMMENT_CN" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"></method>
-		</object>
-		<object id="CONSTRAINT" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"></method>
-		</object>
-		<object id="CONSTRAINT_CN" class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_BodyLabel_CN"></method>
-		</object>
-
-		<object id="COMMENT_ANNOTATED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Comment_AnnotatedElementEdge"></method>
-		</object>
-		<object id="CONSTRAINT_CONSTRAINED_ELEMENT" class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Constraint_ConstrainedElementEdge"></method>
-		</object>
-
-		<context views="COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"></context>
-		<context views="COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"></context>
-		
-	</editpartProvider>
-	
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomEditPolicyProvider">
-		<Priority name="Low"/>
-	</editpolicyProvider>
-</extension>
-
-<!-- Preference pages declaration -->
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-
-	<!-- Diagram Preference pages declaration -->
-	<page
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		name="Parametric Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.ParametricDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	
-	
-	
-	
-	
-	
-	
-
-
-		
-		
-		
-		
-		
-		
-		
-
-</extension>
-
-<!-- // Start of user code custom extensions 
-  -->
-<!-- Parser provider declaration -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
-	<ParserProvider class="org.eclipse.papyrus.sysml.diagram.parametric.provider.ParserProvider">
-		<Priority name="Low"></Priority>
-	</ParserProvider>
-</extension>
-
-	<!-- Diagram specific advices -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-		<!-- specific advices (pop up on creation) -->		
-		<adviceBinding id="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice" 
-			class="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice" 
-			inheritance="none" 
-			typeId="org.eclipse.papyrus.uml.Property"/>
-	</metamodel>
-</extension>
-
-<!-- UML ElementType bindings to Papyrus shared IClientContext -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-	<!-- Bindings declaration to shared IClientContext -->
-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">	
-		<elementType ref="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice"/>
-	</binding>
-</extension>
-
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-   <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-      <specializationType
-            id="org.eclipse.papyrus.sysml.diagram.parametric.Constraint_ContextEdge"
-            name="Constraint Context Edge"
-            kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="Constraint_ContextEdge"/>
-      </specializationType>
-   </metamodel>
-   <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-      <specializationType
-            id="org.eclipse.papyrus.sysml.diagram.parametric.Constraint_KeywordLabel"
-            name="Constraint Keyword Label"
-            kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="Constraint_KeywordLabel"/>
-      </specializationType>
-   </metamodel>
-</extension>  
-<!-- // End of user code 
-  -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
-   <diagramMappings diagramID="Parametric">
-          <mapping type="Parametric" humanReadableType="ParametricDiagram"/>
-          <!-- Compartments -->
-          <mapping
-                 humanReadableType="structure"
-                 type="compartment_sysml_structure">
-          </mapping>
-          
-          <mapping
-                 humanReadableType="structure"
-                 type="compartment_sysml_blockproperty_structure">
-          </mapping>
-   
-          <!-- Link labels -->
-
-          <mapping
-                 humanReadableType="Label"
-                 type="affixedlabel_sysml_flowport_label">
-          </mapping>
-          
-          <mapping
-                 humanReadableType="Name"
-                 type="affixedlabel_uml_appliedstereotype">
-          </mapping>
-          
-          <mapping
-                 humanReadableType="Label"
-                 type="affixedlabel_uml_port_label">
-          </mapping>
-   
-          <mapping
-                 humanReadableType="Stereotype"
-                 type="linklabel_uml_appliedstereotype">
-          </mapping>
-          
-          <mapping
-                 humanReadableType="Name"
-                 type="linklabel_uml_connector_label">
-          </mapping>
-          
-          <mapping
-                 humanReadableType="SourceMultiplicity"
-                 type="linklabel_uml_connector_source_multiplicity">
-          </mapping>
-          
-          <mapping
-                 humanReadableType="TargetMultiplicity"
-                 type="linklabel_uml_connector_target_multiplicity">
-          </mapping>
-          
-          <mapping
-                 humanReadableType="Name"
-                 type="linklabel_uml_namedelement_name">
-          </mapping>
-   
-   </diagramMappings>
-</extension>
-
-   <extension
-         point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
-      <visualTypeProvider
-            class="org.eclipse.papyrus.sysml.diagram.parametric.provider.ParametricVisualTypeProvider"
-            diagramType="Parametric">
-      </visualTypeProvider>
-   </extension>
-
-<extension
-      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
-   <diagramReconciler
-         diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_1_0"
-         source="1.0.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.sysml.diagram.parametric.migration.ParametricReconciler_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-</extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<paletteDefinition
-		ID="org.eclipse.papyrus.sysml.diagram.parametric.paletteconfiguration"
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="Papyrus SysML parametric editor Plugin Palette" 
-		path="palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram this palette tools relate to -->
-		<editor
-			id="org.eclipse.papyrus.sysml.diagram.parametric">
-		</editor>
-	</paletteDefinition>
-</extension>
-</plugin>
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
deleted file mode 100644
index c7e4b5e5b34..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.diagram.parametric</artifactId>
-	<version>2.0.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/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
deleted file mode 100644
index 2c1a0445a80..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
+++ /dev/null
@@ -1,184 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.notation.Bounds;
-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.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Represents a creation command for a SysML parametric diagram
- *
- * @author Laurent Wouters
- */
-public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDefaultDiagramName() {
-		return "New Parametric Diagram"; //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return ElementTypes.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
-		// Start of user code Custom diagram creation
-		Diagram diagram = null;
-
-		if (element instanceof org.eclipse.uml2.uml.Class) {
-			org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class) element;
-			Block block = UMLUtil.getStereotypeApplication(cOwner, Block.class);
-
-			if (block != null) {
-				canvasDomainElement = element;
-				Package owningPackage = ((Element) element).getNearestPackage();
-				diagram = super.doCreateDiagram(diagramResource, owner, owningPackage, prototype, name);
-			}
-
-		} else if (element instanceof Package) {
-
-			try {
-				canvasDomainElement = null;
-				IEditCommandRequest request = new CreateElementRequest(element, SysMLElementTypes.BLOCK);
-				IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(element);
-				if (commandService == null) {
-					return null;
-				}
-
-				ICommand createElementCommand = commandService.getEditCommand(request);
-				if ((createElementCommand != null) && (createElementCommand.canExecute())) {
-					createElementCommand.execute(new NullProgressMonitor(), null);
-					EObject block = GMFCommandUtils.getCommandEObjectResult(createElementCommand);
-					canvasDomainElement = block;
-					diagram = super.doCreateDiagram(diagramResource, owner, element, prototype, name);
-				}
-
-			} catch (ExecutionException e) {
-				e.printStackTrace();
-			}
-
-		}
-
-		return diagram;
-		// End of user code
-	}
-
-	// Start of user code Custom creation command
-	/** Domain Element referenced by canvas if it differs from {@link Package} */
-	protected EObject canvasDomainElement = null;
-
-	/** Default margin for the display of Domain Element referenced by canvas */
-	protected static int DEFAULT_MARGIN = 20;
-
-	/** Default height for the display of Domain Element referenced by canvas */
-	protected static int DEFAULT_HEIGHT = 600;
-
-	/** Default width for the display of Domain Element referenced by canvas */
-	protected static int DEFAULT_WIDTH = 1000;
-
-	/**
-	 * Initialize the diagram. The diagram is attached to the element selected on creation.
-	 * Possible element types are: Block.
-	 */
-	@Override
-	protected void initializeDiagram(EObject diagram) {
-		if (diagram instanceof Diagram) {
-			Diagram currentDiagram = (Diagram) diagram;
-			if (canvasDomainElement != null) {
-				currentDiagram.setElement(canvasDomainElement);
-				initializeDiagramContent(currentDiagram);
-			}
-		}
-	}
-
-	/**
-	 * Initialize the diagram with the canvas domain element shown.
-	 *
-	 * @param diagram
-	 *            the diagram to initialize
-	 */
-	protected void initializeDiagramContent(Diagram diagram) {
-
-		// Create a view for the canvasDomainElement in the new diagram
-		View view =
-				ViewService.getInstance().createNode(new SemanticAdapter(canvasDomainElement, null), diagram, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-		view.setElement(diagram.getElement());
-
-		// Update the view position and size (should adapt to canvas current size)
-		Bounds viewBounds = (Bounds) ((Node) view).getLayoutConstraint();
-		viewBounds.setX(DEFAULT_MARGIN);
-		viewBounds.setY(DEFAULT_MARGIN);
-		viewBounds.setHeight(DEFAULT_HEIGHT);
-		viewBounds.setWidth(DEFAULT_WIDTH);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @generated NOT
-	 */
-	@Override
-	public boolean isParentReassignable() {
-		// Bug 374626: [Model Explorer] Moving an IBD from a block to another block shall be forbidden
-		return false;
-	}
-
-	// End of user code
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramEditorFactory.java
deleted file mode 100644
index fc8f9f6a4db..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramEditorFactory.java
+++ /dev/null
@@ -1,25 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-
-public class ParametricDiagramEditorFactory extends GmfEditorFactory {
-
-	public ParametricDiagramEditorFactory() {
-		super(ParametricDiagramForMultiEditor.class, ElementTypes.DIAGRAM_ID);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramForMultiEditor.java
deleted file mode 100644
index 725e124586f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramForMultiEditor.java
+++ /dev/null
@@ -1,133 +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:
- *	 R�gis CHEVREL: chevrel.regis <at> gmail.com
- *	 CEA LIST - Initial API and implementation
- *   Christian W. Damus (CEA) - bug 392301
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization;
-import org.eclipse.papyrus.sysml.diagram.parametric.part.ParametricDiagramEditor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-
-/**
- * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- *
- */
-public class ParametricDiagramForMultiEditor extends ParametricDiagramEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/Diagram_Parametric.png";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(ParametricDiagramForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	private Image titleImage;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 *
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 *
-	 */
-	public ParametricDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
-		super(servicesRegistry, diagram);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		setPartName(LabelInternationalization.getInstance().getDiagramLabel(getDiagram()));
-		titleImage = DIAG_IMG_DESC.createImage();
-		setTitleImage(titleImage);
-	}
-
-	@Override
-	public void dispose() {
-		if (titleImage != null) {
-			titleImage.dispose();
-			titleImage = null;
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setInput(IEditorInput input) {
-		try {
-			// Provide an URI with fragment in order to reuse the same Resource
-			// and set the diagram to the fragment.
-			URIEditorInput uriInput = new URIEditorInput(EcoreUtil.getURI(getDiagram()));
-			doSetInput(uriInput, true);
-		} catch (CoreException x) {
-			String title = "Problem opening";
-			String msg = "Cannot open input element:";
-			Shell shell = getSite().getShell();
-			ErrorDialog.openError(shell, title, msg, x.getStatus());
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createGraphicalViewer(Composite parent) {
-		splitter = parent;
-		super.createGraphicalViewer(parent);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setFocus() {
-		splitter.setFocus();
-		super.setFocus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditingDomainID() {
-		return "org.eclipse.papyrus.sysml.diagram.parametric.EditingDomain";
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/ParametricDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/ParametricDiagramEditPart.java
deleted file mode 100644
index 4f433e7f871..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/ParametricDiagramEditPart.java
+++ /dev/null
@@ -1,52 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.part;
-
-
-
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultContainerNodeEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.policy.DiagramSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomParametricSemanticPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-
-
-/**
- *
- * @Generated NOT //change the super class
- */
-public class ParametricDiagramEditPart extends PapyrusDiagramEditPart {
-
-	public ParametricDiagramEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DiagramSemanticEditPolicy());			
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultContainerNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/DiagramSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/DiagramSemanticEditPolicy.java
deleted file mode 100644
index 960b88a1f6b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/DiagramSemanticEditPolicy.java
+++ /dev/null
@@ -1,56 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.policy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-// Start of user code custom imports
-// End of user code
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomDefaultSemanticEditPolicy;
-
-public class DiagramSemanticEditPolicy extends CustomDefaultSemanticEditPolicy {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRelationshipSourceCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRelationshipTargetCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRefRelationshipSourceCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientRefRelationshipTargetCommand(ReconnectRequest request) {
-		return UnexecutableCommand.INSTANCE;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/ParametricDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/ParametricDiagramDragDropEditPolicy.java
deleted file mode 100644
index 65653c3e4a1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/edit/policy/ParametricDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,51 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.GraphicalTypeRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-
-/** Customization of the DND edit policy for the Parametric Diagram */
-public class ParametricDiagramDragDropEditPolicy extends CustomDiagramDragDropEditPolicy {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeVisualID(View containerView, EObject domainElement) {
-		String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLinkWithClassVisualID(EObject domainElement) {
-		String domainType = registry.getEdgeGraphicalType(domainElement);
-		if (org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
deleted file mode 100644
index a5028a8a321..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
+++ /dev/null
@@ -1,77 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.factory;
-
-import java.util.Arrays;
-import java.util.HashMap;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-@SuppressWarnings("serial")
-public class DiagramPaletteFactory extends PaletteFactory.Adapter {
-
-	private static HashMap<String, IElementType[]> nodesToolIdTypesMap = new HashMap<String, IElementType[]>() {
-
-		{
-			put("parametric.tool.blockcomposite", new IElementType[] { SysMLElementTypes.BLOCK });
-			put("parametric.tool.blockpropertycomposite", new IElementType[] { SysMLElementTypes.PART_PROPERTY });
-			put("parametric.tool.reference", new IElementType[] { SysMLElementTypes.REFERENCE_PROPERTY });
-			put("parametric.tool.value", new IElementType[] { SysMLElementTypes.VALUE_PROPERTY });
-			put("parametric.tool.constraintblockpropertycomposite", new IElementType[] { SysMLElementTypes.CONSTRAINT_PROPERTY });
-			put("parametric.tool.flowport", new IElementType[] { SysMLElementTypes.FLOW_PORT });
-			put("parametric.tool.port", new IElementType[] { UMLElementTypes.PORT });
-			put("parametric.tool.parameter", new IElementType[] { UMLElementTypes.PROPERTY });
-			// Start of user code Custom nodes
-			put("parametric.tool.constraint", new IElementType[] { UMLElementTypes.CONSTRAINT });
-			put("parametric.tool.comment", new IElementType[] { UMLElementTypes.COMMENT });
-			// End of user code
-		}
-	};
-
-	private static HashMap<String, IElementType[]> edgesToolIdTypesMap = new HashMap<String, IElementType[]>() {
-
-		{
-			put("parametric.tool.connector", new IElementType[] { UMLElementTypes.CONNECTOR });
-			put("parametric.tool.dependency", new IElementType[] { UMLElementTypes.DEPENDENCY });
-			// Start of user code Custom edges
-			put("parametric.tool.comment_constraint_link", new IElementType[] { ElementTypes.COMMENT_ANNOTATED_ELEMENT });
-			put("parametric.tool.context_link", new IElementType[] { ElementTypes.CONTEXT_LINK });
-			// End of user code
-		}
-	};
-
-	@Override
-	public Tool createTool(String toolId) {
-
-		IElementType[] types;
-
-		types = nodesToolIdTypesMap.get(toolId);
-		if (types != null) {
-			return new AspectUnspecifiedTypeCreationTool(Arrays.asList(types));
-		}
-
-		types = edgesToolIdTypesMap.get(toolId);
-		if (types != null) {
-			return new AspectUnspecifiedTypeConnectionTool(Arrays.asList(types));
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/ParametricDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/ParametricDiagramViewFactory.java
deleted file mode 100644
index 1599ffce349..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/ParametricDiagramViewFactory.java
+++ /dev/null
@@ -1,31 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class ParametricDiagramViewFactory extends DiagramViewFactory {
-
-	// Start of user code Custom view Factory field
-	// End of user code
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/part/ParametricDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/part/ParametricDiagramEditor.java
deleted file mode 100644
index ef56c9aa4ad..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/part/ParametricDiagramEditor.java
+++ /dev/null
@@ -1,64 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.part;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
-
-/**
- * @generated
- */
-public class ParametricDiagramEditor extends org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditor {
-
-	/** context used when trying to find services */
-	public static final String ID = "org.eclipse.papyrus.sysml.diagram.parametric.part.ParametricDiagramEditorID"; //$NON-NLS-1$
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getContextID() {
-		return CONTEXT_ID;
-	}
-
-	/**
-	 * @throws org.eclipse.papyrus.infra.core.services.ServiceException
-	 * @generated
-	 */
-	public ParametricDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException, org.eclipse.papyrus.infra.core.services.ServiceException {
-		super(servicesRegistry, diagram);
-	}
-
-	// Start of user code Custom Editor Methods
-	// End of user code
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
deleted file mode 100644
index 0a84ca4d3b7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
+++ /dev/null
@@ -1,96 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-
-public class BlockCompositePreferencePage extends ParametricDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public BlockCompositePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentAnnotatedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentAnnotatedElementPreferencePage.java
deleted file mode 100644
index baf66ca53e7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentAnnotatedElementPreferencePage.java
+++ /dev/null
@@ -1,43 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-
-public class CommentAnnotatedElementPreferencePage extends ParametricDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public CommentAnnotatedElementPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentPreferencePage.java
deleted file mode 100644
index 9b4a5ecd860..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,44 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-
-public class CommentPreferencePage extends ParametricDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
deleted file mode 100644
index 96d5e6434de..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
+++ /dev/null
@@ -1,36 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class ConnectorPreferencePage extends ParametricDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_CONNECTOR_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public ConnectorPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_CONNECTOR_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintConstrainedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintConstrainedElementPreferencePage.java
deleted file mode 100644
index e44b40abc91..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintConstrainedElementPreferencePage.java
+++ /dev/null
@@ -1,43 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-
-public class ConstraintConstrainedElementPreferencePage extends ParametricDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public ConstraintConstrainedElementPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index b36251c17cf..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,44 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-
-public class ConstraintPreferencePage extends ParametricDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
deleted file mode 100644
index c561639997d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
+++ /dev/null
@@ -1,36 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class DependencyPreferencePage extends ParametricDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public DependencyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramGeneralPreferencePage.java
deleted file mode 100644
index 7a1d14342ad..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramGeneralPreferencePage.java
+++ /dev/null
@@ -1,26 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
-
-public class ParametricDiagramGeneralPreferencePage extends DiagramPreferencePage {
-
-	public ParametricDiagramGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-		setPreferenceKey(ElementTypes.DIAGRAM_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramLinkPreferencePage.java
deleted file mode 100644
index 996a70da0fe..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramLinkPreferencePage.java
+++ /dev/null
@@ -1,73 +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:

- *		R�gis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class ParametricDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {

-

-	/** The list of label names for this link */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public ParametricDiagramLinkPreferencePage() {

-		labelsList = new ArrayList<String>();

-		initializeLabelsList();

-		Collections.unmodifiableList(labelsList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramNodePreferencePage.java
deleted file mode 100644
index a28b62b6357..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramNodePreferencePage.java
+++ /dev/null
@@ -1,119 +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:

- *		R�gis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedCompartmentGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class ParametricDiagramNodePreferencePage extends AbstractPapyrusNodePreferencePage {

-

-	/** The list owning the names of compartments */

-	protected List<String> compartmentNamesList;

-

-	/** The list owning the names of compartment that have a title */

-	protected List<String> compartmentTitlesList;

-

-	/** The list of label names for this node */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public ParametricDiagramNodePreferencePage() {

-		this.labelsList = new ArrayList<String>();

-		this.compartmentNamesList = new ArrayList<String>();

-		this.compartmentTitlesList = new ArrayList<String>();

-

-		initializeLabelsList();

-		initializeCompartmentNamesList();

-		initializeCompartmentTitlesList();

-

-		Collections.unmodifiableList(labelsList);

-		Collections.unmodifiableList(compartmentNamesList);

-		Collections.unmodifiableList(compartmentTitlesList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add compartments visibility group

-		if (!compartmentNamesList.isEmpty()) {

-			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());

-			addPreferenceGroup(compartmentGroup);

-		}

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartments. */

-	protected void initializeCompartmentNamesList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartment that have titles. */

-	protected void initializeCompartmentTitlesList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {

-		return new TreeMap<String, Boolean>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final void initializeCompartmentsList() {

-		compartmentsList = Collections.emptyList();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramPreferenceInitializer.java
deleted file mode 100644
index 560e1b430ab..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramPreferenceInitializer.java
+++ /dev/null
@@ -1,39 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
-
-public class ParametricDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.sysml.diagram.parametric.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
-		BlockCompositePreferencePage.initDefaults(store);
-		BlockPropertyCompositePreferencePage.initDefaults(store);
-		ConnectorPreferencePage.initDefaults(store);
-		DependencyPreferencePage.initDefaults(store);
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPartProvider.java
deleted file mode 100644
index f63c6714da0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPartProvider.java
+++ /dev/null
@@ -1,133 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.CustomAbstractEditPartProvider;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyStructureCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.FlowPortAffixedNodeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.StructureCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomBlockCompositeEditPartTN;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomBlockLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomBlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintParameterAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeAffixedLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AppliedStereotypeLinkLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelSourceMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorLinkLabelTargetMultiplicityEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintNodeLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.NamedElementLinkLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedLabelNameEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PropertyNodeLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class CustomEditPartProvider extends CustomAbstractEditPartProvider {
-
-	/** Map containing node view types supported by this provider */
-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
-
-	/** Map containing edge view types supported by this provider */
-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
-
-	/** Default constructor */
-	public CustomEditPartProvider() {
-		super();
-
-		diagramType = ElementTypes.DIAGRAM_ID;
-
-		// Nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID, CustomConstraintBlockPropertyCompositeEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, CustomBlockPropertyCompositeEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, CustomBlockCompositeEditPartTN.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID, CustomConstraintParameterAffixedNodeEditPart.class);
-
-		// Decorations
-		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, FlowPortAffixedLabelNameEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, BlockPropertyStructureCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, StructureCompartmentEditPart.class);
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, CustomBlockLabelNameEditPart.class); // TODO : change for multi FlowText
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeAffixedLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, PortAffixedLabelNameEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, PropertyNodeLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, ConstraintNodeLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, AppliedStereotypeLinkLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, ConnectorLinkLabelEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, ConnectorLinkLabelSourceMultiplicityEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, ConnectorLinkLabelTargetMultiplicityEditPart.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, NamedElementLinkLabelNameEditPart.class);
-
-
-		// Edges
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, ConnectorEditPart.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyEditPart.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View newView = ((IEditPartOperation) operation).getView();
-			if (newView == null) {
-				return false;
-			}
-
-			String graphicalType = newView.getType();
-
-			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
-				return false;
-			}
-
-			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
-				return false;
-			}
-		}
-
-		return super.provides(operation);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getNodeEditPartClass(View view) {
-		return nodeMap.get(view.getType());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getEdgeEditPartClass(View view) {
-		return edgeMap.get(view.getType());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypeRegistry.java
deleted file mode 100644
index 0d20a3bdf92..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypeRegistry.java
+++ /dev/null
@@ -1,255 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-public class CustomGraphicalTypeRegistry extends GraphicalTypeRegistry {
-
-	/** Default constructor */
-	public CustomGraphicalTypeRegistry() {
-
-		super();
-
-		// Nodes
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID);
-		knownNodes.add(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID);
-		// Decorations
-		knownNodes.add(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);
-		knownNodes.add(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID);
-		knownNodes.add(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID);
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID);
-		knownNodes.add(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID);
-		knownNodes.add(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID);
-
-		// Edges
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);
-		knownEdges.add(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-		// Start of user code getNodeGraphicalType(EObject domainElement, String containerType)
-		// End of user code
-
-		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_PROPERTY).getMatcher().matches(domainElement)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(domainElement)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-
-		// These element are only authorized on Block, not in Constraint Block. In ConstraintBlock it must become a ConstraintParameter
-		if (UMLUtil.getStereotypeApplication((Element) domainElement.eContainer(), ConstraintBlock.class) == null) {
-			if (((ISpecializationType) SysMLElementTypes.PART_PROPERTY).getMatcher().matches(domainElement)) {
-				if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				return UNDEFINED_TYPE;
-			}
-			if (((ISpecializationType) SysMLElementTypes.REFERENCE_PROPERTY).getMatcher().matches(domainElement)) {
-				if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				return UNDEFINED_TYPE;
-			}
-			if (((ISpecializationType) SysMLElementTypes.VALUE_PROPERTY).getMatcher().matches(domainElement)) {
-				if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-					return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-				}
-				return UNDEFINED_TYPE;
-			}
-		}
-		// Order is important for Part/Reference/ConstraintProperty which are also Property
-		if (UMLElementTypes.PROPERTY.getEClass().isInstance(domainElement)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-
-		}
-		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(domainElement)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		return super.getNodeGraphicalType(domainElement, containerType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(String proposedType, String containerType) {
-		// Start of user code getNodeGraphicalType(String proposedType, String containerType)
-		// End of user code
-
-		if (SysMLElementTypes.BLOCK.getSemanticHint().equals(proposedType)) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-
-		if (UMLElementTypes.PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-
-		if (SysMLElementTypes.CONSTRAINT_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-
-		if (SysMLElementTypes.PART_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.REFERENCE_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		if (SysMLElementTypes.VALUE_PROPERTY.getSemanticHint().equals(proposedType)) {
-			if (SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID;
-			}
-			return UNDEFINED_TYPE;
-		}
-		return super.getNodeGraphicalType(proposedType, containerType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(EObject domainElement) {
-		// Start of user code getEdgeGraphicalType(EObject domainElement)
-		// End of user code
-
-		if (UMLElementTypes.CONNECTOR.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
-		}
-		if (UMLElementTypes.DEPENDENCY.getEClass().isInstance(domainElement)) {
-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}
-		return super.getEdgeGraphicalType(domainElement);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(String proposedType) {
-		// Start of user code getEdgeGraphicalType(String proposedType)
-		// End of user code
-
-		if (UMLElementTypes.CONNECTOR.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;
-		}
-		if (UMLElementTypes.DEPENDENCY.getSemanticHint().equals(proposedType)) {
-			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;
-		}
-		return super.getEdgeGraphicalType(proposedType);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypes.java
deleted file mode 100644
index 51ddb08410c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomGraphicalTypes.java
+++ /dev/null
@@ -1,26 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-public class CustomGraphicalTypes {
-
-	/** ********************************************************* */
-	/** Diagram custom graphical types id *********************** */
-	/** ********************************************************* */
-
-
-
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomViewProvider.java
deleted file mode 100644
index 318d7a10c2b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomViewProvider.java
+++ /dev/null
@@ -1,100 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.factory.AffixedLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.CompartmentShapeViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.ConnectorLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.factory.InnerLabelViewFactory;
-import org.eclipse.papyrus.gmf.diagram.common.provider.CustomAbstractViewProvider;
-import org.eclipse.papyrus.sysml.diagram.common.factory.BlockCompositeClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.BlockPropertyCompositeClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.ConstraintBlockPropertyCompositeClassifierViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.factory.FlowPortAffixedNodeViewFactory;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.diagram.common.factory.ConnectorLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.ConstraintPropertyAffixedNodeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.DependencyLinkViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.factory.PortAffixedNodeViewFactory;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-public class CustomViewProvider extends CustomAbstractViewProvider {
-
-	/** Map containing node view types supported by this provider */
-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
-
-	/** Map containing edge view types supported by this provider */
-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
-
-	/** Default constructor */
-	public CustomViewProvider() {
-		super();
-		this.registry = new CustomGraphicalTypeRegistry();
-
-		diagramType = ElementTypes.DIAGRAM_ID;
-
-		// Custom classifier nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_COMPOSITE_ID, BlockCompositeClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID, BlockPropertyCompositeClassifierViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID, ConstraintBlockPropertyCompositeClassifierViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID, ConstraintPropertyAffixedNodeViewFactory.class);
-		// Custom affixed nodes
-		nodeMap.put(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID, FlowPortAffixedNodeViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID, PortAffixedNodeViewFactory.class);
-		// Custom child node labels
-		// Custom inner labels
-		nodeMap.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, InnerLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, InnerLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, InnerLabelViewFactory.class);
-		// Custom compartments
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID, CompartmentShapeViewFactory.class);
-		nodeMap.put(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, CompartmentShapeViewFactory.class);
-		// Custom affixed labels
-		nodeMap.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, AffixedLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, AffixedLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, AffixedLabelViewFactory.class);
-
-		// Custom edges
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, ConnectorLinkViewFactory.class);
-		edgeMap.put(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, DependencyLinkViewFactory.class);
-
-		// Custom edge labels
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, ConnectorLabelViewFactory.class);
-		nodeMap.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, ConnectorLabelViewFactory.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getNodeViewClass(IAdaptable semanticAdapter, View containerView, String graphicalType) {
-		return nodeMap.get(graphicalType);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Class<?> getEdgeViewClass(IAdaptable semanticAdapter, View containerView, String graphicalType) {
-		return edgeMap.get(graphicalType);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
deleted file mode 100644
index 827030013c4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ElementTypes.java
+++ /dev/null
@@ -1,75 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-public class ElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** SysML Parametric Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** SysML Parametric Diagram :: Diagram */
-	public static final String DIAGRAM_ID = "Parametric";
-
-
-
-
-	/** ********************************************************* */
-	/** SysML Parametric Diagram - CompositeDiagram related elements */
-	/** ********************************************************* */
-
-	/** CompositeDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_Shape;
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
-
-	public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPart.VISUAL_ID;
-
-	/** CompositeDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
-
-	public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
-
-	/** CompositeDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
-
-	public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
-
-	/** CompositeDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_Shape_CN;
-
-	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
-
-	public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = ConstraintSpecificationEditPartCN.VISUAL_ID;
-
-	/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
-
-	/** CompositeDiagram :: CONTEXT_LINK */
-	public static final IHintedType CONTEXT_LINK = (IHintedType) getElementType("org.eclipse.papyrus.sysml.diagram.parametric.Constraint_ContextEdge"); //$NON-NLS-1$
-
-	/** CompositeDiagram :: CONContextLinkAppliedStereotype */
-	public static final IHintedType CONTEXT_LINK_APPLIED_STEREOTYPE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.diagram.parametric.Constraint_KeywordLabel"); //$NON-NLS-1$
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/GraphicalTypeRegistry.java
deleted file mode 100644
index 186fd31af2c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/GraphicalTypeRegistry.java
+++ /dev/null
@@ -1,201 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-/**
- * <pre>
- * This class provides graphical type id (used as View type) for
- * domain element according to their actual or expected graphical
- * container type.
- * </pre>
- */
-public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
-
-	/** A Set containing all known node graphical types */
-	protected Set<String> knownNodes = new HashSet<String>();
-
-	/** A Set containing all known edge graphical types */
-	protected Set<String> knownEdges = new HashSet<String>();
-
-	/** Default constructor */
-	public GraphicalTypeRegistry() {
-
-		// Fill known edges set
-		knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint());
-		knownEdges.add(ElementTypes.CONTEXT_LINK.getSemanticHint());
-		knownEdges.add(ElementTypes.CONTEXT_LINK_APPLIED_STEREOTYPE.getSemanticHint());
-
-		// Fill known nodes set (primary nodes)
-		knownNodes.add(UMLElementTypes.CONSTRAINT.getSemanticHint());
-		knownNodes.add(UMLElementTypes.COMMENT.getSemanticHint());
-
-		knownNodes.add(ElementTypes.CONSTRAINT.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT.getSemanticHint());
-		knownNodes.add(ElementTypes.CONSTRAINT_CN.getSemanticHint());
-
-		// Fill known nodes set (child label nodes)
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(EObject domainElement) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if (domainElement == null) {
-			return UNDEFINED_TYPE;
-		}
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(IElementType elementType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getEdgeGraphicalType(semanticHint);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getEdgeGraphicalType(String proposedType) {
-		if (isKnownEdgeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if ((containerType == null) || (domainElement == null)) {
-			return UNDEFINED_TYPE;
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
-				graphicalType = ElementTypes.COMMENT.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-		}
-
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getNodeGraphicalType(semanticHint, containerType);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getNodeGraphicalType(String proposedType, String containerType) {
-		if ((UMLElementTypes.COMMENT.getSemanticHint().equals(proposedType))) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.COMMENT.getSemanticHint();
-			}
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-			return UNDEFINED_TYPE;
-		}
-
-		if (UMLElementTypes.CONSTRAINT.getSemanticHint().equals(proposedType)) {
-
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				return ElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerType)) {
-				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerType)) {
-				return ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-
-			return UNDEFINED_TYPE;
-		}
-		if (isKnownNodeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isKnownEdgeType(String type) {
-		return knownEdges.contains(type);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isKnownNodeType(String type) {
-		return knownNodes.contains(type);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/IGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/IGraphicalTypeRegistry.java
deleted file mode 100644
index a3f92e3f1e4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/IGraphicalTypeRegistry.java
+++ /dev/null
@@ -1,110 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * This interface provides an API for accessing the local graphical type registry.
- * This registry provides a graphical type for existing model elements.
- */
-public interface IGraphicalTypeRegistry {
-
-	/** Constant for undefined graphical type */
-	public static final String UNDEFINED_TYPE = "undefined_type";
-
-	/**
-	 * Get a valid edge graphical type for the domain element.
-	 *
-	 * @param domainElement
-	 *            the domain element.
-	 * @return the domain element graphical type.
-	 */
-	public String getEdgeGraphicalType(EObject domainElement);
-
-	/**
-	 * Get a valid edge graphical type for the element type.
-	 *
-	 * @param elementType
-	 *            the element type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	public String getEdgeGraphicalType(IElementType elementType);
-
-	/**
-	 * Get a valid edge graphical type for the proposed type.
-	 *
-	 * @param proposedType
-	 *            the proposed type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	public String getEdgeGraphicalType(String proposedType);
-
-	/**
-	 * Get a valid node graphical type for the domain element.
-	 *
-	 * @param domainElement
-	 *            the domain element.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	public String getNodeGraphicalType(EObject domainElement, String containerType);
-
-	/**
-	 * Get a valid node graphical type for the element type.
-	 *
-	 * @param elementType
-	 *            the element type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	public String getNodeGraphicalType(IElementType elementType, String containerType);
-
-	/**
-	 * Get a valid node graphical type for the proposed type.
-	 *
-	 * @param proposedType
-	 *            the proposed type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	public String getNodeGraphicalType(String proposedType, String containerType);
-
-	/**
-	 * Test if the type is a known edge graphical type in this diagram
-	 *
-	 * @param type
-	 *            the type to test
-	 * @return true if the type is known
-	 */
-	public boolean isKnownEdgeType(String type);
-
-	/**
-	 * Test if the type is a known node graphical type in this diagram
-	 *
-	 * @param type
-	 *            the type to test
-	 * @return true if the type is known
-	 */
-	public boolean isKnownNodeType(String type);
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramEditPartProvider.java
deleted file mode 100644
index 05a7d55e7eb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramEditPartProvider.java
+++ /dev/null
@@ -1,84 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLEditPartProvider;
-
-public class InheritedCompositeDiagramEditPartProvider extends UMLEditPartProvider {
-
-	@Override
-	protected IGraphicalEditPart createEditPart(View view) {
-		String visualID = UMLVisualIDRegistry.getVisualID(view);
-		if (ContextLinkEditPart.VISUAL_ID.equals(visualID)) {
-			return new ContextLinkEditPart(view);
-		}
-		if (ContextLinkAppliedStereotypeEditPart.VISUAL_ID.equals(visualID)) {
-			return new ContextLinkAppliedStereotypeEditPart(view);
-		}
-		return super.createEditPart(view);
-	}
-
-	@Override
-	public synchronized boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is a Parametric Diagram
-			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
-				return false;
-			}
-
-			// Test supported inherited types
-			EObject eobject = view.getElement();
-
-			/** Nodes (and ChildLabelNodes) *********** */
-			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
-				return true;
-			}
-
-			// Additional test needed here to decide whether to support Feature type links.
-			// As feature type link are not related to a MetaClass from the domain model
-			// they are not already handled by previous tests.
-			// Also concerns NotationType.
-			String hint = view.getType();
-
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if (ElementTypes.CONTEXT_LINK.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			if (ElementTypes.CONTEXT_LINK_APPLIED_STEREOTYPE.getSemanticHint().equals(hint)) {
-				return true;
-			}
-
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
deleted file mode 100644
index 3098ae11653..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/InheritedCompositeDiagramViewProvider.java
+++ /dev/null
@@ -1,217 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-
-public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Edge createdEdge = null;
-
-		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-		if (elementType != null) {
-			if (elementType == ElementTypes.CONTEXT_LINK) {
-				org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider classDiagramUMLProvider = new org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider();
-				createdEdge = classDiagramUMLProvider.createConstraint_ContextEdge(containerView, index, persisted, preferencesHint);
-			}
-			else {
-				createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-			}
-		}
-
-		if (createdEdge == null) {
-			Activator.log.error(new Exception("Could not create Edge."));
-		}
-
-		return createdEdge;
-	}
-
-	@Override
-	protected boolean provides(CreateViewForKindOperation op) {
-		// Never use this method (often incorrectly implemented due to GMF Tooling choices).
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		throw new UnsupportedOperationException("Should never be called by the " + diagramType + " diagram.");
-	}
-
-	@Override
-	protected boolean provides(CreateEdgeViewOperation op) {
-
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-
-		// This provider is registered for InternalBlock Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			return true;
-		}
-		if (elementType == ElementTypes.CONTEXT_LINK) {
-			return true;
-		}
-
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected boolean provides(CreateNodeViewOperation op) {
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		// Get the type of the container
-		String containerGraphicalType = op.getContainerView().getType();
-
-		// This provider is registered for InternalBlock Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the ElementType and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-
-		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
-		if (elementType == UMLElementTypes.CONSTRAINT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == UMLElementTypes.COMMENT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_STRUCTURE_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-			} else {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
-			}
-
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-
-		// Use the GraphicalTypeRegistry to find the expected type for a domain element
-		// Get the type of the container
-		String containerGraphicalType = containerView.getType();
-
-		// Get the type of the domain element
-		EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
-
-		if (semanticHint != null) {
-			// Look for a possible graphicalType replacement
-			String graphicalType = registry.getNodeGraphicalType(semanticHint, containerGraphicalType);
-			return super.createNode(new SemanticAdapter(domainElement, null), containerView, graphicalType, index, persisted, preferencesHint);
-		}
-
-		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-
-		// Create the expected node
-		if (!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
-			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-		}
-
-		Activator.log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPartProvider.java
deleted file mode 100644
index 3666d0c192f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPartProvider.java
+++ /dev/null
@@ -1,50 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.ParametricDiagramEditPart;
-
-public class ParametricDiagramEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is Parametric Diagram
-			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-			return ParametricDiagramEditPart.class;
-		}
-
-		Activator.log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPolicyProvider.java
deleted file mode 100644
index a483e666967..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramEditPolicyProvider.java
+++ /dev/null
@@ -1,63 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-
-public class ParametricDiagramEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
-
-	public boolean provides(IOperation operation) {
-
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
-		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
-			return false;
-		}
-		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
-		String diagramType = gep.getNotationView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart) {
-			return true;
-		}
-		if (gep instanceof PortAffixedNodeEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintEditPartCN) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public void createEditPolicies(EditPart editPart) {
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramViewProvider.java
deleted file mode 100644
index bb6d60896be..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricDiagramViewProvider.java
+++ /dev/null
@@ -1,43 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
-import org.eclipse.papyrus.sysml.diagram.parametric.factory.ParametricDiagramViewFactory;
-
-public class ParametricDiagramViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
-			return ParametricDiagramViewFactory.class;
-		}
-
-		Activator.log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/utils/ParametricDiagramGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/utils/ParametricDiagramGraphicalTypes.java
deleted file mode 100644
index a49f14b0078..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/utils/ParametricDiagramGraphicalTypes.java
+++ /dev/null
@@ -1,22 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.utils;
-
-public class ParametricDiagramGraphicalTypes {
-
-	/** ********************************************************* */
-	/** Diagram custom graphical types id *********************** */
-	/** ********************************************************* */
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/Activator.java
deleted file mode 100644
index 761cc1f12bc..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/Activator.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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.sysml.diagram.parametric.preferences.CustomPreferenceInitializer;
-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.sysml.diagram.parametric";
-
-	/** The plug-in shared instance */
-	private static Activator plugin;
-
-	/** The logging helper */
-	public static LogHelper log;
-
-	/** The plug-in Preference store */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(PLUGIN_ID);
-
-	/** Default constructor */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the login helper
-		log = new LogHelper(plugin);
-
-		// register the preference store
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-
-		// Preferences initialization
-		CustomPreferenceInitializer diagramPreferenceInitializer = new CustomPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (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 getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 *
-	 * @return Shared Preference Store.
-	 */
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java
deleted file mode 100644
index 7d051b7ea9c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java
+++ /dev/null
@@ -1,32 +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:
- *		chevrel.regis@gmail.com
- *		CEA LIST - Initial API and implementation
- *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.ui.extension.commands.PerspectiveContextDependence;
-
-/**
- * ParametricDiagramCondition to set conditions for the diagram creation
- */
-public class ParametricDiagramCondition extends PerspectiveContextDependence {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean create(EObject selectedElement) {
-		return false;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorCreateCommand.java
deleted file mode 100644
index 80089b8bf55..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorCreateCommand.java
+++ /dev/null
@@ -1,155 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.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.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.sysml.diagram.common.utils.ConstraintBlockHelper;
-import org.eclipse.papyrus.uml.service.types.utils.ConnectorUtils;
-import org.eclipse.papyrus.uml.service.types.utils.RequestParameterUtils;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/**
- *
- */
-public class CustomBindingConnectorCreateCommand extends EditElementCommand {
-
-	private final EObject source;
-	private final EObject target;
-
-	public CustomBindingConnectorCreateCommand(final CreateRelationshipRequest request) {
-		super(request.getLabel(), null, request);
-		this.source = request.getSource();
-		this.target = request.getTarget();
-	}
-
-	/**
-	 * A BindingConnector could be created in Parametric only if at least one end is a ConstraintParameter.
-	 * Also check Block.isEncapsulated (could not cross a Block which is encapsulted)
-	 *
-	 * @return
-	 */
-	@Override
-	public boolean canExecute() {
-		if (this.source == null) {
-			return false;
-		}
-		if (this.target == null) {
-			return true;
-		}
-		if (this.source == this.target) {
-			return false;
-		}
-		if (this.source != null && this.target != null) {
-
-			boolean hasEncapsulationViolation = !checkEncapsulationCrossing();
-
-			return hasEncapsulationViolation ? false :
-					// one of the end must be a ConstraintParameter
-					ConstraintBlockHelper.isConstraintParameter((Element) source, RequestParameterUtils.getSourceView(getRequest()))
-							|| ConstraintBlockHelper.isConstraintParameter((Element) target, RequestParameterUtils.getTargetView(getRequest()));
-		}
-		return false;
-	}
-
-	/**
-	 * Check that BindingConnector do not cross a "Block.isEncapsulated" Part/Reference/ConstraintProperty
-	 *
-	 * @return true no encapsulation problem, false else
-	 */
-	private boolean checkEncapsulationCrossing() {
-		org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils util = new org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils();
-
-		// source end - get the nestedPath
-		List<Property> nestedPropertyPath = util.getNestedPropertyPath(RequestParameterUtils.getSourceView(getRequest()), RequestParameterUtils.getTargetView(getRequest()));
-		// check for each level of path if crossing an isEncapsultaed Block
-		for (Property property : nestedPropertyPath) {
-			Type type = property.getType();
-			Block stereotypeApplication = UMLUtil.getStereotypeApplication(type, Block.class);
-			if (stereotypeApplication != null) {
-				if (stereotypeApplication.isEncapsulated()) {
-					return false;
-				}
-			}
-		}
-
-		// target end - get the nestedPath
-		nestedPropertyPath = util.getNestedPropertyPath(RequestParameterUtils.getTargetView(getRequest()), RequestParameterUtils.getSourceView(getRequest()));
-		// check for each level of path if crossing an isEncapsultaed Block
-		for (Property property : nestedPropertyPath) {
-			Type type = property.getType();
-			Block stereotypeApplication = UMLUtil.getStereotypeApplication(type, Block.class);
-			if (stereotypeApplication != null) {
-				if (stereotypeApplication.isEncapsulated()) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Create the connector, affect its owner, calculate nestedPath
-	 *
-	 * @param monitor
-	 * @param info
-	 * @return CommandResult contains the created Connector
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {
-
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-
-		// Create the Connector and its ConnectorEnd. Correct container are set and paths are set in case of <<NestedConnectorEnd>>.
-		StructuredClassifier deducedContainer = new ConnectorUtils().deduceContainer(RequestParameterUtils.getSourceView(getRequest()), RequestParameterUtils.getTargetView(getRequest()));
-		((CreateRelationshipRequest) getRequest()).setContainer(deducedContainer);
-		IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(deducedContainer);
-		ICommand editCommand = commandProvider.getEditCommand(getRequest());
-
-		if (editCommand.canExecute()) {
-			editCommand.execute(monitor, info);
-			Object newObject = editCommand.getCommandResult().getReturnValue();
-
-			if (newObject instanceof Connector) {
-				Connector connector = (Connector) newObject;
-				// Apply the <<BindingConnector>> stereotype
-				StereotypeApplicationHelper.INSTANCE.applyStereotype(connector, BlocksPackage.eINSTANCE.getBindingConnector());
-			}
-
-			return CommandResult.newOKCommandResult(newObject);
-		}
-		return CommandResult.newErrorCommandResult("Invalid arguments in create link command");
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorReorientCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorReorientCommand.java
deleted file mode 100644
index 86c945d3427..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomBindingConnectorReorientCommand.java
+++ /dev/null
@@ -1,265 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.commands;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-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.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
-import org.eclipse.papyrus.sysml.diagram.common.utils.ConstraintBlockHelper;
-import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;
-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
-import org.eclipse.papyrus.uml.service.types.command.ConnectorReorientCommand;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-public class CustomBindingConnectorReorientCommand extends ConnectorReorientCommand {
-
-	private final EObject source;
-
-	private final EObject target;
-
-	public CustomBindingConnectorReorientCommand(ReorientReferenceRelationshipRequestWithGraphical request) {
-		super(request);
-		source = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getNewRelationshipEnd() : request.getReferenceOwner();
-		target = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getNewRelationshipEnd();
-	}
-
-
-	/**
-	 * A BindingConnector could be reoriented in Parametric only if at least one end is a ConstraintParameter.
-	 * Also check Block.isEncapsulated (could not cross a Block which is encapsulted)
-	 *
-	 * @return
-	 */
-	@Override
-	public boolean canExecute() {
-
-		if (this.source == this.target) {
-			return false;
-		}
-
-		Object connectorView = getRequest().getParameter(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);
-		if (connectorView instanceof org.eclipse.gmf.runtime.notation.Connector) {
-			View sourceView = getSourceView();
-			View targetView = getTargetView();
-
-			if (this.source != null && this.target != null) {
-				boolean hasEncapsulationViolation = !checkEncapsulationCrossing();
-
-				return hasEncapsulationViolation ? false :
-						// one of the end must be a ConstraintParameter
-						ConstraintBlockHelper.isConstraintParameter((Element) source, sourceView)
-								|| ConstraintBlockHelper.isConstraintParameter((Element) target, targetView);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Check that BindingConnector do not cross a "Block.isEncapsulated" Part/Reference/ConstraintProperty
-	 *
-	 * @return true no encapsulation problem, false else
-	 */
-	private boolean checkEncapsulationCrossing() {
-		org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils util = new org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils();
-		// source end - get the nestedPath
-		List<Property> nestedPropertyPath = util.getNestedPropertyPath(getSourceView(), getTargetView());
-		// check for each level of path if crossing an isEncapsultaed Block
-		for (Property property : nestedPropertyPath) {
-			Type type = property.getType();
-			Block stereotypeApplication = UMLUtil.getStereotypeApplication(type, Block.class);
-			if (stereotypeApplication != null) {
-				if (stereotypeApplication.isEncapsulated()) {
-					return false;
-				}
-			}
-		}
-
-		// target end - get the nestedPath
-		nestedPropertyPath = util.getNestedPropertyPath(getTargetView(), getSourceView());
-		// check for each level of path if crossing an isEncapsultaed Block
-		for (Property property : nestedPropertyPath) {
-			Type type = property.getType();
-			Block stereotypeApplication = UMLUtil.getStereotypeApplication(type, Block.class);
-			if (stereotypeApplication != null) {
-				if (stereotypeApplication.isEncapsulated()) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	@Override
-	/**
-	 * Get the link to re-orient.
-	 *
-	 * @return the edited {@link Connector}
-	 */
-	protected Connector getLink() {
-		return (Connector) (getConnectorView()).getElement();
-	}
-
-	@Override
-	protected void replaceOwner(Connector connector, StructuredClassifier newOwner) {
-
-		View sourceView = getSourceView();
-		View targetView = getTargetView();
-
-		StructuredClassifier deducedContainer = new ConnectorUtils().deduceContainer(sourceView, targetView);
-		if (connector.getOwner() != deducedContainer) {
-			super.replaceOwner(connector, deducedContainer);
-		}
-	}
-
-	private org.eclipse.gmf.runtime.notation.Connector getConnectorView() {
-		return (org.eclipse.gmf.runtime.notation.Connector) getRequest().getParameter(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);
-	}
-
-	private View getSourceView() {
-		return reorientDirection == ReorientRequest.REORIENT_SOURCE ?
-				(View) ((ReorientReferenceRelationshipRequestWithGraphical) getRequest()).getSourceEditPart().getModel() :
-				getConnectorView().getSource();
-	}
-
-	private View getTargetView() {
-		return reorientDirection == ReorientRequest.REORIENT_TARGET ?
-				(View) ((ReorientReferenceRelationshipRequestWithGraphical) getRequest()).getTargetEditPart().getModel() :
-				getConnectorView().getTarget();
-
-	}
-
-	@Override
-	protected Property findNewOppositePartWithPort() {
-		// no Port allowed in Parametric
-		return null;
-	}
-
-	@Override
-	protected Property findNewPartWithPort() {
-		// no Port allowed in Parametric
-		return null;
-	}
-
-	/**
-	 * Reorient connector - recalculate nestedPath - remove connector deprecated representations (all diagrams)
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		CommandResult result = super.doExecuteWithResult(monitor, info);
-
-		// apply or update NestedConnectorEnd stereotype and its PropertyPath if needed
-		Connector connector = getLink();
-		if (connector.getEnds().size() == 2) {
-			updateNestedPropertyPath(connector.getEnds().get(0), getSourceView(), getTargetView());
-			updateNestedPropertyPath(connector.getEnds().get(1), getTargetView(), getSourceView());
-		}
-
-		Set<View> memberViewsToDestroy = getMemberViewsToDestroy(connector);
-		// Suppress Connector representation which are not coherant with the new ConnectorEnd
-		for (View view : memberViewsToDestroy) {
-			// exclude reoriented connector representation
-			if (view != getConnectorView()) {
-				// Check Connector View ends matches with semantic ConnectorEnds
-				View sourceNode = ((org.eclipse.gmf.runtime.notation.Connector) view).getSource();
-				View targetNode = ((org.eclipse.gmf.runtime.notation.Connector) view).getTarget();
-
-				EObject sourceElement = sourceNode.getElement();
-				EObject targetElement = targetNode.getElement();
-
-				EList<ConnectorEnd> ends = connector.getEnds();
-				boolean isSameEnds = true;
-				for (ConnectorEnd connectorEnd : ends) {
-					if (connectorEnd.getRole() != sourceElement && connectorEnd.getRole() != targetElement) {
-						isSameEnds = false;
-						break;
-					}
-				}
-
-				// if no matching between graphical and semantic, we destroy the representation
-				if (!isSameEnds) {
-					final DestroyElementRequest destroyRequest = new DestroyElementRequest(getRequest().getEditingDomain(), view, false);
-					final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(view);
-					ICommand editCommand = commandProvider.getEditCommand(destroyRequest);
-					editCommand.execute(monitor, info);
-				}
-			}
-		}
-
-		return result;
-	}
-
-
-	protected Set<View> getMemberViewsToDestroy(final Connector connector) {
-		Set<View> viewsToDestroy = new HashSet<View>();
-
-		// Find Views in Composite Structure Diagram that are referencing current member
-		Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(connector, null).iterator();
-		while (viewIt.hasNext()) {
-			View view = viewIt.next();
-			viewsToDestroy.add(view);
-		}
-
-		return viewsToDestroy;
-	}
-
-	private void updateNestedPropertyPath(ConnectorEnd connectorEnd, View sourceView, View targetView) {
-		ConnectorUtils utils = new ConnectorUtils();
-		List<Property> nestedPropertyPath = utils.getNestedPropertyPath(sourceView, targetView);
-		if (!nestedPropertyPath.isEmpty()) {
-			// Search for existing stereotype application
-			NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(connectorEnd, NestedConnectorEnd.class);
-			if (nestedConnectorEnd == null) {
-				// apply stereotype if no application found
-				nestedConnectorEnd = (NestedConnectorEnd) StereotypeApplicationHelper.INSTANCE.applyStereotype(connectorEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
-			}
-			// set new path
-			nestedConnectorEnd.getPropertyPath().clear();
-			nestedConnectorEnd.getPropertyPath().addAll(nestedPropertyPath);
-		}
-		else {
-			// remove all NestedConnectorEnd Stereotype applications
-			for (EObject stereotypeApplication : connectorEnd.getStereotypeApplications()) {
-				if (NestedConnectorEnd.class.isInstance(stereotypeApplication)) {
-					EcoreUtil.delete(stereotypeApplication, true);
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
deleted file mode 100644
index 4ec0ac24a7c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
+++ /dev/null
@@ -1,140 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.commands;

-

-import java.util.Collection;

-import java.util.List;

-

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

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

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

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

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.service.types.command.ConstraintConstrainedElementsCreateCommand;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.common.util.CacheAdapter;

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

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

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

-

-public class CustomParametricContextLinkCreateCommand extends

-		ConstraintConstrainedElementsCreateCommand {

-

-	public CustomParametricContextLinkCreateCommand(

-			CreateRelationshipRequest request) {

-		super(request);

-	}

-

-	/**

-	 * Can execute if :

-	 * - source is Constraint

-	 * - target is a Namespace or a Namespace typed property

-	 * - there is no context link already outgoing from the source Constraint

-	 */

-	@Override

-	public boolean canExecute() {

-		if (source == null && target == null) {

-			return false;

-		}

-		if (source != null && !(source instanceof Constraint)) {

-			return false;

-		}

-		if (target != null && !(target instanceof Namespace)) {

-			if (target instanceof Property) {

-				if (!(((Property) target).getType() instanceof Namespace)) {

-					// not a Part / Reference / ConstraintProperty => could not create context link

-					return false;

-				}

-			}

-			else {

-				// not a Property, not a Namespace => could not create context link

-				return false;

-			}

-		}

-		if (getSource() == null) {

-			return true; // link creation is in progress; source is not defined yet

-		}

-		View viewSource = findView(source);

-

-		// Only one context link per Constraint

-		if (viewSource != null && source instanceof Constraint) {

-			List<?> sourceConnections = ViewUtil.getSourceConnections(viewSource);

-			if (!sourceConnections.isEmpty()) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * Set the Constraint context and update Constraint name with new owner ownedRules if necessary

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

-		}

-		Namespace context = getTarget();

-		if (getSource() != null && context != null) {

-			getSource().setContext(context);

-			String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(Constraint.class.getSimpleName(), context.getOwnedRules(), getSource());

-			getSource().setName(defaultNameWithIncrementFromBase);

-			return CommandResult.newOKCommandResult();

-		}

-		else {

-			return CommandResult.newErrorCommandResult("Try to define Constraint context to a non Namespace element");

-		}

-	}

-

-	private View findView(EObject element) {

-		if (element == null) {

-			return null;

-		}

-		Collection<Setting> settings = CacheAdapter.getInstance().getNonNavigableInverseReferences(element);

-		for (Setting ref : settings) {

-			if (NotationPackage.eINSTANCE.getView_Element().equals(ref.getEStructuralFeature())) {

-				View view = (View) ref.getEObject();

-				if (view != null) {

-					return view;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Get the property Namespace in case of property typed by a Namespace

-	 */

-	@Override

-	protected Namespace getTarget() {

-		EObject targetNamespace;

-		if (target instanceof Property) {

-			targetNamespace = ((Property) target).getType();

-		}

-		else {

-			targetNamespace = target;

-		}

-		if (targetNamespace instanceof Namespace) {

-			return (Namespace) targetNamespace;

-		}

-		else {

-			return null;

-		}

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkReorientCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkReorientCommand.java
deleted file mode 100644
index 9be8d88e6c6..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkReorientCommand.java
+++ /dev/null
@@ -1,159 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.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.gef.EditPart;

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

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

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

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

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

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

-

-/**

- * A context link must have a Constraint as source and a Namespace as target

- *

- * @See ContextLinkReorientCommand

- *

- */

-public class CustomParametricContextLinkReorientCommand extends EditElementCommand {

-

-	private final int reorientDirection;

-

-	protected ReorientReferenceRelationshipRequestWithGraphical request;

-	protected EObject referenceOwner;

-	protected EObject oldSource;

-	protected EObject newSource;

-	protected EObject oldTarget;

-	protected EObject newTarget;

-

-	public CustomParametricContextLinkReorientCommand(

-			ReorientReferenceRelationshipRequestWithGraphical request) {

-		super(request.getLabel(), null, request);

-		this.request = request;

-		reorientDirection = request.getDirection();

-		referenceOwner = request.getReferenceOwner();

-		oldSource = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getOldRelationshipEnd() : request.getReferenceOwner();

-		newSource = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getNewRelationshipEnd() : request.getReferenceOwner();

-		oldTarget = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getOldRelationshipEnd();

-		newTarget = reorientDirection == ReorientRequest.REORIENT_SOURCE ? request.getReferenceOwner() : request.getNewRelationshipEnd();

-	}

-

-	@Override

-	public boolean canExecute() {

-		return getNewSource() instanceof Constraint && resolveNamespace(getNewTarget()) instanceof Namespace;

-	}

-

-	/**

-	 * Get the property Namespace in case of property typed by a Namespace

-	 */

-	protected Namespace resolveNamespace(Element element) {

-		if (element instanceof Namespace) {

-			return (Namespace) element;

-		}

-		if (element instanceof Property) {

-			Type type = ((Property) element).getType();

-			if (type instanceof Namespace) {

-				return (Namespace) type;

-			}

-		}

-		return null;

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		if (!canExecute()) {

-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-			return reorientSource();

-		}

-		if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-			return reorientTarget();

-		}

-		throw new IllegalStateException();

-	}

-

-	/**

-	 * Set a default container for old Constraint (diagram consistency).

-	 * Set the new context for new Constraint

-	 * Update new Constraint name with new owner ownedRules if necessary

-	 */

-	protected CommandResult reorientSource() {

-		EditPart sourceEditPart = request.getSourceEditPart();

-		Namespace nearestNamespace = getNearestNamespace(sourceEditPart);

-		getOldSource().setContext(nearestNamespace); // set a default container

-		Namespace context = resolveNamespace(getNewTarget());

-		// Check name

-		String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(Constraint.class.getSimpleName(), context.getOwnedRules(), getNewSource());

-		((Constraint) getNewSource()).setName(defaultNameWithIncrementFromBase);

-		// set the context

-		((Constraint) getNewSource()).setContext(resolveNamespace(getNewTarget()));

-

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	private Namespace getNearestNamespace(EditPart editPart) {

-		if (editPart != null) {

-			EObject semanticElement = ViewUtil.resolveSemanticElement((View) editPart.getModel());

-			if (semanticElement != null) {

-				Namespace resolvedNamespace = resolveNamespace((Element) semanticElement);

-				if (resolvedNamespace instanceof Namespace) {

-					return resolvedNamespace;

-				}

-				return getNearestNamespace(editPart.getParent());

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Set the new context for new Constraint

-	 * Update new Constraint name with new owner ownedRules if necessary

-	 */

-	protected CommandResult reorientTarget() {

-		Namespace context = resolveNamespace(getNewTarget());

-		// Check name

-		String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(Constraint.class.getSimpleName(), context.getOwnedRules(), getNewSource());

-		((Constraint) getNewSource()).setName(defaultNameWithIncrementFromBase);

-		// Set the context

-		((Constraint) getNewSource()).setContext(context);

-		return CommandResult.newOKCommandResult(referenceOwner);

-	}

-

-	protected Constraint getOldSource() {

-		return (Constraint) oldSource;

-	}

-

-	protected Element getNewSource() {

-		return (Element) newSource;

-	}

-

-	protected Element getOldTarget() {

-		return (Element) oldTarget;

-	}

-

-	protected Element getNewTarget() {

-		return (Element) newTarget;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/ReorientReferenceRelationshipRequestWithGraphical.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/ReorientReferenceRelationshipRequestWithGraphical.java
deleted file mode 100644
index 5bad23d08ad..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/ReorientReferenceRelationshipRequestWithGraphical.java
+++ /dev/null
@@ -1,51 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.commands;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-
-/**
- * This class extends "classical" ReorientReferenceRelationshipRequest with the source and the target editPart.
- * These EditPart are needed for algorithms based on graphics:
- * - determine if a property is a ConstraintParameter
- * - calculate nestedPath
- */
-public class ReorientReferenceRelationshipRequestWithGraphical extends
-		ReorientReferenceRelationshipRequest {
-
-	private EditPart sourceEditPart;
-	private EditPart targetEditPart;
-
-	public ReorientReferenceRelationshipRequestWithGraphical(
-			TransactionalEditingDomain editingDomain, EObject referenceOwner,
-			EObject newRelationshipEnd, EObject oldRelationshipEnd,
-			int direction, EditPart sourceEditPart, EditPart targetEditPart) {
-		super(editingDomain, referenceOwner, newRelationshipEnd, oldRelationshipEnd, direction);
-		this.sourceEditPart = sourceEditPart;
-		this.targetEditPart = targetEditPart;
-	}
-
-
-	public EditPart getSourceEditPart() {
-		return sourceEditPart;
-	}
-
-	public EditPart getTargetEditPart() {
-		return targetEditPart;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommand.java
deleted file mode 100644
index 87ff2fdcde7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommand.java
+++ /dev/null
@@ -1,72 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.commands.switchrepresentation;

-

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintNodeLabelEditPart;

-

-/**

- * This command allow to show/hide the Constraint expression of a ConstraintProperty

- */

-public class ShowHideConstraintExpressionCommand extends Command {

-

-	private final GraphicalEditPart editPartToSwitch;

-

-	public GraphicalEditPart getEditPartToSwitch() {

-		return editPartToSwitch;

-	}

-

-	public ShowHideConstraintExpressionCommand(final GraphicalEditPart editPartToRefresh) {

-		this.editPartToSwitch = editPartToRefresh;

-	}

-

-	@Override

-	public void execute() {

-		if (this.getEditPartToSwitch() instanceof CustomConstraintBlockPropertyCompositeEditPart) {

-			CustomConstraintBlockPropertyCompositeEditPart constraintBlockPropertyCompositeEditPart = (CustomConstraintBlockPropertyCompositeEditPart) this.getEditPartToSwitch();

-			// get the Constraint expression graphical label

-			WrappingLabel constraintLabel = constraintBlockPropertyCompositeEditPart.getPrimaryShape().getConstraintLabel();

-			ConstraintNodeLabelEditPart constraintNodeLabelEditPart = null;

-			// get the EditPart which contains this label

-			for (Object currentEditPart : constraintBlockPropertyCompositeEditPart.getChildren()) {

-				if (currentEditPart instanceof ConstraintNodeLabelEditPart) {

-					if (((ConstraintNodeLabelEditPart) currentEditPart).getFigure() == constraintLabel) {

-						constraintNodeLabelEditPart = (ConstraintNodeLabelEditPart) currentEditPart;

-					}

-				}

-			}

-

-			// switch visibility of this EditPart

-			if (constraintNodeLabelEditPart != null) {

-				View constraintLabelView = (View) constraintNodeLabelEditPart.getModel();

-				constraintLabelView.setVisible(!constraintLabelView.isVisible());

-			}

-		}

-	}

-

-	@Override

-	public void undo() {

-		execute(); // switch

-	}

-

-	@Override

-	public void redo() {

-		execute(); // switch

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommandHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommandHandler.java
deleted file mode 100644
index 1bf8802b52a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/ShowHideConstraintExpressionCommandHandler.java
+++ /dev/null
@@ -1,37 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.commands.switchrepresentation;

-

-import java.util.List;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.handlers.GraphicalCommandHandler;

-

-public class ShowHideConstraintExpressionCommandHandler extends GraphicalCommandHandler {

-

-	@Override

-	protected Command getCommand() {

-		CompoundCommand command = new CompoundCommand("Show/Hide ConstraintProperty Constraint Expression");

-		final List<IGraphicalEditPart> selectedElements = getSelectedElements();

-		for (final IGraphicalEditPart selectedElement : selectedElements) {

-			if (selectedElement instanceof CustomConstraintBlockPropertyCompositeEditPart) {

-				command.add(new ShowHideConstraintExpressionCommand(selectedElement));

-			}

-		}

-		return command;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommand.java
deleted file mode 100644
index 3eb6b985581..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommand.java
+++ /dev/null
@@ -1,138 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.commands.switchrepresentation;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.StringValueStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockPropertyCompositeEditPart;

-import org.eclipse.papyrus.sysml.diagram.common.figure.ConstraintBlockPropertyCompositeFigure;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;

-

-/**

- * This command allow to switch ConstraintProperty representation to rounded corner one to square one with structure compartment

- */

-public class SwitchConstraintPropertyRepresentationCommand extends Command {

-

-	private final GraphicalEditPart editPartToSwitch;

-

-	public SwitchConstraintPropertyRepresentationCommand(final GraphicalEditPart editPartToRefresh) {

-		this.editPartToSwitch = editPartToRefresh;

-	}

-

-	public GraphicalEditPart getEditPartToSwitch() {

-		return this.editPartToSwitch;

-	}

-

-

-	@Override

-	public void execute() {

-		if (this.getEditPartToSwitch() instanceof CustomConstraintBlockPropertyCompositeEditPart) {

-			CustomConstraintBlockPropertyCompositeEditPart constraintBlockPropertyCompositeEditPart = (CustomConstraintBlockPropertyCompositeEditPart) this.getEditPartToSwitch();

-			ConstraintBlockPropertyCompositeFigure figure = constraintBlockPropertyCompositeEditPart.getPrimaryShape();

-			if (figure instanceof ConstraintBlockPropertyCompositeFigure) {

-				if (figure.getCorner() != 0) {

-					switchToSquareRepresentationWithStructure(constraintBlockPropertyCompositeEditPart, figure);

-				}

-				else {

-					switchToRoundedRepresentationWithoutStructure(constraintBlockPropertyCompositeEditPart, figure);

-				}

-			}

-		}

-	}

-

-	@SuppressWarnings("unchecked")

-	private void switchToSquareRepresentationWithStructure(CustomConstraintBlockPropertyCompositeEditPart editPart, IFigure figure) {

-

-		// Set corner as square

-		int newCorner = 0;

-		((ConstraintBlockPropertyCompositeFigure) figure).setCorner(newCorner);

-

-		// add structure compartment (create if does not exist, set visible if exist)

-		View structureCompartment = editPart.getChildViewBySemanticHint(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);

-		if (structureCompartment != null) {

-			structureCompartment.setVisible(true);

-		}

-		else {

-			structureCompartment = ViewService.createNode((View) editPart.getModel(), SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID, new PreferencesHint("org.eclipse.papyrus.sysml.diagram.parametric"));

-			if (structureCompartment != null) {

-				structureCompartment.setElement(editPart.resolveSemanticElement());

-			}

-		}

-

-		// add the << constraint >> tag

-		editPart.getPrimaryShape().setTagLabel(String.valueOf("\u00AB") + "constraint" + String.valueOf("\u00BB"));

-

-		// set the style to persist representation

-		StringValueStyle style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

-		if (style == null) {

-			((View) editPart.getModel()).getStyles().add(NotationFactory.eINSTANCE.createStringValueStyle());

-		}

-		style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

-		style.setName(ConstraintBlockPropertyCompositeEditPart.REPRESENTATION_MODE_STYLE);

-		style.setStringValue(ConstraintBlockPropertyCompositeEditPart.SQUARE_REPRESENTATION_WITH_STRUCTURE);

-

-		// set the default style for new elements

-		ConstraintBlockPropertyCompositeEditPart.setLastRepresentation(ConstraintBlockPropertyCompositeEditPart.SQUARE_REPRESENTATION_WITH_STRUCTURE);

-		editPart.setCornerLocators(newCorner);

-	}

-

-	@SuppressWarnings("unchecked")

-	private void switchToRoundedRepresentationWithoutStructure(CustomConstraintBlockPropertyCompositeEditPart editPart, IFigure figure) {

-		// rounded corner

-		int newCorner = 50;

-		((ConstraintBlockPropertyCompositeFigure) figure).setCorner(newCorner);

-

-

-		// hide structure compartment if exist

-		View structureCompartmentFigure = editPart.getChildViewBySemanticHint(SysMLGraphicalTypes.COMPARTMENT_SYSML_BLOCKPROPERTY_STRUCTURE_ID);

-		if (structureCompartmentFigure != null) {

-			structureCompartmentFigure.setVisible(false);

-		}

-

-		// remove the << constraint >> tag

-		editPart.getPrimaryShape().setTagLabel("");

-

-		// set the style to persist representation

-		StringValueStyle style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

-		if (style == null) {

-			((View) editPart.getModel()).getStyles().add(NotationFactory.eINSTANCE.createStringValueStyle());

-		}

-		style = (StringValueStyle) ((View) editPart.getModel()).getStyle(NotationPackage.eINSTANCE.getStringValueStyle());

-		style.setName(ConstraintBlockPropertyCompositeEditPart.REPRESENTATION_MODE_STYLE);

-		style.setStringValue(ConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);

-

-		// set the default style for new elements

-		ConstraintBlockPropertyCompositeEditPart.setLastRepresentation(ConstraintBlockPropertyCompositeEditPart.ROUNDED_REPRESENTATION);

-		editPart.setCornerLocators(newCorner);

-	}

-

-	@Override

-	public void undo() {

-		execute(); // switch

-	}

-

-	@Override

-	public void redo() {

-		execute(); // switch

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommandHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommandHandler.java
deleted file mode 100644
index 68f12cea669..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/switchrepresentation/SwitchConstraintPropertyRepresentationCommandHandler.java
+++ /dev/null
@@ -1,42 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.commands.switchrepresentation;

-

-import java.util.List;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;

-import org.eclipse.papyrus.uml.diagram.common.handlers.GraphicalCommandHandler;

-

-public class SwitchConstraintPropertyRepresentationCommandHandler extends GraphicalCommandHandler {

-

-	@Override

-	protected Command getCommand() {

-		CompoundCommand command = new CompoundCommand("Switch ConstraintProperty Representation");

-		final List<IGraphicalEditPart> selectedElements = getSelectedElements();

-		for (final IGraphicalEditPart selectedElement : selectedElements) {

-			if (selectedElement instanceof CustomConstraintBlockPropertyCompositeEditPart) {

-				if (selectedElement.getParent() instanceof GraphicalEditPart) {

-					command.add(new SwitchConstraintPropertyRepresentationCommand(selectedElement));

-				}

-			}

-		}

-		return command;

-	}

-

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockCompositeEditPartTN.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockCompositeEditPartTN.java
deleted file mode 100644
index 05e26dcca13..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockCompositeEditPartTN.java
+++ /dev/null
@@ -1,153 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.part;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockLabelNameEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.StructureCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.figures.ParametricDiagramFrameFigure;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintParameterAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.FullInsidePortPositionLocator;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-
-public class CustomBlockCompositeEditPartTN extends AbstractElementEditPart {
-
-	public CustomBlockCompositeEditPartTN(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		super.createDefaultEditPolicies();
-	}
-
-	@Override
-	protected IFigure createNodeShape() {
-		return this.primaryShape = new ParametricDiagramFrameFigure();
-	}
-
-	@Override
-	public ParametricDiagramFrameFigure getPrimaryShape() {
-		return (ParametricDiagramFrameFigure) primaryShape;
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof BlockLabelNameEditPart) {
-			((BlockLabelNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof StructureCompartmentEditPart) {
-			IFigure pane = getPrimaryShape();
-			setupContentPane(pane);
-			pane.add(((StructureCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
-			IBorderItemLocator locator = new FullInsidePortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ConstraintParameterAffixedNodeEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof BlockLabelNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof StructureCompartmentEditPart) {
-			IFigure pane = getPrimaryShape();
-			setupContentPane(pane);
-			pane.remove(((StructureCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ConstraintParameterAffixedNodeEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ConstraintParameterAffixedNodeEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	@Override
-	public EditPart getPrimaryChildEditPart() {
-		return null;
-	}
-
-	@Override
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		return null;
-	}
-
-
-	@Override
-	protected void refreshVisuals() {
-		refreshStereotypes();
-		super.refreshVisuals();
-	}
-
-	protected void refreshStereotypes() {
-		Element resolveSemanticElement = (Element) this.resolveSemanticElement();
-		EList<EObject> stereotypeApplications = resolveSemanticElement.getStereotypeApplications();
-		List<EObject> additionnalStereotypeApplications = new ArrayList<EObject>();
-		for (EObject currentStereotypeApplication : stereotypeApplications) {
-			if (!(currentStereotypeApplication instanceof Block) && !(currentStereotypeApplication instanceof ConstraintBlock)) {
-				additionnalStereotypeApplications.add(currentStereotypeApplication);
-			}
-		}
-		StringBuilder stereotypeLabel = new StringBuilder();
-		String separator = ", ";
-		for (EObject eObject : additionnalStereotypeApplications) {
-			if (eObject != additionnalStereotypeApplications.get(0)) {
-				stereotypeLabel.append(separator);
-			}
-			stereotypeLabel.append(firstLetterToLowerCase(UMLUtil.getStereotype(eObject).getName()));
-		}
-		getPrimaryShape().setStereotypeLabel(stereotypeLabel.toString());
-	}
-
-	private String firstLetterToLowerCase(String string) {
-		String result = "";
-		if (string != null && string.length() != 0) {
-			String lowerCaseFirstLetter = string.substring(0, 1).toLowerCase();
-			result = lowerCaseFirstLetter + string.substring(1);
-		}
-		return result;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockLabelNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockLabelNameEditPart.java
deleted file mode 100644
index f53b3b6be81..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockLabelNameEditPart.java
+++ /dev/null
@@ -1,35 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *      Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.part;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockLabelNameEditPart;
-
-public class CustomBlockLabelNameEditPart extends BlockLabelNameEditPart {
-
-	public CustomBlockLabelNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * Respect the SysML diagram frame "par [Block] Block1 [DiagramName]"
-	 */
-	@Override
-	protected String getLabelText() {
-		String diagramName = LabelInternationalization.getInstance().getDiagramLabel(getDiagramView());
-		return super.getLabelText() + " [" + diagramName + "]";
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockPropertyCompositeEditPart.java
deleted file mode 100644
index fcb15dc092d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomBlockPropertyCompositeEditPart.java
+++ /dev/null
@@ -1,33 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomParametricSemanticPolicy;
-
-public class CustomBlockPropertyCompositeEditPart extends
-		BlockPropertyCompositeEditPart {
-
-	public CustomBlockPropertyCompositeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintBlockPropertyCompositeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintBlockPropertyCompositeEditPart.java
deleted file mode 100644
index e3da15a19a4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintBlockPropertyCompositeEditPart.java
+++ /dev/null
@@ -1,34 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.ConstraintBlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomParametricSemanticPolicy;
-
-public class CustomConstraintBlockPropertyCompositeEditPart extends
-		ConstraintBlockPropertyCompositeEditPart {
-
-	public CustomConstraintBlockPropertyCompositeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintParameterAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintParameterAffixedNodeEditPart.java
deleted file mode 100644
index 51b0360b413..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomConstraintParameterAffixedNodeEditPart.java
+++ /dev/null
@@ -1,32 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomParametricSemanticPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintParameterAffixedNodeEditPart;
-
-public class CustomConstraintParameterAffixedNodeEditPart extends ConstraintParameterAffixedNodeEditPart {
-
-	public CustomConstraintParameterAffixedNodeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomPortAffixedNodeEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomPortAffixedNodeEditPart.java
deleted file mode 100644
index 76155592691..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/edit/part/CustomPortAffixedNodeEditPart.java
+++ /dev/null
@@ -1,33 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomParametricSemanticPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-
-public class CustomPortAffixedNodeEditPart extends PortAffixedNodeEditPart {
-
-	public CustomPortAffixedNodeEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/CustomBlockPropertyCompositeFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/CustomBlockPropertyCompositeFigure.java
deleted file mode 100644
index 40d68f20e0b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/CustomBlockPropertyCompositeFigure.java
+++ /dev/null
@@ -1,38 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.figures;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.papyrus.sysml.diagram.common.figure.BlockPropertyCompositeFigure;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-
-public class CustomBlockPropertyCompositeFigure extends
-		BlockPropertyCompositeFigure {
-
-	@Override
-	protected void initTagLabel(String value) {
-		// do nothing: we don't want a two lines element (tag + name)
-	}
-
-	@Override
-	public PapyrusWrappingLabel getTaggedLabel() {
-		// return a mock Label
-		return new PapyrusWrappingLabel();
-	}
-
-	@Override
-	public void setNameLabelIcon(boolean displayNameLabelIcon) {
-		getNameLabel().setIcon(null);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/ParametricDiagramFrameFigure.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/ParametricDiagramFrameFigure.java
deleted file mode 100644
index b3ac246b4b3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/figures/ParametricDiagramFrameFigure.java
+++ /dev/null
@@ -1,20 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.figures;
-
-import org.eclipse.papyrus.sysml.diagram.common.figure.SysMLDiagramFrameFigure;
-
-public class ParametricDiagramFrameFigure extends SysMLDiagramFrameFigure {
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsAction.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsAction.java
deleted file mode 100644
index 605e687ac70..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsAction.java
+++ /dev/null
@@ -1,120 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.handler;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.sysml.diagram.common.utils.ConstraintBlockHelper;
-
-/**
- * This class allow to take into account the ConstraintParameter which are AffixedNode, not a "classical" property (Part/Reference/ConstraintProperty in structure).
- * Also filter non allowed elements from AffixedNode (Port).
- */
-public class ShowHideRelatedContentsAction extends org.eclipse.papyrus.sysml.diagram.internalblock.handler.ShowHideRelatedContentsAction {
-
-	/** Constructor. */
-	public ShowHideRelatedContentsAction() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.diagram.common.actions.AbstractShowHideAction#initAction()
-	 */
-	@Override
-	protected void initAction() {
-		super.initAction();
-
-		// Only ConstraintParameter are allowed => remove Ports (and subclasses) from AffixedNode selection
-		List<EditPartRepresentation> editPartRepresentationsToRemove = new ArrayList<EditPartRepresentation>();
-		Set<EObject> representedAffixedElements = new HashSet<EObject>();
-		AffixedChildrenEditPartRepresentation affixedNodeRepresentations = getAffixedNodeRepresentation(this.representations);
-
-		// Select only affixedNode which semantic element could be a ConstraintParameter
-		for (EditPartRepresentation currentRepresentation : affixedNodeRepresentations.getPossibleElement()) {
-			EObject semanticElement = currentRepresentation.getSemanticElement();
-			if (!(semanticElement == null || ConstraintBlockHelper.couldBeConstraintParameter(semanticElement, getOwnerSemanticElement()))) {
-				editPartRepresentationsToRemove.add(currentRepresentation);
-			}
-			else {
-				representedAffixedElements.add(semanticElement);
-			}
-		}
-		for (EditPartRepresentation editPartRepresentationToRemove : editPartRepresentationsToRemove) {
-			affixedNodeRepresentations.getPossibleElement().remove(editPartRepresentationToRemove);
-		}
-
-		// Remove from structure category elements which match as AffixedNode
-		editPartRepresentationsToRemove = new ArrayList<EditPartRepresentation>();
-		CompartmentEditPartRepresentation compartmentEditPartRepresentation = getCompartmentEditPartRepresentation(this.representations);
-		if (compartmentEditPartRepresentation != null) {
-			for (EditPartRepresentation currentRepresentation : compartmentEditPartRepresentation.getPossibleElement()) {
-				EObject semanticElement = currentRepresentation.getSemanticElement();
-				if (representedAffixedElements.contains(semanticElement)) {
-					editPartRepresentationsToRemove.add(currentRepresentation);
-				}
-			}
-			for (EditPartRepresentation editPartRepresentationToRemove : editPartRepresentationsToRemove) {
-				compartmentEditPartRepresentation.getPossibleElement().remove(editPartRepresentationToRemove);
-			}
-		}
-	}
-
-	private EObject getOwnerSemanticElement() {
-		return this.representations.size() >= 1 ? this.representations.get(0).getSemanticElement() : null;
-	}
-
-	/**
-	 *
-	 * @param editPartRepresentations
-	 * @return
-	 */
-	private AffixedChildrenEditPartRepresentation getAffixedNodeRepresentation(List<EditPartRepresentation> editPartRepresentations) {
-
-		for (EditPartRepresentation representation : editPartRepresentations) {
-			if (representation instanceof AffixedChildrenEditPartRepresentation) {
-				return (AffixedChildrenEditPartRepresentation) representation;
-			}
-			// recursive search
-			AffixedChildrenEditPartRepresentation affixedNodeRepresentation = getAffixedNodeRepresentation(representation.getPossibleElement());
-			if (affixedNodeRepresentation != null) {
-				return affixedNodeRepresentation;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 *
-	 * @param editPartRepresentations
-	 * @return
-	 */
-	private CompartmentEditPartRepresentation getCompartmentEditPartRepresentation(List<EditPartRepresentation> editPartRepresentations) {
-
-		for (EditPartRepresentation representation : editPartRepresentations) {
-			if (representation instanceof CompartmentEditPartRepresentation && !(representation instanceof AffixedChildrenEditPartRepresentation)) {
-				return (CompartmentEditPartRepresentation) representation;
-			}
-			// recursive search
-			CompartmentEditPartRepresentation compartmentEditPartRepresentation = getCompartmentEditPartRepresentation(representation.getPossibleElement());
-			if (compartmentEditPartRepresentation != null) {
-				return compartmentEditPartRepresentation;
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsHandler.java
deleted file mode 100644
index 5a37e5ff666..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/handler/ShowHideRelatedContentsHandler.java
+++ /dev/null
@@ -1,28 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.handler;
-
-import org.eclipse.papyrus.uml.diagram.common.actions.handlers.AbstractShowHideHandler;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;
-
-/**
- * Handler for the {@link ShowHideRelatedContentsAction}
- */
-public class ShowHideRelatedContentsHandler extends AbstractShowHideHandler {
-
-	/** Constructor. */
-	public ShowHideRelatedContentsHandler() {
-		super(new ShowHideRelatedContentsAction(), ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/migration/ParametricReconciler_1_2_0.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/migration/ParametricReconciler_1_2_0.java
deleted file mode 100644
index bcfbb443efe..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/migration/ParametricReconciler_1_2_0.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- * 	 Florian Noyrit  (CEA) florian.noyrit@cea.fr - Initial API and Implementation

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - reconciler to add floating label

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.migration;

-

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

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

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

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

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

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

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

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

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

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-

-/**

- * Parametric Diagram Reconciler from 1.1.0 to 1.2.0

- */

-public class ParametricReconciler_1_2_0 extends DiagramReconciler {

-

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		CompositeCommand cc = new CompositeCommand("Migrate diagram from 1.1.0 to 1.2.0");

-		cc.add(new ChangeVisualIDsCommand(diagram));

-		return cc;

-	}

-

-	protected class ChangeVisualIDsCommand extends AbstractCommand {

-

-		protected final Diagram diagram;

-

-		public ChangeVisualIDsCommand(Diagram diagram) {

-			super("Change the diagram's visual ids from 1.1.0 to 1.2.0");

-			this.diagram = diagram;

-		}

-

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			TreeIterator<EObject> allContentIterator = diagram.eAllContents();

-

-			while (allContentIterator.hasNext()) {

-				EObject eObject = allContentIterator.next();

-				if (eObject instanceof View) {

-					View view = (View) eObject;

-					view.setType(getNewVisualID(view.getType()));

-				}

-			}

-

-			return CommandResult.newOKCommandResult();

-		}

-

-		@Override

-		public boolean canUndo() {

-			return false;

-		}

-

-		@Override

-		public boolean canRedo() {

-			return false;

-		}

-

-		@Override

-		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			throw new ExecutionException("Should not be called, canRedo false");

-		}

-

-		@Override

-		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			throw new ExecutionException("Should not be called, canUndo false");

-		}

-	}

-

-	public static String getNewVisualID(String oldVisualID) {

-		switch (oldVisualID) {

-		case "8500":

-			return "Constraint_ContextEdge";

-		case "8501":

-			return "Constraint_KeywordLabel";

-		default:

-			return oldVisualID;

-		}

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/parser/ParametricFrameParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/parser/ParametricFrameParser.java
deleted file mode 100644
index 6cbbdb9ca27..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/parser/ParametricFrameParser.java
+++ /dev/null
@@ -1,47 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *		Trung-Truc Nguyen Bug 439935 
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.parser;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-public class ParametricFrameParser extends NamedElementLabelParser {
-
-	/**
-	 * /**
-	 * Respect the SysML diagram frame "diagramKind [modelElementType] modelElementName [diagramName]"
-	 * For the parametric diagram, the modelElementName might be a Block or a ConstraintBlock element
-	 * 
-	 * A parametric diagram frame, therefore, may be: 
-	 * 
-	 * par [Block] blockName [diagramName] OR
-	 * par [ConstraintBlock] constraintBlockName [diagramName]
-	 *
-	 */
-	@Override
-	public String getPrintString(IAdaptable element, int flags) {
-		String elementType = null;
-		if(element instanceof SemanticAdapter){
-			Object realObject = ((SemanticAdapter) element).getAdapter(EObject.class);
-			if (realObject instanceof org.eclipse.uml2.uml.Class) {
-				elementType = UMLUtil.getStereotypeApplication(((org.eclipse.uml2.uml.Class) realObject), ConstraintBlock.class) != null ? "ConstraintBlock" : "Block";
-			}
-		}
-		return "par [" + elementType + "] " + super.getPrintString(element, flags);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockCompositeDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockCompositeDropEditPolicy.java
deleted file mode 100644
index 8e553b2e2fc..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockCompositeDropEditPolicy.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Régis CHEVREL: chevrel.regis <at> gmail.com
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.TypeDropHelper;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.parametric.utils.ConstraintParameterDropHelper;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables
- * type modification, or creation of new Port and FlowPort by a drop on target.
- * </pre>
- */
-public class CustomBlockCompositeDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public CustomBlockCompositeDropEditPolicy() {
-		super();
-		registry = new CustomGraphicalTypeRegistry();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Set<String> getSpecificDropBehaviorTypes() {
-		Set<String> specificDropBehaviorTypes = super.getSpecificDropBehaviorTypes();
-
-		specificDropBehaviorTypes.add(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID);
-
-		return specificDropBehaviorTypes;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
-		if (UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID.equals(nodeType)) {
-			ConstraintParameterDropHelper constraintParameterDropHelper = new ConstraintParameterDropHelper(getEditingDomain());
-			Command commandParameterDropCommand = constraintParameterDropHelper.getDropConstraintParameter((Property) droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart) getHost());
-			return new CommandProxy(commandParameterDropCommand);
-		}
-
-		return super.getSpecificDropCommand(dropRequest, droppedEObject, nodeType, edgeType);
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to set the target element type with dropped object
-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {
-				commandChoice.add(dropAsSetType);
-			}
-
-			// 2. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyCompositeDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyCompositeDropEditPolicy.java
deleted file mode 100644
index ea8909b4942..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyCompositeDropEditPolicy.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Régis CHEVREL: chevrel.regis <at> gmail.com
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.TypeDropHelper;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.parametric.utils.ConstraintParameterDropHelper;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables
- * type modification, or creation of new Port and FlowPort by a drop on target.
- * </pre>
- */
-public class CustomBlockPropertyCompositeDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public CustomBlockPropertyCompositeDropEditPolicy() {
-		super();
-		registry = new CustomGraphicalTypeRegistry();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Set<String> getSpecificDropBehaviorTypes() {
-		Set<String> specificDropBehaviorTypes = super.getSpecificDropBehaviorTypes();
-
-		specificDropBehaviorTypes.add(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID);
-
-		return specificDropBehaviorTypes;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
-		if (UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID.equals(nodeType)) {
-			ConstraintParameterDropHelper constraintParameterDropHelper = new ConstraintParameterDropHelper(getEditingDomain());
-			Command commandParameterDropCommand = constraintParameterDropHelper.getDropConstraintParameterOnPart((Property) droppedEObject, dropRequest.getLocation().getCopy(), (GraphicalEditPart) getHost());
-			return new CommandProxy(commandParameterDropCommand);
-		}
-
-		return super.getSpecificDropCommand(dropRequest, droppedEObject, nodeType, edgeType);
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		TypeDropHelper helper = new TypeDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to set the target element type with dropped object
-			Command dropAsSetType = helper.getDropAsTypedElementType(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropAsSetType != null) && (dropAsSetType.canExecute())) {
-				commandChoice.add(dropAsSetType);
-			}
-
-			// 2. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
deleted file mode 100644
index 9692542fc86..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Régis CHEVREL: chevrel.regis <at> gmail.com
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.internalblock.utils.PartDropHelper;
-import org.eclipse.papyrus.sysml.diagram.parametric.utils.BlockDropHelper;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * <pre>
- * Customization of the DND edit policy for BlockPropertyComposite that enables
- * type modification, or creation of new Port and FlowPort by a drop on target.
- * </pre>
- */
-public class CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-
-		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Build command to drop BlockProperty
-			PartDropHelper partDropHelper = new PartDropHelper(getEditingDomain());
-			Command dropPartOnPart = partDropHelper.getDropPartOnPart(dropRequest, (GraphicalEditPart) getHost());
-			if ((dropPartOnPart != null) && (dropPartOnPart.canExecute())) {
-				commandChoice.add(dropPartOnPart);
-			}
-
-			// 2. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
-			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
-				commandChoice.add(dropAsTypedPart);
-			}
-
-			// 3. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
-				commandChoice.add(dropAsTypedReference);
-			}
-
-			// 4. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
-				commandChoice.add(dropAsTypedActorPart);
-			}
-
-			// 5. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
-				commandChoice.add(dropAsTypedValue);
-			}
-
-			// 6. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
-			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
-				commandChoice.add(dropAsTypedProperty);
-			}
-
-			// 7. Try to create a Property typed by the dropped object
-			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItemOnPart(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
-			if ((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
-				commandChoice.add(dropAsTypedConstraintProperty);
-			}
-
-			// 8. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected View getReferenceViewForConnectorEnd() {
-		return ViewUtil.getContainerView(super.getReferenceViewForConnectorEnd());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentSemanticEditPolicy.java
deleted file mode 100644
index a5481a1015c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomBlockPropertyStructureCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,65 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.policies;

-

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

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.BlockPropertyStructureCompartmentSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

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

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

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

-

-public class CustomBlockPropertyStructureCompartmentSemanticEditPolicy extends

-		BlockPropertyStructureCompartmentSemanticEditPolicy {

-

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-

-		View dropTargetView = ((IGraphicalEditPart) getHost()).getNotationView();

-		EObject eContainer = dropTargetView.eContainer();

-		Element parent = null;

-		if (eContainer != null && eContainer instanceof View) {

-			parent = (Element) ((View) eContainer).getElement();

-		}

-		if (parent instanceof Property) {

-			parent = ((Property) parent).getType();

-		}

-

-		if (parent != null) {

-			if (UMLUtil.getStereotypeApplication(parent, ConstraintBlock.class) != null) {

-				IElementType elementType = req.getElementType();

-				if (elementType != UMLElementTypes.CONSTRAINT

-						&& elementType != UMLElementTypes.COMMENT) {

-					// ConstraintBlock

-					if (elementType != SysMLElementTypes.CONSTRAINT_PROPERTY) {

-						// only ConstraintProperty can be dropped in structure

-						// compartment of a diagram owned by a ConstraintBlock

-						// (except common Comment and Constraint)

-						return UnexecutableCommand.INSTANCE;

-					}

-				}

-			}

-		}

-

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
deleted file mode 100644
index f3e58bef495..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDefaultSemanticEditPolicy.java
+++ /dev/null
@@ -1,103 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
-import org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants;
-import org.eclipse.papyrus.sysml.diagram.parametric.commands.CustomBindingConnectorReorientCommand;
-import org.eclipse.papyrus.sysml.diagram.parametric.commands.CustomParametricContextLinkCreateCommand;
-import org.eclipse.papyrus.sysml.diagram.parametric.commands.ReorientReferenceRelationshipRequestWithGraphical;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.GraphicalTypeRegistry;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsCreateCommand;
-import org.eclipse.papyrus.uml.service.types.command.CommentAnnotatedElementsReorientCommand;
-import org.eclipse.papyrus.uml.service.types.command.ConnectorReorientCommand;
-
-/**
- * <pre>
- * Custom semantic edit policy that replace DefaultSemanticEditPolicy
- * in order to manage Class Diagram specific elements (reference
- * relationships COMMENT_ANNOTATED_ELEMENT and CONSTRAINT_CONSTRAINED_ELEMENT).
- * </pre>
- */
-public class CustomDefaultSemanticEditPolicy extends DefaultSemanticEditPolicy {
-
-	/** Local graphical type registry for graphical elements */
-	private IGraphicalTypeRegistry registry = new CustomGraphicalTypeRegistry();
-
-	/** Local graphical type registry for inherited graphical elements */
-	private IGraphicalTypeRegistry inheritedRegistry = new GraphicalTypeRegistry();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-
-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT == req.getElementType()) {
-			return getGEFWrapper(new CommentAnnotatedElementsCreateCommand(req));
-		}
-
-		if (ElementTypes.CONTEXT_LINK == req.getElementType()) {
-			return getGEFWrapper(new CustomParametricContextLinkCreateCommand(req));
-		}
-
-		String newEdgeGraphicalType = registry.getEdgeGraphicalType(req.getElementType());
-
-		if (inheritedRegistry.isKnownEdgeType(newEdgeGraphicalType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		if (!registry.isKnownEdgeType(newEdgeGraphicalType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
-
-		View reconnectedView = (View) req.getParameter(RequestParameterConstants.GRAPHICAL_RECONNECTED_EDGE);
-		String reconnectedViewType = (reconnectedView != null) ? reconnectedView.getType() : org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE;
-
-		if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(reconnectedViewType)) {
-			return getGEFWrapper(new CommentAnnotatedElementsReorientCommand(req));
-		}
-
-		if (UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(reconnectedViewType)) {
-			if (req instanceof ReorientReferenceRelationshipRequestWithGraphical) {
-				return getGEFWrapper(new CustomBindingConnectorReorientCommand((ReorientReferenceRelationshipRequestWithGraphical) req));
-			}
-			else {
-				return getGEFWrapper(new ConnectorReorientCommand(req));
-			}
-		}
-
-
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDragDropEditPolicy.java
deleted file mode 100644
index 7ce99306223..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomDragDropEditPolicy.java
+++ /dev/null
@@ -1,278 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-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.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.CommonDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
-import org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper.CustomLinkMappingHelper;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.CustomGraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;
-import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.EncapsulatedClassifier;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/** Customization of the DND edit policy for the Internal Block Diagram */
-public class CustomDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
-
-	private ConnectorUtils utils = new ConnectorUtils();
-
-	/** Default constructor. */
-	public CustomDragDropEditPolicy() {
-		super(new CustomLinkMappingHelper());
-		registry = new CustomGraphicalTypeRegistry();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Set<String> getSpecificDropBehaviorTypes() {
-		Set<String> specificDropBehaviorTypes = new HashSet<String>();
-
-		specificDropBehaviorTypes.add(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID);
-
-		return specificDropBehaviorTypes;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getSpecificDropCommand(DropObjectsRequest dropRequest, EObject droppedEObject, String nodeType, String edgeType) {
-		if ((UMLGraphicalTypes.LINK_UML_CONNECTOR_ID.equals(edgeType)) && (droppedEObject instanceof Connector)) {
-			return getConnectorDropCommand(dropRequest, (Connector) droppedEObject, edgeType);
-		}
-
-		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-	}
-
-	protected ICommand getConnectorDropCommand(DropObjectsRequest dropRequest, Connector droppedEObject, String edgeType) {
-
-		// Only manage binary link during drop
-		if (droppedEObject.getEnds().size() != 2) {
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-
-		ConnectorEnd source = droppedEObject.getEnds().get(0);
-		ConnectorEnd target = droppedEObject.getEnds().get(1);
-
-		// Find views in current diagram representing source and target
-		Collection<View> sourceViews = getViewsForConnectorEnd(source);
-		Collection<View> targetViews = getViewsForConnectorEnd(target);
-
-		IAdaptable sourceViewAdapter = null;
-		IAdaptable targetViewAdapter = null;
-
-		// If either a source or target lacks create view for these elements, abort...
-		if (sourceViews.isEmpty() || targetViews.isEmpty()) {
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-
-		View selectedSourceView = null;
-		View selectedTargetView = null;
-		// until a correct one is found, check that source and target views selected are correct given the current path for the connector...
-		for (View sourceView : sourceViews) {
-			View targetView = getFirstValidTargetViewForSource(sourceView, targetViews, droppedEObject);
-			if (targetView != null) {
-				selectedSourceView = sourceView;
-				selectedTargetView = targetView;
-				break;
-			}
-		}
-
-
-		// Create source adapter
-		if (selectedSourceView != null) { // sourceViewAdapter should still be null in this case
-			sourceViewAdapter = new SemanticAdapter(null, selectedSourceView);
-		} else {
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-
-		// Create target adapter
-		if (selectedTargetView != null) { // targetViewAdapter should still be null in this case
-			targetViewAdapter = new SemanticAdapter(null, selectedTargetView);
-		} else {
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-
-		// Create a view for the dropped link between the source and target view adapters
-		IAdaptable droppedObjectAdapter = new SemanticAdapter(droppedEObject, null);
-
-		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(droppedObjectAdapter, edgeType, getDiagramPreferencesHint());
-
-		CommonDeferredCreateConnectionViewCommand createConnectionViewCommand = new CommonDeferredCreateConnectionViewCommand(getEditingDomain(), edgeType, sourceViewAdapter, targetViewAdapter, getViewer(), getDiagramPreferencesHint(), linkdescriptor, null);
-		createConnectionViewCommand.setElement(droppedEObject);
-
-		return createConnectionViewCommand;
-	}
-
-	/**
-	 * get the first valid target view for the given source. the couple source/target is valid if the path to them from the future container is valid
-	 *
-	 * @param sourceView
-	 * @param targetViews
-	 * @return
-	 */
-	private View getFirstValidTargetViewForSource(View sourceView, Collection<View> targetViews, Connector droppedConnector) {
-		for (View targetView : targetViews) {
-			if (isValidTargetViewForSource(sourceView, targetView, droppedConnector)) {
-				return targetView;
-			}
-		}
-
-		return null;
-	}
-
-	private boolean isValidTargetViewForSource(View sourceView, View targetView, Connector droppedConnector) {
-		if (!(utils.isCrossingEncapsulation(sourceView, targetView))) {
-			// no encapsulation. Computes the end paths
-			List<Property> sourceNestedPaths = utils.getNestedPropertyPath(sourceView, targetView);
-			List<Property> targetNestedPaths = utils.getNestedPropertyPath(targetView, sourceView);
-
-			// check this is compatible with current connector
-			ConnectorEnd sourceConnectorEnd = utils.getSourceConnectorEnd(droppedConnector);
-			NestedConnectorEnd nestedSourceConnectorEnd = UMLUtil.getStereotypeApplication(sourceConnectorEnd, NestedConnectorEnd.class);
-			if (nestedSourceConnectorEnd != null) {
-				List<Property> currentSourceConnectorPropertyPath = nestedSourceConnectorEnd.getPropertyPath();
-				// compare the 2 list
-				if (!sourceNestedPaths.equals(currentSourceConnectorPropertyPath)) {
-					return false;
-				}
-
-			} else { // no end for the current connector, so the sourceNestedPath should be empty
-				if (!sourceNestedPaths.isEmpty()) {
-					return false;
-				}
-			}
-
-
-			ConnectorEnd targetConnectorEnd = utils.getTargetConnectorEnd(droppedConnector);
-			NestedConnectorEnd nestedTargetConnectorEnd = UMLUtil.getStereotypeApplication(targetConnectorEnd, NestedConnectorEnd.class);
-			if (nestedTargetConnectorEnd != null) {
-				List<Property> currentTargetConnectorPropertyPath = nestedTargetConnectorEnd.getPropertyPath();
-				// compare the 2 list
-				if (!targetNestedPaths.equals(currentTargetConnectorPropertyPath)) {
-					return false;
-				}
-
-			} else { // no end for the current connector, so the targetNestedPaths should be empty
-				if (!targetNestedPaths.isEmpty()) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * This methods looks for views representing a given {@link ConnectorEnd} in the host diagram.
-	 *
-	 * @param end
-	 *            the {@link ConnectorEnd} to look for.
-	 * @return the list of {@link View} representing the eObject.
-	 */
-	protected Set<View> getViewsForConnectorEnd(ConnectorEnd end) {
-		Set<View> views = new HashSet<View>();
-
-		// Retrieve host diagram
-		View hostView = ((IGraphicalEditPart) getHost()).getNotationView();
-		View hostDiagram = (hostView instanceof Diagram) ? hostView : hostView.getDiagram();
-
-		// Retrieve all views for the ConnectorEnd role
-		EReference[] refs = { NotationPackage.eINSTANCE.getView_Element() };
-		@SuppressWarnings("unchecked")
-		Collection<View> relatedViews = EMFCoreUtil.getReferencers(end.getRole(), refs);
-
-		// TODO: We should filter views not only for the current diagram,
-		// but also consider only views nested within the owner of the connector that are closest to the host view
-		// (in case there are several instances of a Part within which the connector could appear).
-		// Connector connector = (Connector)end.getOwner();
-		// StructuredClassifier connectorOwner = (StructuredClassifier)connector.getOwner();
-		// Parse and select views from host diagram only
-		Iterator<View> it = relatedViews.iterator();
-		while (it.hasNext()) {
-			View currentView = it.next();
-			if (currentView.getDiagram() == hostDiagram) { // FIXME: Cf TODO above.
-
-				boolean isInView = false;
-				View containerView = currentView;
-				while (containerView != null && !(containerView instanceof Diagram)) {
-					if (containerView == getReferenceViewForConnectorEnd()) {
-						isInView = true;
-					}
-					containerView = ViewUtil.getContainerView(containerView);
-				}
-
-				if (isInView) {
-
-					EObject containerElement = ViewUtil.getContainerView(currentView).getElement();
-
-					// If the ConnectorEnd partWithPort is not null, only select Views for which
-					// the graphical parent reference partWithPort.
-					if (end.getPartWithPort() != null) {
-						if (containerElement == end.getPartWithPort()) {
-							views.add(currentView);
-						}
-					} else {
-						// If the role is a Port, its graphical parent is a EncapsulatedClassifier
-						if (end.getRole() instanceof Port) {
-							if (containerElement instanceof EncapsulatedClassifier) {
-								views.add(currentView);
-							} else if (containerElement instanceof Property) {
-								Property property = (Property) containerElement;
-								if (property.getType() == end.getRole().getOwner()) {
-									views.add(currentView);
-								}
-							}
-						} else { // No further test needed
-							views.add(currentView);
-						}
-
-					}
-				}
-			}
-		}
-
-		return views;
-	}
-
-	protected View getReferenceViewForConnectorEnd() {
-		return ((IGraphicalEditPart) getHost()).getNotationView();
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomParametricSemanticPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomParametricSemanticPolicy.java
deleted file mode 100644
index 32c432e2eb7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomParametricSemanticPolicy.java
+++ /dev/null
@@ -1,270 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.commands.CustomBindingConnectorCreateCommand;
-import org.eclipse.papyrus.sysml.diagram.parametric.commands.CustomParametricContextLinkReorientCommand;
-import org.eclipse.papyrus.sysml.diagram.parametric.commands.ReorientReferenceRelationshipRequestWithGraphical;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomBlockCompositeEditPartTN;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.policy.DiagramSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher;
-import org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher;
-import org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintParameterAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.PortAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.UMLPackage;
-
-public class CustomParametricSemanticPolicy extends DiagramSemanticEditPolicy {
-
-	@Override
-	protected Command getSemanticCommand(IEditCommandRequest request) {
-		if (request instanceof CreateElementRequest) {
-			if (((CreateElementRequest) request).getElementType().getEClass() == UMLPackage.eINSTANCE.getProperty()) {
-				// Could create a ConstraintParameter on the diagram frame only if host element is a ConstraintBlock
-				Element semanticOwner = UMLUtil.resolveUMLElement(this.getHost());
-				if (semanticOwner instanceof Class && org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(semanticOwner, ConstraintBlock.class) == null) {
-					return UnexecutableCommand.INSTANCE;
-				}
-				// Could not create Part/Reference/Value
-				if (request instanceof CreateElementRequest && ((CreateElementRequest) request).getElementType() instanceof SpecializationType) {
-					IElementMatcher matcher = ((SpecializationType) ((CreateElementRequest) request).getElementType()).getMatcher();
-					if (matcher instanceof PartPropertyMatcher) {
-						return UnexecutableCommand.INSTANCE;
-					}
-					if (matcher instanceof ReferencePropertyMatcher) {
-						return UnexecutableCommand.INSTANCE;
-					}
-					if (matcher instanceof ValuePropertyMatcher) {
-						return UnexecutableCommand.INSTANCE;
-					}
-				}
-			}
-		}
-		return super.getSemanticCommand(request);
-	}
-
-	@Override
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		if (req.getElementType().getEClass() == UMLPackage.eINSTANCE.getConnector()) {
-			if (getHost() instanceof CustomBlockCompositeEditPartTN) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			if (getHost() instanceof CustomConstraintBlockPropertyCompositeEditPart) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			if (getHost() instanceof ConstraintParameterAffixedNodeEditPart) {
-				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));
-			}
-			if (getHost() instanceof PortAffixedNodeEditPart) {
-				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));
-			}
-			if (getHost() instanceof BlockPropertyCompositeEditPart) {
-				return getGEFWrapper(new CustomBindingConnectorCreateCommand(req));
-			}
-		}
-		return super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * Method getReorientRefRelationshipTargetCommand. Removes the reference the
-	 * ConnectionEditPart current has an add the new TargetEditPart
-	 *
-	 * @param request
-	 * @return Command
-	 */
-	@Override
-	protected Command getReorientRelationshipSourceCommand(
-			ReconnectRequest request) {
-
-		EditPart target = request.getTarget();
-		if (target instanceof CustomBlockCompositeEditPartTN) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (target instanceof CustomConstraintBlockPropertyCompositeEditPart) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		org.eclipse.gef.ConnectionEditPart connectionEP = (request).getConnectionEditPart();
-
-		if (connectionEP instanceof ConnectionEditPart) {
-			if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
-				return null;
-			}
-		}
-
-		EditPart sourceEditPart = connectionEP.getSource();
-		EditPart targetEditPart = connectionEP.getTarget();
-		EObject referenceOwner = ViewUtil
-				.resolveSemanticElement((View) targetEditPart.getModel());
-		EObject oldTarget = ViewUtil
-				.resolveSemanticElement((View) sourceEditPart.getModel());
-		EObject newTarget = ViewUtil
-				.resolveSemanticElement((View) request.getTarget().getModel());
-
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-				.getEditingDomain();
-
-		ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-				editingDomain, referenceOwner, newTarget, oldTarget,
-				ReorientRequest.REORIENT_SOURCE,
-				request.getTarget(), targetEditPart);
-
-		semRequest.addParameters(request.getExtendedData());
-		return getSemanticCommand(semRequest);
-	}
-
-
-
-	/**
-	 * Method getReorientRefRelationshipTargetCommand. Removes the reference the
-	 * ConnectionEditPart current has an add the new TargetEditPart
-	 *
-	 * @param request
-	 * @return Command
-	 */
-	@Override
-	protected Command getReorientRelationshipTargetCommand(
-			ReconnectRequest request) {
-
-		EditPart target = request.getTarget();
-		if (target instanceof CustomBlockCompositeEditPartTN) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (target instanceof CustomConstraintBlockPropertyCompositeEditPart) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		org.eclipse.gef.ConnectionEditPart connectionEP = (request).getConnectionEditPart();
-
-		if (connectionEP instanceof ConnectionEditPart) {
-			if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
-				return null;
-			}
-		}
-
-		EditPart sourceEditPart = connectionEP.getSource();
-		EditPart targetEditPart = connectionEP.getTarget();
-		EObject referenceOwner = ViewUtil
-				.resolveSemanticElement((View) sourceEditPart.getModel());
-		EObject oldTarget = ViewUtil
-				.resolveSemanticElement((View) targetEditPart.getModel());
-		EObject newTarget = ViewUtil
-				.resolveSemanticElement((View) request.getTarget().getModel());
-
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-				.getEditingDomain();
-
-		ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-				editingDomain, referenceOwner, newTarget, oldTarget,
-				ReorientRequest.REORIENT_TARGET,
-				sourceEditPart, request.getTarget());
-
-		semRequest.addParameters(request.getExtendedData());
-
-		return getSemanticCommand(semRequest);
-	}
-
-	@Override
-	protected Command getReorientRefRelationshipSourceCommand(
-			ReconnectRequest request) {
-
-		if (request.getConnectionEditPart() instanceof ContextLinkEditPart) {
-			org.eclipse.gef.ConnectionEditPart connectionEP = request.getConnectionEditPart();
-
-			if (connectionEP instanceof ConnectionEditPart) {
-				if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
-					return null;
-				}
-			}
-
-			EditPart sourceEditPart = connectionEP.getSource();
-			EditPart targetEditPart = connectionEP.getTarget();
-			EObject referenceOwner = ViewUtil
-					.resolveSemanticElement((View) targetEditPart.getModel());
-			EObject oldTarget = ViewUtil
-					.resolveSemanticElement((View) sourceEditPart.getModel());
-			EObject newTarget = ViewUtil
-					.resolveSemanticElement((View) request.getTarget().getModel());
-
-			TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-					.getEditingDomain();
-
-			ReorientReferenceRelationshipRequestWithGraphical semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-					editingDomain, referenceOwner, newTarget, oldTarget,
-					ReorientRequest.REORIENT_SOURCE,
-					sourceEditPart, targetEditPart);
-			return getGEFWrapper(new CustomParametricContextLinkReorientCommand(semRequest));
-		}
-		return super.getReorientRefRelationshipTargetCommand(request);
-	}
-
-	@Override
-	protected Command getReorientRefRelationshipTargetCommand(
-			ReconnectRequest request) {
-		if (request.getConnectionEditPart() instanceof ContextLinkEditPart) {
-			org.eclipse.gef.ConnectionEditPart connectionEP = request.getConnectionEditPart();
-
-			if (connectionEP instanceof ConnectionEditPart) {
-				if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
-					return null;
-				}
-			}
-
-			EditPart sourceEditPart = connectionEP.getSource();
-			EditPart targetEditPart = connectionEP.getTarget();
-			EObject referenceOwner = ViewUtil
-					.resolveSemanticElement((View) sourceEditPart.getModel());
-			EObject oldTarget = ViewUtil
-					.resolveSemanticElement((View) targetEditPart.getModel());
-			EObject newTarget = ViewUtil
-					.resolveSemanticElement((View) request.getTarget().getModel());
-
-			TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-					.getEditingDomain();
-
-			ReorientReferenceRelationshipRequestWithGraphical semRequest = new ReorientReferenceRelationshipRequestWithGraphical(
-					editingDomain, referenceOwner, newTarget, oldTarget,
-					ReorientRequest.REORIENT_TARGET,
-					sourceEditPart, targetEditPart);
-			return getGEFWrapper(new CustomParametricContextLinkReorientCommand(semRequest));
-		}
-		return super.getReorientRefRelationshipTargetCommand(request);
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureClassifierDropEditPolicy.java
deleted file mode 100644
index 2b1881ab51c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureClassifierDropEditPolicy.java
+++ /dev/null
@@ -1,167 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.papyrus.sysml.diagram.parametric.utils.BlockDropHelper;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * <pre>
- * Customization of the DND edit policy for the StructureClassifier compartments, that enables the direct
- * creation of typed Part, Reference, ConstraintProperty, Value, ActorPart or Property by dragging types in a Block structure compartment.
- * </pre>
- */
-public class CustomStructureClassifierDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public CustomStructureClassifierDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-
-		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
-			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
-				commandChoice.add(dropAsTypedPart);
-			}
-
-			// 2. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
-				commandChoice.add(dropAsTypedReference);
-			}
-
-			// 3. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
-				commandChoice.add(dropAsTypedActorPart);
-			}
-
-			// 4. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
-				commandChoice.add(dropAsTypedValue);
-			}
-
-			// 5. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
-			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
-				commandChoice.add(dropAsTypedProperty);
-			}
-
-			// 6. Try to create a ConstraintProperty typed by the dropped object
-			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
-			if ((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
-				commandChoice.add(dropAsTypedConstraintProperty);
-			}
-
-			// 7. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected View getReferenceViewForConnectorEnd() {
-		return ViewUtil.getContainerView(super.getReferenceViewForConnectorEnd());
-	}
-
-	@Override
-	protected ICommand getDropObjectCommand(DropObjectsRequest dropRequest, EObject droppedObject) {
-		View dropTargetView = ((IGraphicalEditPart) getHost()).getNotationView();
-		EObject dropTargetElement = dropTargetView.getElement();
-
-		EObject diagramOwner = getDiagramOwner(dropTargetView);
-		if (UMLUtil.getStereotypeApplication((Element) diagramOwner, ConstraintBlock.class) != null) {
-			// ConstraintBlock
-			if (UMLUtil.getStereotypeApplication((Element) dropTargetElement, ConstraintProperty.class) == null) {
-				// only ConstraintProperty can be dropped in structure compartment of a diagram owned by a ConstraintBlock
-				return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-			}
-		}
-		return super.getDropObjectCommand(dropRequest, droppedObject);
-	}
-
-	private EObject getDiagramOwner(View dropTargetView) {
-		Diagram diagram = dropTargetView.getDiagram();
-		EObject diagramOwer = diagram.getElement();
-		return diagramOwer;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureCompartmentSemanticEditPolicy.java
deleted file mode 100644
index 1b6fddafcef..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/CustomStructureCompartmentSemanticEditPolicy.java
+++ /dev/null
@@ -1,65 +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:

- *		Régis CHEVREL: chevrel.regis <at> gmail.com

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.parametric.policies;

-

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

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.StructureCompartmentSemanticEditPolicy;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

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

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

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

-

-public class CustomStructureCompartmentSemanticEditPolicy extends

-		StructureCompartmentSemanticEditPolicy {

-

-	@Override

-	protected Command getCreateCommand(CreateElementRequest req) {

-

-		View dropTargetView = ((IGraphicalEditPart) getHost()).getNotationView();

-		EObject eContainer = dropTargetView.eContainer();

-		Element parent = null;

-		if (eContainer != null && eContainer instanceof View) {

-			parent = (Element) ((View) eContainer).getElement();

-		}

-		if (parent instanceof Property) {

-			parent = ((Property) parent).getType();

-		}

-

-		if (parent != null) {

-			if (UMLUtil.getStereotypeApplication(parent, ConstraintBlock.class) != null) {

-				IElementType elementType = req.getElementType();

-				if (elementType != UMLElementTypes.CONSTRAINT

-						&& elementType != UMLElementTypes.COMMENT) {

-					// ConstraintBlock

-					if (elementType != SysMLElementTypes.CONSTRAINT_PROPERTY) {

-						// only ConstraintProperty can be dropped in structure

-						// compartment of a diagram owned by a ConstraintBlock

-						// (except common Comment and Constraint)

-						return UnexecutableCommand.INSTANCE;

-					}

-				}

-			}

-		}

-

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/StructureClassifierDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/StructureClassifierDropEditPolicy.java
deleted file mode 100644
index 2fda6946d81..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/policies/StructureClassifierDropEditPolicy.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2016 CEA LIST, Esterel Technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Régis CHEVREL: chevrel.regis <at> gmail.com
- *  CEA LIST - Initial API and implementation
- *  Alain Le Guennec (Esterel Technologies SAS) - bug 497400
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SelectAndExecuteCommand;
-import org.eclipse.papyrus.sysml.diagram.parametric.utils.BlockDropHelper;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * <pre>
- * Customization of the DND edit policy for the StructureClassifier compartments, that enables the direct
- * creation of typed Part, Reference, Value, ActorPart or Property by dragging types in a Block structure compartment.
- * </pre>
- */
-public class StructureClassifierDropEditPolicy extends CustomDragDropEditPolicy {
-
-	/** Default constructor */
-	public StructureClassifierDropEditPolicy() {
-		super();
-	}
-
-	/**
-	 * {@inheritedDoc}.
-	 */
-	@Override
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-
-		BlockDropHelper helper = new BlockDropHelper(getEditingDomain());
-
-		// Single drop management possible drop action list can be proposed
-		if (dropRequest.getObjects().size() == 1) {
-
-			// List of available drop commands
-			final List<Command> commandChoice = new ArrayList<Command>();
-
-			// 1. Try to create a Part typed by the dropped object
-			Command dropAsTypedPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.PART_PROPERTY);
-			if ((dropAsTypedPart != null) && (dropAsTypedPart.canExecute())) {
-				commandChoice.add(dropAsTypedPart);
-			}
-
-			// 2. Try to create a Reference typed by the dropped object
-			Command dropAsTypedReference = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.REFERENCE_PROPERTY);
-			if ((dropAsTypedReference != null) && (dropAsTypedReference.canExecute())) {
-				commandChoice.add(dropAsTypedReference);
-			}
-
-			// 3. Try to create an ActorPart typed by the dropped object
-			Command dropAsTypedActorPart = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.ACTOR_PART_PROPERTY);
-			if ((dropAsTypedActorPart != null) && (dropAsTypedActorPart.canExecute())) {
-				commandChoice.add(dropAsTypedActorPart);
-			}
-
-			// 4. Try to create a Value typed by the dropped object
-			Command dropAsTypedValue = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.VALUE_PROPERTY);
-			if ((dropAsTypedValue != null) && (dropAsTypedValue.canExecute())) {
-				commandChoice.add(dropAsTypedValue);
-			}
-
-			// 5. Try to create a Property typed by the dropped object
-			Command dropAsTypedProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), UMLElementTypes.PROPERTY);
-			if ((dropAsTypedProperty != null) && (dropAsTypedProperty.canExecute())) {
-				commandChoice.add(dropAsTypedProperty);
-			}
-
-			// 6. Try to create a ConstraintProperty typed by the dropped object
-			Command dropAsTypedConstraintProperty = helper.getDropAsStructureItem(dropRequest, (GraphicalEditPart) getHost(), SysMLElementTypes.CONSTRAINT_PROPERTY);
-			if ((dropAsTypedConstraintProperty != null) && (dropAsTypedConstraintProperty.canExecute())) {
-				commandChoice.add(dropAsTypedConstraintProperty);
-			}
-
-			// 7. Build default drop command (show view of the dropped object)
-			Command defaultDropCommand = super.getDropObjectsCommand(dropRequest);
-			if ((defaultDropCommand != null) && (defaultDropCommand.canExecute())) {
-				defaultDropCommand.setLabel("Default drop (Show dropped object in diagram)");
-				commandChoice.add(defaultDropCommand);
-			}
-
-			// Prepare the selection command (if several command are available) or return the drop command
-			if (commandChoice.size() > 1) {
-				RunnableWithResult<ICommand> runnable;
-				Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<ICommand>() {
-
-					public void run() {
-						setResult(new SelectAndExecuteCommand("Select drop action for ", PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), commandChoice));
-					}
-				});
-
-				ICommand selectCommand = runnable.getResult();
-
-				return new ICommandProxy(selectCommand);
-
-			} else if (commandChoice.size() == 1) {
-				return commandChoice.get(0);
-			}
-
-			// else (command choice is empty)
-			return UnexecutableCommand.INSTANCE;
-
-		}
-
-		return super.getDropObjectsCommand(dropRequest);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected View getReferenceViewForConnectorEnd() {
-		return ViewUtil.getContainerView(super.getReferenceViewForConnectorEnd());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockPropertyCompositePreferencePage.java
deleted file mode 100644
index bbdd7af189a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockPropertyCompositePreferencePage.java
+++ /dev/null
@@ -1,42 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Composite;
-
-public class BlockPropertyCompositePreferencePage extends AbstractPreferencePage {
-
-	/** Constructor */
-	public BlockPropertyCompositePreferencePage() {
-		super();
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		CustomBlockPropertyCompositePreferencePage.initDefaults(store);
-		/* CustomNestedBlockPropertyCompositePreferencePage.initDefaults(store); */
-	}
-
-	@Override
-	protected void addFields(Composite parent) {
-
-	}
-
-	@Override
-	protected void initHelp() {
-
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintParameterAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintParameterAsBorderItemPreferencePage.java
deleted file mode 100644
index f47329a8d25..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintParameterAsBorderItemPreferencePage.java
+++ /dev/null
@@ -1,44 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * {@link Port} preference page.
- */
-public class ConstraintParameterAsBorderItemPreferencePage extends ParametricDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID; //$NON-NLS-1$
-
-	/** Constructor */
-	public ConstraintParameterAsBorderItemPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.ELEMENTICON), 0);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
deleted file mode 100644
index 2ffc26dbd2c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
+++ /dev/null
@@ -1,105 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * Preference page for Part and References.
- */
-public class CustomBlockPropertyCompositePreferencePage extends ParametricDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		compartmentTitleDefaultVisibilityMap.remove("structure"); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.FALSE); //$NON-NLS-1$
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public CustomBlockPropertyCompositePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
deleted file mode 100644
index 7634ef678be..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
+++ /dev/null
@@ -1,103 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * Preference page for Part and References.
- */
-public class CustomConstraintPropertyCompositePreferencePage extends ParametricDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	public static String prefKey = ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCKPROPERTY_AS_COMPOSITE_ID; //$NON-NLS-1$
-
-	public static String prefLabelKey = prefKey + "-" + UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		compartmentTitleDefaultVisibilityMap.remove("structure"); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("structure", Boolean.FALSE); //$NON-NLS-1$
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public CustomConstraintPropertyCompositePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_" + SysMLGraphicalTypes.SHAPE_SYSML_BLOCKPROPERTY_AS_COMPOSITE_ID); //$NON-NLS-1$
-	}
-
-	/** Default preferences initializer */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
deleted file mode 100644
index 7987ab758c1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
+++ /dev/null
@@ -1,75 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
-import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * Custom preferences initializer.
- */
-public class CustomPreferenceInitializer extends ParametricDiagramPreferenceInitializer {
-
-	@Override
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		super.initializeDefaultPreferences();
-
-		IPreferenceStore store = getPreferenceStore();
-
-		ConstraintParameterAsBorderItemPreferencePage.initDefaults(store);
-		BlockPropertyCompositePreferencePage.initDefaults(store);
-		CustomConstraintPropertyCompositePreferencePage.initDefaults(store);
-
-		// Initialize default positions for labels.
-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, 0, -10);
-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);
-
-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, 0, -10);
-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_APPLIEDSTEREOTYPE_ID, 0, -30);
-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, 0, 10);
-		initDefaultPosition(UMLGraphicalTypes.LINK_UML_CONNECTOR_ID, UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, 0, 10);
-
-		initDefaultPosition(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, -40, -15);
-		initDefaultPosition(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_AFFIXED_ID, UMLGraphicalTypes.AFFIXEDLABEL_UML_APPLIEDSTEREOTYPE_ID, 30, -20);
-
-	}
-
-	/**
-	 * Initialize default position of a link label in preferences.
-	 *
-	 * @param parentGraphicalType
-	 *            the graphical type of the view owning the label
-	 * @param graphicalType
-	 *            the graphical type of the label
-	 * @param x
-	 * @param y
-	 */
-	protected void initDefaultPosition(String parentGraphicalType, String graphicalType, int x, int y) {
-		IPreferenceStore store = getPreferenceStore();
-
-		String xKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_X);
-		String yKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_Y);
-
-		store.setDefault(xKey, x);
-		store.setDefault(yKey, y);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPolicyProvider.java
deleted file mode 100644
index 62f6b2a58b4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/CustomEditPolicyProvider.java
+++ /dev/null
@@ -1,187 +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:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.BlockPropertyStructureCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.part.StructureCompartmentEditPart;
-import org.eclipse.papyrus.sysml.diagram.common.edit.policy.CustomDuplicatePasteEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomBlockCompositeSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDefaultSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDiagramDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.CustomDragDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.internalblock.edit.policy.TypedElementDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomBlockCompositeEditPartTN;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.CustomConstraintBlockPropertyCompositeEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.edit.part.ParametricDiagramEditPart;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomBlockCompositeDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomBlockPropertyCompositeDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomBlockPropertyStructureCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomParametricSemanticPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomStructureClassifierDropEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.parametric.policies.CustomStructureCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementBorderEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.AbstractElementLinkEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConnectorEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.ConstraintParameterAffixedNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.part.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.common.edit.policy.StructuredClassifierCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN;
-
-/**
- * Custom edit policy provider.
- */
-public class CustomEditPolicyProvider extends ParametricDiagramEditPolicyProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
-		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {
-			return false;
-		}
-
-		// Make sure this concern Parametric Diagram only
-		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();
-		String diagramType = gep.getNotationView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		// provides for the main diagram edit part
-		if (gep instanceof ParametricDiagramEditPart) {
-			return true;
-		}
-
-		// Provides for edit parts that represent nodes in Internal Block diagram
-		if (gep instanceof AbstractElementEditPart) {
-			return true;
-		}
-		if (gep instanceof AbstractElementBorderEditPart) {
-			return true;
-		}
-
-		// Provides for edit parts that represent edges in Internal Block diagram
-		if (gep instanceof AbstractElementLinkEditPart) {
-			return true;
-		}
-
-		if (gep instanceof ResizableCompartmentEditPart) {
-			return true;
-		}
-
-		if (gep instanceof ConstraintSpecificationEditPartCN) {
-			return true;
-		}
-
-		if (gep instanceof ConstraintEditPartCN) {
-			return true;
-		}
-
-		return super.provides(operation);
-	}
-
-	@Override
-	public void createEditPolicies(EditPart editPart) {
-		super.createEditPolicies(editPart);
-		if(editPart instanceof ParametricDiagramEditPart) {
-			editPart.installEditPolicy(PasteEditPolicy.PASTE_ROLE, new CustomDuplicatePasteEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDropEditPolicy());
-			// no installation of other policies.
-			return;
-		}
-
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
-
-		if ((editPart instanceof ConstraintEditPart) || (editPart instanceof ConstraintEditPartCN)) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-		}
-
-		if ((editPart instanceof CommentEditPart) || (editPart instanceof CommentEditPartCN)) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-			editPart.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy());
-		}
-
-		if (editPart instanceof BlockPropertyCompositeEditPart) {
-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyCompositeDropEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-		}
-
-		if (editPart instanceof BlockPropertyStructureCompartmentEditPart) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockPropertyStructureCompartmentSemanticEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyStructureCompartmentEditPartDropEditPolicy());
-			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
-		}
-
-		if (editPart instanceof CustomBlockCompositeEditPartTN) {
-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockCompositeDropEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.CREATION_ROLE, new StructuredClassifierCreationEditPolicy());
-
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomBlockCompositeSemanticEditPolicy());
-		}
-
-		if (editPart instanceof StructureCompartmentEditPart) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomStructureCompartmentSemanticEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomStructureClassifierDropEditPolicy());
-			editPart.installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
-		}
-
-		if (editPart instanceof DependencyEditPart) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());
-		}
-
-		if (editPart instanceof ConnectorEditPart) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomDefaultSemanticEditPolicy());
-		}
-
-		if (editPart instanceof CustomConstraintBlockPropertyCompositeEditPart) {
-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomBlockPropertyCompositeDropEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-		}
-		if (editPart instanceof ConstraintParameterAffixedNodeEditPart) {
-			editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new TypedElementDropEditPolicy());
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-		}
-		if (editPart instanceof CustomBlockCompositeEditPartTN) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-		}
-		if (editPart instanceof ConstraintSpecificationEditPartCN) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-		}
-		if (editPart instanceof ConstraintEditPartCN) {
-			editPart.installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParametricSemanticPolicy());
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricVisualTypeProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricVisualTypeProvider.java
deleted file mode 100644
index 4a48162d265..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParametricVisualTypeProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import org.eclipse.papyrus.gmf.diagram.common.provider.SysMLVisualTypeProvider;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLVisualTypeProvider;
-
-/**
- * Visual type provider for the SysML Parametric Diagram.
- */
-public class ParametricVisualTypeProvider extends SysMLVisualTypeProvider {
-
-	public ParametricVisualTypeProvider() {
-		super(new CustomGraphicalTypeRegistry(), new UMLVisualTypeProvider());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParserProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParserProvider.java
deleted file mode 100644
index da517cf5297..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/provider/ParserProvider.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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.provider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.common.parser.FlowPortLabelParser;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.diagram.parametric.parser.ParametricFrameParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.ConnectorLabelParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintLabelParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.MultiplicityElementLabelParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.PropertyLabelParser;
-import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
-
-/**
- * Parser provider for labels used by this diagram.
- */
-public class ParserProvider extends AbstractProvider implements IParserProvider {
-
-	/** map from graphical hint to parsers */
-	private static final Map<String, IParser> graphicalHintToParser = new HashMap<String, IParser>();
-
-	static {
-		graphicalHintToParser.put(SysMLGraphicalTypes.LABEL_SYSML_BLOCK_NAME_ID, new ParametricFrameParser());
-		graphicalHintToParser.put(UMLGraphicalTypes.LABEL_UML_PROPERTY_LABEL_ID, new PropertyLabelParser());
-		graphicalHintToParser.put(UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, new ConstraintLabelParser());
-
-		graphicalHintToParser.put(UMLGraphicalTypes.AFFIXEDLABEL_UML_PORT_LABEL_ID, new PropertyLabelParser());
-		graphicalHintToParser.put(SysMLGraphicalTypes.AFFIXEDLABEL_SYSML_FLOWPORT_LABEL_ID, new FlowPortLabelParser());
-
-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_NAMEDELEMENT_NAME_ID, new NamedElementLabelParser());
-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_LABEL_ID, new ConnectorLabelParser());
-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_SOURCE_MULTIPLICITY_ID, new MultiplicityElementLabelParser());
-		graphicalHintToParser.put(UMLGraphicalTypes.LINKLABEL_UML_CONNECTOR_TARGET_MULTIPLICITY_ID, new MultiplicityElementLabelParser());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetParserOperation) {
-			IAdaptable hint = ((GetParserOperation) operation).getHint();
-
-			if (!ElementTypes.DIAGRAM_ID.equals(getDiagramType(hint))) {
-				return false;
-			}
-
-			return getParser(hint) != null;
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public IParser getParser(IAdaptable hint) {
-		String parserHint = (String) hint.getAdapter(String.class);
-		if (parserHint != null) {
-			IParser parser = graphicalHintToParser.get(parserHint);
-			if (parser != null) {
-				return parser;
-			}
-		}
-
-		View view = (View) hint.getAdapter(View.class);
-		if (view != null) {
-			IParser parser = graphicalHintToParser.get(view.getType());
-			if (parser != null) {
-				return parser;
-			}
-		}
-
-		return null;
-	}
-
-	private String getDiagramType(IAdaptable hint) {
-		Diagram diagram = (Diagram) hint.getAdapter(Diagram.class);
-		if (diagram != null) {
-			return diagram.getType();
-		}
-
-		return "undefined";
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/BlockDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/BlockDropHelper.java
deleted file mode 100644
index 6f7d5d57c10..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/BlockDropHelper.java
+++ /dev/null
@@ -1,301 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.utils;
-
-import org.eclipse.core.runtime.IAdaptable;
-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.gmf.runtime.common.core.command.ICommand;
-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.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.TypedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * This class provides convenience methods to create Block specific drop action (Part, Reference or ConstraintProperty creation).
- */
-public class BlockDropHelper extends ElementHelper {
-
-	public BlockDropHelper(TransactionalEditingDomain editDomain) {
-		this.editDomain = editDomain;
-	}
-
-	public Command getDropAsStructureItemOnPart(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
-		Object droppedEObject = request.getObjects().get(0);
-		String label = "";
-		if (elementType == SysMLElementTypes.PART_PROPERTY) {
-			label = "Create a new Part";
-			// Exclude ConstraintProperty
-			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-			// Exclude reference drop in diagram owned by a ConstraintBlock
-			Element editPartOwner = (Element) host.resolveSemanticElement();
-			if (editPartOwner instanceof Property) {
-				editPartOwner = ((Property) editPartOwner).getType();
-			}
-			if (editPartOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(editPartOwner)) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
-			label = "Create a new Reference";
-			// Exclude ConstraintProperty
-			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-			// Exclude reference drop in diagram owned by a ConstraintBlock
-			Element editPartOwner = (Element) host.resolveSemanticElement();
-			if (editPartOwner instanceof Property) {
-				editPartOwner = ((Property) editPartOwner).getType();
-			}
-			if (editPartOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(editPartOwner)) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
-			label = "Create a new ActorPart";
-		}
-		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {
-			label = "Create a new Value";
-		}
-		if (elementType == UMLElementTypes.PROPERTY) {
-			label = "Create a new Property";
-		}
-		// New kind of element
-		if (elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
-			label = "Create a new ConstraintProperty";
-			// Constraint Property on ConstraintBlock strictly
-			if (droppedEObject instanceof Type) {
-				if (!((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-		}
-
-		CompoundCommand cc = new CompoundCommand(label);
-
-		if (!isValidStructureItemType(droppedEObject, elementType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Verify target nature
-		EObject target = getHostEObject(host);
-		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// The target type has to be a Block (will hold the created Port)
-		Type targetType = ((TypedElement) target).getType();
-		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Prepare a command for the element creation and the drop in diagram
-
-		// 1. Prepare creation command
-		ICommand createElementCommand = null;
-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);
-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);
-		if (provider != null) {
-			createElementCommand = provider.getEditCommand(createElementRequest);
-		}
-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
-
-		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(request.getLocation().getCopy());
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		// 3. Create the compound command
-		cc.add(new ICommandProxy(createElementCommand));
-		cc.add(viewCreateCommand);
-
-		return cc;
-	}
-
-	public Command getDropAsStructureItem(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
-		Object droppedEObject = request.getObjects().get(0);
-		String label = "";
-
-		// Filter part/reference : a property type by a ConstraintBlock MUST be a ConstraintProperty
-		if (elementType == SysMLElementTypes.PART_PROPERTY) {
-			label = "Create a new Part";
-			// Exclude ConstraintProperty
-			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-			// Exclude reference drop in diagram owned by a ConstraintBlock
-			Element diagramOwner = getDiagramOwner(host);
-			if (diagramOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(diagramOwner)) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-		if (elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
-			label = "Create a new Reference";
-			// Exclude ConstraintProperty
-			if (droppedEObject instanceof Type) {
-				if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-			// Exclude reference drop in diagram owned by a ConstraintBlock
-			Element diagramOwner = getDiagramOwner(host);
-			if (diagramOwner != null && ((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(diagramOwner)) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-		if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
-			label = "Create a new ActorPart";
-		}
-		if (elementType == SysMLElementTypes.VALUE_PROPERTY) {
-			label = "Create a new Value";
-		}
-		if (elementType == UMLElementTypes.PROPERTY) {
-			label = "Create a new Property";
-		}
-
-		// New kind of element
-		if (elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
-			label = "Create a new ConstraintProperty";
-			// Constraint Property on ConstraintBlock strictly
-			if (droppedEObject instanceof Type) {
-				if (!((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) droppedEObject)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-		}
-		CompoundCommand cc = new CompoundCommand(label);
-
-		if (!isValidStructureItemType(droppedEObject, elementType)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Prepare a command for the element creation and the drop in diagram
-
-		// 1. Prepare creation command
-		ICommand createElementCommand = null;
-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);
-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));
-		if (provider != null) {
-			createElementCommand = provider.getEditCommand(createElementRequest);
-		}
-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
-
-		// 2. Prepare the drop command
-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(request.getLocation().getCopy());
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		// 3. Create the compound command
-		cc.add(new ICommandProxy(createElementCommand));
-		cc.add(viewCreateCommand);
-
-		return cc;
-	}
-
-	private Element getDiagramOwner(GraphicalEditPart host) {
-		Object model = host.getRoot().getContents().getModel();
-		if (model instanceof View) {
-			return (Element) ((View) model).getElement();
-		}
-		return null;
-	}
-
-	private boolean isValidStructureItemType(Object object, IElementType elementType) {
-		boolean isValid = false;
-
-		if ((object != null) && (object instanceof Type) && !(object instanceof Association)) {
-
-			Type type = (Type) object;
-			if ((elementType == SysMLElementTypes.PART_PROPERTY) || (elementType == SysMLElementTypes.REFERENCE_PROPERTY)) {
-				if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
-					isValid = true;
-				}
-			}
-			if (elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
-				if (type instanceof Actor) {
-					isValid = true;
-				}
-			}
-			if (elementType == SysMLElementTypes.VALUE_PROPERTY) {
-				if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type) || (type instanceof DataType)) {
-					isValid = true;
-				}
-			}
-			if ((elementType == SysMLElementTypes.CONSTRAINT_PROPERTY)) {
-				if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
-					isValid = true;
-				}
-			}
-			if (elementType == UMLElementTypes.PROPERTY) {
-				if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)
-						&& !(type instanceof Actor)
-						&& !(type instanceof DataType)
-						&& !((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {
-					isValid = true;
-				}
-			}
-		}
-
-		return isValid;
-	}
-
-	/**
-	 * return the host Edit Part's semantic element, if the semantic element
-	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 *
-	 * @return EObject
-	 */
-	protected EObject getHostEObject(GraphicalEditPart host) {
-		return ViewUtil.resolveSemanticElement((View) host.getModel());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/ConstraintParameterDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/ConstraintParameterDropHelper.java
deleted file mode 100644
index 957993c457e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/utils/ConstraintParameterDropHelper.java
+++ /dev/null
@@ -1,94 +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:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric.utils;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * This class provides convenience methods to create Type specific drop action (Show Port on BlockPropertyComposite).
- */
-public class ConstraintParameterDropHelper extends ElementHelper {
-
-	public ConstraintParameterDropHelper(TransactionalEditingDomain editDomain) {
-		this.editDomain = editDomain;
-	}
-
-	public Command getDropConstraintParameter(Property droppedConstraintParameter, Point location, GraphicalEditPart host) {
-		return getDropConstraintParameterOnPart(droppedConstraintParameter, location, host);
-	}
-
-	public Command getDropConstraintParameterOnPart(Property droppedConstraintParameter, Point location, GraphicalEditPart host) {
-
-		if (!isValidConstraintParameter(droppedConstraintParameter, getHostEObject(host))) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// Prepare the view creation command
-		ViewDescriptor descriptor = new ViewDescriptor(new SemanticAdapter(droppedConstraintParameter, null), Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
-		createViewRequest.setLocation(location);
-		Command viewCreateCommand = host.getCommand(createViewRequest);
-
-		return viewCreateCommand;
-	}
-
-	private boolean isValidConstraintParameter(Object object, EObject dropTarget) {
-		// check if not a Port/FlowPort ...
-		if (object instanceof Port) {
-			return false;
-		}
-		// drop on a Block/ConstraintBlock
-		if (dropTarget instanceof Class && UMLUtil.getStereotypeApplication((Class) dropTarget, ConstraintBlock.class) != null) {
-			return ((Class) dropTarget).getOwnedAttributes().contains(object);
-		}
-		// drop on a part
-		if (dropTarget instanceof Property && UMLUtil.getStereotypeApplication((Property) dropTarget, ConstraintProperty.class) != null) {
-			Type type = ((Property) dropTarget).getType();
-			if (type instanceof Class && UMLUtil.getStereotypeApplication(type, ConstraintBlock.class) != null) {
-				return ((Class) type).getOwnedAttributes().contains(object);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * return the host Edit Part's semantic element, if the semantic element
-	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 *
-	 * @return EObject
-	 */
-	protected EObject getHostEObject(GraphicalEditPart host) {
-		return ViewUtil.resolveSemanticElement((View) host.getModel());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.classpath b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.classpath
deleted file mode 100644
index 6a42377b56a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.project
deleted file mode 100644
index 9699eb6bf85..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.diagram.requirement</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f08be2b06c4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 78b3db28eff..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.sysml.diagram.requirement,

- org.eclipse.papyrus.sysml.diagram.requirement.edit.part,

- org.eclipse.papyrus.sysml.diagram.requirement.edit.policy,

- org.eclipse.papyrus.sysml.diagram.requirement.factory,

- org.eclipse.papyrus.sysml.diagram.requirement.figure,

- org.eclipse.papyrus.sysml.diagram.requirement.part,

- org.eclipse.papyrus.sysml.diagram.requirement.preferences,

- org.eclipse.papyrus.sysml.diagram.requirement.provider,

- org.eclipse.papyrus.sysml.diagram.requirement.utils

-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

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

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

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

- org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

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

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)"
-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.requirement;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.gen.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.gen.MF
deleted file mode 100644
index adeb4e87ca7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.gen.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.requirement;singleton:=true
-Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.Activator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.uml.diagram.clazz,
- org.eclipse.papyrus.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/build.gen.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/build.gen.properties
deleted file mode 100644
index ca6d14e16f2..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/build.gen.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/,\
-           src-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               palettes/,\
-               icons/,\
-               about.html,\
-               plugin.properties
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/build.properties
deleted file mode 100644
index 9f1af61cb69..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#Mon Sep 12 09:30:15 CEST 2011
-bin.includes = .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               META-INF/,\
-               icons/,\
-               messages.properties,\
-               palettes/,\
-               model/
-output..=bin/
-src.includes = about.html,\
-               model/
-source.. = src/,\
-           src-gen/
-bin..=bin/
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/icons/RequirementDiagramSysML.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/icons/RequirementDiagramSysML.gif
deleted file mode 100644
index 7b8efd2d6d1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/icons/RequirementDiagramSysML.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif
deleted file mode 100644
index f87c907444b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/messages.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/messages.properties
deleted file mode 100644
index 315c143d549..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/messages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Hubert Dubois (CEA LIST) hubert.dubois@cea.fr - initial API and implementation
-##################################################################################
-# TODO: manually put keys and values
-
-Diagram_Name = ReqDiagram
-Problem_Opening = Problem Opening
-Cannot_Open_Input_Element = Cannot Open Input Element 
-No_EditPart_Can_Be_Created = No EditPart Can Be created
-No_View_Can_Be_Created = No View Can Be Created
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/SysML.Requirement.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/SysML.Requirement.idgen
deleted file mode 100644
index 7422c2591c3..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/SysML.Requirement.idgen
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<idgen:Diagram 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:idgen="http://www.eclipse.org/papyrus/0.7.0/idgen" name="Requirement" type="RequirementDiagram" icon="icons/obj16/Diagram_Requirement.gif" label="SysML Requirement Diagram" language="sysml" javaPackagePrefix="org.eclipse.papyrus.sysml.diagram.requirement" javaClassPrefix="RequirementDiagram" createCommandLabel="Create a new Requirement Diagram">

-  <diagramEditPart name="RequirementDiagramEditPart">

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy" key="EditPolicyRoles.SEMANTIC_ROLE"/>

-    <behaviors name="" javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy" key="&quot;RemoveOrphanView&quot;"/>

-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>

-  </diagramEditPart>

-  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy">

-    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.31"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.11"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.33"/>

-    </genNodes>

-    <genNodes name="">

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.19"/>

-    </genNodes>

-    <genNodes name="" generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildSideAffixedNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.23"/>

-    </genNodes>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.15"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.36"/>

-    </genNodes>

-    <genNodes>

-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.14"/>

-    </genNodes>

-    <genNodes generatePreferencePage="false" generateTool="false">

-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.37"/>

-    </genNodes>

-    <genLinks>

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.8"/>

-    </genLinks>

-    <genLinks name="">

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.22"/>

-    </genLinks>

-    <genLinks generatePreferencePage="false" generateTool="false">

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.21"/>

-    </genLinks>

-    <genLinks>

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.10"/>

-    </genLinks>

-    <genLinks generatePreferencePage="false" generateTool="false">

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>

-    </genLinks>

-    <genLinks generatePreferencePage="false" generateTool="false">

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.17"/>

-    </genLinks>

-    <genLinks>

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.7"/>

-    </genLinks>

-    <genLinks customPreferencePage="">

-      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>

-    </genLinks>

-  </inheritedDiagrams>

-  <customJavaClasses customEditPolicyProvider="org.eclipse.papyrus.sysml.diagram.requirement.provider.CustomEditPolicyProvider"/>

-</idgen:Diagram>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/Addition.palette.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/Addition.palette.xml
deleted file mode 100644
index d86aa99e6d5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/Addition.palette.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<paletteDefinition>

-   <content>

-      <drawer iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" id="requirement.drawer.Addition" name="Addition">

-         <aspectTool description="Create a refinement"  id="requirement.tool.refine" name="Refine" refToolId="clazz.tool.abstraction">

-            <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">

-               <stereotypesToApply>

-                  <stereotype stereotypeName="StandardProfileL2::Refine"/>

-               </stereotypesToApply>

-            </postAction>

-         </aspectTool>

-      </drawer>

-   </content>

-</paletteDefinition>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration
deleted file mode 100644
index 3c34f741f17..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.requirement.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.requirement Palette">

-  <drawerConfigurations id="requirement.drawer.nodes" label="Nodes">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.package" label="Package" description="Create a new Package">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.class" label="Requirement" description="Create a new Requirement">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Requirement.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Requirement"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.problem" label="Problem" description="Create a new Problem">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/modelelements/Problem.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Problem"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.rational" label="Rationale" description="Create a new Rationale">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/modelelements/Rationale.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Rationale"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.comment" label="Comment" description="Create a new Comment">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.constraint" label="Constraint" description="Create a new Constraint">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-  <drawerConfigurations id="requirement.drawer.edges" label="Edges">

-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.copy" label="Copy" description="Create a Copy Link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Copy.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Copy"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.derive" label="Derive" description="Create a Derive Link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/DeriveReqt.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.DeriveReqt"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.decompose" label="Decompose" description="Create a Decompose Link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="/icons/obj16/ContainmentConnection.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.packageimport" label="PackageImport" description="Create a new PackageImport" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.realization" label="Realization" description="Create a new Realization" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.satisfy" label="Satisfy" description="Create a Satisfy Link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Satisfy.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Satisfy"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.verify" label="Verify" description="Create a Verify Link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Verify.gif"/>

-      <elementDescriptors>

-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Verify"/>

-      </elementDescriptors>

-    </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="package.tool.link" label="Link" description="Create a new Link" kind="ConnectionTool">

-      <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="/icons/obj16/Link.gif"/>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-      <elementDescriptors>

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

-      </elementDescriptors>

-    </ownedConfigurations>

-  </drawerConfigurations>

-</paletteconfiguration:PaletteConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.gen.xml
deleted file mode 100644
index e7710daa5b7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.gen.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer
-			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.sysml.diagram.requirement.SYSML_Requirement__Tools" name="Tools">
-			<aspectTool description="Create a new Comment" id="requirement.tool.comment"
-				name="Comment" refToolId="clazz.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="requirement.tool.constraint"
-				name="Constraint" refToolId="clazz.tool.constraint">
-			</aspectTool>
-			
-			<aspectTool description="Create a new Package" id="requirement.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new Class" id="requirement.tool.class"
-				name="Class" refToolId="clazz.tool.class">
-			</aspectTool>
-			<aspectTool description="Create a new DataType" id="requirement.tool.datatype"
-				name="DataType" refToolId="clazz.tool.datatype">
-			</aspectTool>
-			<aspectTool description="Create a new Enumeration" id="requirement.tool.enumeration"
-				name="Enumeration" refToolId="clazz.tool.enumeration">
-			</aspectTool>
-			<aspectTool description="Create a new Interface" id="requirement.tool.interface"
-				name="Interface" refToolId="clazz.tool.interface">
-			</aspectTool>
-			<aspectTool description="Create a new Operation" id="requirement.tool.operation"
-				name="Operation" refToolId="clazz.tool.operation">
-			</aspectTool>
-			<aspectTool description="Create a new PrimitiveType" id="requirement.tool.primitivetype"
-				name="PrimitiveType" refToolId="clazz.tool.primitivetype">
-			</aspectTool>
-			<aspectTool description="Create a new Property" id="requirement.tool.property"
-				name="Property" refToolId="clazz.tool.property">
-			</aspectTool>
-			<aspectTool description="Create a new Reception" id="requirement.tool.reception"
-				name="Reception" refToolId="clazz.tool.reception">
-			</aspectTool>
-			<aspectTool description="Create a new Signal" id="requirement.tool.signal"
-				name="Signal" refToolId="clazz.tool.signal">
-			</aspectTool>
-			<aspectTool description="Create a new Abstraction" id="requirement.tool.abstraction"
-				name="Abstraction" refToolId="clazz.tool.abstraction">
-			</aspectTool>
-			<aspectTool description="Create a new ContainmentLink" id="requirement.tool.containmentlink"
-				name="ContainmentLink" refToolId="clazz.tool.containmentlink">
-			</aspectTool>
-			<aspectTool description="Create a new Dependency" id="requirement.tool.dependency"
-				name="Dependency" refToolId="clazz.tool.dependency">
-			</aspectTool>
-			<aspectTool description="Create a new PackageImport" id="requirement.tool.packageimport"
-				name="PackageImport" refToolId="clazz.tool.packageimport">
-			</aspectTool>
-			<aspectTool description="Create a new Realization" id="requirement.tool.realization"
-				name="Realization" refToolId="clazz.tool.realization">
-			</aspectTool>
-						
-		</drawer>
-	</content>
-</paletteDefinition>
-
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.xml
deleted file mode 100644
index 8876e83417b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-	<paletteDefinition>

-		<content>

-			<drawer iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" id="requirement.drawer.nodes" name="Nodes">

-		

-				<aspectTool description="Create a new Package" 

-					id="requirement.tool.package" 

-					name="Package" refToolId="clazz.tool.package">

-				</aspectTool>

-		

-				<aspectTool description="Create a new Requirement"

-					 id="requirement.tool.class" name="Requirement" 

-					 refToolId="clazz.tool.class" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif">

-					 	<postAction id="org.eclipse.papyrus.postaction.displayAppliedStereotypePropertiesInCompartmentactionprovider">

-					 		<propertiesToDisplay>

-					 			<propertyToDisplay name="SysML::Requirements::Requirement.id"/>

-					 			<propertyToDisplay name="SysML::Requirements::Requirement.text"/>

-					 		</propertiesToDisplay>

-					 	</postAction>

-					 	

-					 	<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">

-					 		<stereotypesToApply>

-					 			<stereotype stereotypeName="SysML::Requirements::Requirement"/>	

-					 		</stereotypesToApply>

-					 	</postAction>

-				 </aspectTool>

-			

-			<aspectTool description="Create a new Problem"

-					 id="requirement.tool.comment" name="Problem" 

-					 refToolId="clazz.tool.comment" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif">

-					 					 	

-					 	<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">

-					 		<stereotypesToApply>

-					 			<stereotype stereotypeName="SysML::ModelElements::Problem"/>	

-					 		</stereotypesToApply>

-					 	</postAction>

-					 	

-				 </aspectTool>

-				 

-				 <aspectTool description="Create a new Rationale"

-					 id="requirement.tool.comment" name="Rationale" 

-					 refToolId="clazz.tool.comment" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif">

-					 					 	

-					 	<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">

-					 		<stereotypesToApply>

-					 			<stereotype stereotypeName="SysML::ModelElements::Rationale"/>	

-					 		</stereotypesToApply>

-					 	</postAction>

-					 	

-				 </aspectTool>

-				 

-			<aspectTool description="Create a new Comment" id="requirement.tool.comment"

-				name="Comment" refToolId="clazz.tool.comment">

-			</aspectTool>

-			

-			<aspectTool description="Create a new Constraint" id="requirement.tool.constraint"

-				name="Constraint" refToolId="clazz.tool.constraint">

-			</aspectTool>

-			

-				</drawer>

-				 	

-			<drawer iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" id="requirement.drawer.edges" name="Edges">

-			

-				<aspectTool description="Create a Copy Link"

-					id="requirement.tool.copy" name="Copy"

-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif">

-					<postAction

-						id="org.eclipse.papyrus.applystereotypeactionprovider">

-						<stereotypesToApply>

-							<stereotype stereotypeName="SysML::Requirements::Copy" />

-						</stereotypesToApply>

-					</postAction>

-				</aspectTool>

-					<aspectTool description="Create a new Dependency" id="requirement.tool.dependency"

-				name="Dependency" refToolId="clazz.tool.dependency">

-			</aspectTool>

-				

-				<aspectTool description="Create a Derive Link"

-					id="requirement.tool.derive" name="Derive"

-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif">

-					<postAction

-						id="org.eclipse.papyrus.applystereotypeactionprovider">

-						<stereotypesToApply>

-							<stereotype

-								stereotypeName="SysML::Requirements::DeriveReqt" />

-						</stereotypesToApply>

-					</postAction>

-				</aspectTool>

-				

-				<aspectTool description="Create a Decompose Link"

-					id="requirement.tool.decompose" name="Decompose"

-					refToolId="clazz.tool.containmentlink"/>

-				<aspectTool description="Create a new PackageImport" id="requirement.tool.packageimport"

-				name="PackageImport" refToolId="clazz.tool.packageimport">

-				</aspectTool>

-					<aspectTool description="Create a new Realization" id="requirement.tool.realization"

-				name="Realization" refToolId="clazz.tool.realization">

-			</aspectTool>	

-				<aspectTool description="Create a Satisfy Link"

-					id="requirement.tool.satisfy" name="Satisfy"

-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif">

-					<postAction

-						id="org.eclipse.papyrus.applystereotypeactionprovider">

-						<stereotypesToApply>

-							<stereotype

-								stereotypeName="SysML::Requirements::Satisfy" />

-						</stereotypesToApply>

-					</postAction>

-				</aspectTool>

-				

-				<aspectTool description="Create a Verify Link"

-					id="requirement.tool.verify" name="Verify"

-					refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif">

-					<postAction

-						id="org.eclipse.papyrus.applystereotypeactionprovider">

-						<stereotypesToApply>

-							<stereotype

-								stereotypeName="SysML::Requirements::Verify" />

-						</stereotypesToApply>

-					</postAction>

-				</aspectTool>

-			

-		

-		

-			<!-- Attention : The element is added manually, can combine the two links comment and constraint, and therefore is not deleted -->

-			<aspectTool description="Create a new Link" id="package.tool.link"

-				name="Link" refToolId="clazz.tool.link">

-			</aspectTool>

-			

-			</drawer>

-		</content>

-</paletteDefinition>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml
deleted file mode 100644
index 2ea79e3d5f9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml
+++ /dev/null
@@ -1,550 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.infra.core.papyrusDiagram">
-	<creationCommand
-		creationCommandClass="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand"
-		creationCondition="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreationCondition"
-		icon="icons/obj16/Diagram_Requirement.gif"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"
-		language="sysml"
-		label="Requirement Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramEditorFactory"
-		icon="icons/obj16/Diagram_Requirement.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"
-		name="Create a new Requirement Diagram"
-		description="Create a new Requirement Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.sysml.diagram.requirement.CreateRequirementDiagramWithNavigationHandler"
-		commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand">
-		<activeWhen>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor" />
-			</with>
-		</activeWhen>
-	</handler>
-</extension>
-
-<!-- Diagram creation command registration in menu and toolbar -->
-<extension point="org.eclipse.ui.menus">
-
-	<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
-	<menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"
-			icon="icons/obj16/Diagram_Requirement.gif" label="Create a new Requirement Diagram"
-			style="push" tooltip="Create a new Requirement Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-					
-		</command>
-	</menu>
-	</menuContribution>
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.papyrus.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"
-			icon="icons/obj16/Diagram_Requirement.gif" label="Create a new Requirement Diagram"
-			style="push" tooltip="Create a new Requirement Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"
-			icon="icons/obj16/Diagram_Requirement.gif"
-			label="Create a new Requirement Diagram"
-			style="push"
-			tooltip="Create a new Requirement Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
-	name="SYSML_Requirement">
-	
-	<paletteDefinition ID="SYSML_Requirement"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="SYSML_Requirement" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/requirement.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.sysml.diagram.requirement"/>
-	</paletteDefinition>
-</extension>
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.RequirementDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="RequirementDiagram"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Property_ClassAttributeLabel, Reception_ReceptionLabel, Operation_ClassOperationLabel, Class_ClassNestedClassifierLabel, Interface_ClassNestedClassifierLabel, Enumeration_ClassNestedClassifierLabel, PrimitiveType_ClassNestedClassifierLabel, DataType_ClassNestedClassifierLabel, Signal_ClassNestedClassifierLabel"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge, Realization_Edge, PackageImport_Edge"/>
-		
-		<object id="elementtype.node"
-	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-	       
-	     <method
-	        name="getSemanticHint()"
-			value="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN">
-		</method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
-	
-		<object id="elementtype.edge"
-	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-	       
-	     <method
-	        name="getSemanticHint()"
-			value="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge, Realization_Edge, PackageImport_Edge">
-		</method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
-	
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Package" -->
-		<object id="uml.Package" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Package"/>
-		</object>
-		
-		<!-- "uml.Class" -->
-		<object id="uml.Class" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Class"/>
-		</object>
-		
-		<!-- "uml.NamedElement" -->
-		<object id="uml.NamedElement" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.NamedElement"/>
-		</object>
-		
-		<!-- "uml.Comment" -->
-		<object id="uml.Comment" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Comment"/>
-		</object>
-		
-		<!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"/>
-		</object>
-		
-		<!-- "uml.Property" -->
-		<object id="uml.Property" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Property"/>
-		</object>
-		
-		<!-- "uml.Reception" -->
-		<object id="uml.Reception" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Reception"/>
-		</object>
-		
-		<!-- "uml.Operation" -->
-		<object id="uml.Operation" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Operation"/>
-		</object>
-		
-		<!-- "uml.Interface" -->
-		<object id="uml.Interface" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Interface"/>
-		</object>
-		
-		<!-- "uml.Enumeration" -->
-		<object id="uml.Enumeration" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Enumeration"/>
-		</object>
-		
-		<!-- "uml.PrimitiveType" -->
-		<object id="uml.PrimitiveType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PrimitiveType"/>
-		</object>
-		
-		<!-- "uml.DataType" -->
-		<object id="uml.DataType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.DataType"/>
-		</object>
-		
-		<!-- "uml.Signal" -->
-		<object id="uml.Signal" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Signal"/>
-		</object>
-		
-		<!-- "uml.Abstraction" -->
-		<object id="uml.Abstraction" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Abstraction"/>
-		</object>
-		
-		<!-- "uml.Dependency" -->
-		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Dependency"/>
-		</object>
-		
-		<!-- "uml.Realization" -->
-		<object id="uml.Realization" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Realization"/>
-		</object>
-		
-		<!-- "uml.PackageImport" -->
-		<object id="uml.PackageImport" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PackageImport"/>
-		</object>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Package, uml.Class, uml.NamedElement, uml.Comment, uml.Constraint, uml.Property, uml.Reception, uml.Operation, uml.Interface, uml.Enumeration, uml.PrimitiveType, uml.DataType, uml.Signal"/>
-		
-		<!-- Additional activation contexts for edges semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
-			elements="uml.Abstraction, uml.Dependency, uml.Realization, uml.PackageImport"/>
-			
-	</viewProvider>	
-</extension>
-
-<!-- Diagram edit part providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-	
-	<!-- Diagram edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.RequirementDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.sysml.diagram.requirement.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="RequirementDiagram"/>
-		</object>
-		<context views="org.eclipse.papyrus.sysml.diagram.requirement.Diagram"/>	
-	</editpartProvider>
-	
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
-		</object>
-		<object
-			id="CLASS"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Class_Shape, Class_NameLabel, Class_AttributeCompartment, Class_OperationCompartment, Class_NestedClassifierCompartment"/>
-		</object>
-		<object
-			id="CLASS_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Class_Shape_CN, Class_NameLabel_CN, Class_AttributeCompartment_CN, Class_OperationCompartment_CN, Class_NestedClassifierCompartment_CN"/>
-		</object>
-		<object
-			id="DEFAULT_NAMED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="NamedElement_Shape, NamedElement_NameLabel"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
-		</object>
-		
-		<object
-			id="CLASS_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Property_ClassAttributeLabel"/>
-		</object>
-		<object
-			id="CLASS_RECEPTION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Reception_ReceptionLabel"/>
-		</object>
-		<object
-			id="CLASS_OPERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Operation_ClassOperationLabel"/>
-		</object>
-		<object
-			id="CLASS_CLASS_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Class_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_INTERFACE_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Interface_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_ENUMERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Enumeration_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_PRIMITIVE_TYPE_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="PrimitiveType_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_DATA_TYPE_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="DataType_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_SIGNAL_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Signal_ClassNestedClassifierLabel"/>
-		</object>
-		
-		<object
-			id="ABSTRACTION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Abstraction_Edge, Abstraction_NameLabel, Abstraction_StereotypeLabel"/>
-		</object>
-		<object
-			id="CONTAINMENT_LINK"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Element_ContainmentEdge"/>
-		</object>
-		<object
-			id="DEPENDENCY"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Dependency_Edge, Dependency_NameLabel, Dependency_StereotypeLabel"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Comment_AnnotatedElementEdge"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Constraint_ConstrainedElementEdge"/>
-		</object>
-		<object
-			id="REALIZATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Realization_Edge, Realization_StereotypeLabel, Realization_NameLabel"/>
-		</object>
-		<object
-			id="PACKAGE_IMPORT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="PackageImport_Edge, PackageImport_StereotypeLabel"/>
-		</object>
-		
-		<context views="PACKAGE, PACKAGE_CN, CLASS, CLASS_CN, NAMED_ELEMENT, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"/>
-		<context views="CLASS_PROPERTY_CLN, CLASS_RECEPTION_CLN, CLASS_OPERATION_CLN, CLASS_CLASS_CLN, CLASS_INTERFACE_CLN, CLASS_ENUMERATION_CLN, CLASS_PRIMITIVE_TYPE_CLN, CLASS_DATA_TYPE_CLN, CLASS_SIGNAL_CLN"/>
-		<context views="ABSTRACTION, CONTAINMENT_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, REALIZATION, PACKAGE_IMPORT"/>
-		
-	</editpartProvider>
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.sysml.diagram.requirement.provider.CustomEditPolicyProvider">
-		<Priority name="Low"/>
-	</editpolicyProvider>
-</extension>
-
-<!-- Preference pages declaration -->
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-
-	<!-- Diagram Preference pages declaration -->
-	<page
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		name="Requirement Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.RequirementDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	
-	
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.NamedElementPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.NamedElementPreferencePage"
-		name="NamedElement">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.AbstractionPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.AbstractionPreferencePage"
-		name="Abstraction">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ContainmentLinkPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ContainmentLinkPreferencePage"
-		name="ContainmentLink">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DependencyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DependencyPreferencePage"
-		name="Dependency">
-	</page>
-	
-	
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.RealizationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.RealizationPreferencePage"
-		name="Realization">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackageImportPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackageImportPreferencePage"
-		name="PackageImport">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ReceptionPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ReceptionPreferencePage"
-		name="Reception">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.OperationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.OperationPreferencePage"
-		name="Operation">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.InterfacePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.InterfacePreferencePage"
-		name="Interface">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.EnumerationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.EnumerationPreferencePage"
-		name="Enumeration">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PrimitiveTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PrimitiveTypePreferencePage"
-		name="PrimitiveType">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DataTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DataTypePreferencePage"
-		name="DataType">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.SignalPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.SignalPreferencePage"
-		name="Signal">
-	</page>
-			
-
-</extension>
-
-<!-- // Start of user code custom extensions 
-  -->
-
-<!-- Insert custom extensions here. -->
-  
-<!-- // End of user code 
-  -->
-
-</plugin>
\ No newline at end of file
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.properties
deleted file mode 100644
index 55423f77a07..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.properties
+++ /dev/null
@@ -1,12 +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:
-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
-##################################################################################
-pluginName=SysML Requirement Diagram
-providerName=Eclipse Modeling Project
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
deleted file mode 100644
index a1f7f3a7ffa..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
+++ /dev/null
@@ -1,857 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-	<creationCommand
-		creationCommandClass="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand"
-		creationCondition="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreationCondition"
-		icon="icons/obj16/Diagram_Requirement.gif"
-		id="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"
-		language="sysml"
-		label="SysML Requirement Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramEditorFactory"
-		icon="icons/obj16/Diagram_Requirement.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"
-		name="Create a new Requirement Diagram"
-		description="Create a new Requirement Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.RequirementDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="RequirementDiagram"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.CustomInheritedElementViewProvider">
-		<Priority name="Low"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Property_ClassAttributeLabel, Reception_ReceptionLabel, Operation_ClassOperationLabel, Class_ClassNestedClassifierLabel, Interface_ClassNestedClassifierLabel, Enumeration_ClassNestedClassifierLabel, PrimitiveType_ClassNestedClassifierLabel, DataType_ClassNestedClassifierLabel, Signal_ClassNestedClassifierLabel"/>
-		
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge"/>
-		
-		<object id="elementtype.node"
-	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-	     <method
-	        name="getSemanticHint()"
-			value="Package_Shape, Package_Shape_CN, Class_Shape, Class_Shape_CN, NamedElement_Shape, Comment_Shape, Comment_Shape_CN, Constraint_Shape, Constraint_Shape_CN">
-		</method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
-	
-		<object id="elementtype.edge"
-	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
-	     <method
-	        name="getSemanticHint()"
-			value="Abstraction_Edge, Element_ContainmentEdge, Dependency_Edge, Comment_AnnotatedElementEdge, Constraint_ConstrainedElementEdge">
-		</method>
-		</object>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
-	
-		
-		<!-- Additional descriptors provided in case the semantic hint is is not provided -->	
-		
-		<!-- "uml.Package" -->
-		<object id="uml.Package" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Package"/>
-		</object>
-		
-		<!-- "uml.Class" -->
-		<object id="uml.Class" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Class"/>
-		</object>
-		
-		<!-- "uml.NamedElement" -->
-		<object id="uml.NamedElement" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.NamedElement"/>
-		</object>
-		
-		<!-- "uml.Comment" -->
-		<object id="uml.Comment" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Comment"/>
-		</object>
-		
-		<!-- "uml.Constraint" -->
-		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Constraint"/>
-		</object>
-		
-		<!-- "uml.Property" -->
-		<object id="uml.Property" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Property"/>
-		</object>
-		
-		<!-- "uml.Reception" -->
-		<object id="uml.Reception" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Reception"/>
-		</object>
-		
-		<!-- "uml.Operation" -->
-		<object id="uml.Operation" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Operation"/>
-		</object>
-		
-		<!-- "uml.Interface" -->
-		<object id="uml.Interface" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Interface"/>
-		</object>
-		
-		<!-- "uml.Enumeration" -->
-		<object id="uml.Enumeration" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Enumeration"/>
-		</object>
-		
-		<!-- "uml.PrimitiveType" -->
-		<object id="uml.PrimitiveType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PrimitiveType"/>
-		</object>
-		
-		<!-- "uml.DataType" -->
-		<object id="uml.DataType" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.DataType"/>
-		</object>
-		
-		<!-- "uml.Signal" -->
-		<object id="uml.Signal" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Signal"/>
-		</object>
-		
-		<!-- "uml.Abstraction" -->
-		<object id="uml.Abstraction" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Abstraction"/>
-		</object>
-		
-		<!-- "uml.Dependency" -->
-		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.Dependency"/>
-		</object>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Package, uml.Class, uml.NamedElement, uml.Comment, uml.Constraint, uml.Property, uml.Reception, uml.Operation, uml.Interface, uml.Enumeration, uml.PrimitiveType, uml.DataType, uml.Signal"/>
-		
-		<!-- Additional activation contexts for edges semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
-			elements="uml.Abstraction, uml.Dependency"/>
-			
-	</viewProvider>
-	
-		<!-- Custom graphical types view provider -->
-</extension>
-
-<!-- Diagram edit part providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-	
-	<!-- Diagram edit part provider -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.RequirementDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.sysml.diagram.requirement.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="RequirementDiagram"/>
-		</object>
-		<context views="org.eclipse.papyrus.sysml.diagram.requirement.Diagram"/>	
-	</editpartProvider>
-	
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape, Package_NameLabel, Package_PackagedElementCompartment"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Package_Shape_CN, Package_NameLabel_CN, Package_PackagedElementCompartment_CN"/>
-		</object>
-		<object
-			id="CLASS"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Class_Shape, Class_NameLabel, Class_AttributeCompartment, Class_OperationCompartment, Class_NestedClassifierCompartment"/>
-		</object>
-		<object
-			id="CLASS_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Class_Shape_CN, Class_NameLabel_CN, Class_AttributeCompartment_CN, Class_OperationCompartment_CN, Class_NestedClassifierCompartment_CN"/>
-		</object>
-		<object
-			id="DEFAULT_NAMED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="NamedElement_Shape, NamedElement_NameLabel"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape, Comment_BodyLabel"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Comment_Shape_CN, Comment_BodyLabel_CN"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Constraint_Shape_CN, Constraint_NameLabel_CN, Constraint_FloatingNameLabel_CN"/>
-		</object>
-		
-		<object
-			id="CLASS_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Property_ClassAttributeLabel"/>
-		</object>
-		<object
-			id="CLASS_RECEPTION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Reception_ReceptionLabel"/>
-		</object>
-		<object
-			id="CLASS_OPERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Operation_ClassOperationLabel"/>
-		</object>
-		<object
-			id="CLASS_CLASS_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Class_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_INTERFACE_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Interface_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_ENUMERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Enumeration_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_PRIMITIVE_TYPE_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="PrimitiveType_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_DATA_TYPE_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="DataType_ClassNestedClassifierLabel"/>
-		</object>
-		<object
-			id="CLASS_SIGNAL_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="Signal_ClassNestedClassifierLabel"/>
-		</object>
-		
-		<object
-			id="ABSTRACTION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Abstraction_Edge, Abstraction_NameLabel, Abstraction_StereotypeLabel"/>
-		</object>
-		<object
-			id="CONTAINMENT_LINK"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Element_ContainmentEdge"/>
-		</object>
-		<object
-			id="DEPENDENCY"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Dependency_Edge, Dependency_NameLabel, Dependency_StereotypeLabel"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Comment_AnnotatedElementEdge"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="Constraint_ConstrainedElementEdge"/>
-		</object>
-		
-		<context views="PACKAGE, PACKAGE_CN, CLASS, CLASS_CN, DEFAULT_NAMED_ELEMENT, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"/>
-		<context views="CLASS_PROPERTY_CLN, CLASS_RECEPTION_CLN, CLASS_OPERATION_CLN, CLASS_CLASS_CLN, CLASS_INTERFACE_CLN, CLASS_ENUMERATION_CLN, CLASS_PRIMITIVE_TYPE_CLN, CLASS_DATA_TYPE_CLN, CLASS_SIGNAL_CLN"/>
-		<context views="ABSTRACTION, CONTAINMENT_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"/>
-		
-	</editpartProvider>
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.sysml.diagram.requirement.provider.CustomEditPolicyProvider">
-		<Priority name="Low"/>
-	</editpolicyProvider>
-</extension>
-
-<!-- Preference pages declaration -->
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">
-
-	<!-- Diagram Preference pages declaration -->
-	<page
-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences"
-		name="Requirement Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.RequirementDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-			
-			
-			
-			
-			
-			
-			
-			
-
-</extension>
-
-
-<!-- // Start of user code custom extensions 
-  -->
-
-<!-- Insert custom extensions here. -->
-  <extension
-      id="ep-provider"
-      point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-   <editpartProvider
-         class="org.eclipse.papyrus.sysml.diagram.requirement.provider.CustomRequirementEditPartProvider">
-      <Priority
-            name="High">
-      </Priority>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Diagram"
-            id="generated-diagram">
-         <method name="getType()" value="Requirement"/>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Node"
-            id="generated-nodes">
-            <method name="getType()" value="Dependency_Shape,AssociationClass_Shape,Association_Shape,InstanceSpecification_Shape,Component_Shape,Signal_Shape,Interface_Shape,Model_Shape,Enumeration_Shape,Package_Shape,InformationItem_Shape,Class_Shape,PrimitiveType_Shape,DataType_Shape,,Comment_Shape,Diagram_ShortcutShape,DurationObservation_Shape,TimeObservation_Shape,NamedElement_DefaultShape,Property_ClassAttributeLabel,Property_ComponentAttributeLabel,Property_SignalAttributeLabel,Property_InterfaceAttributeLabel,Property_PrimitiveTypeAttributeLabel,Property_DataTypeAttributeLabel,Class_ClassNestedClassifierLabel,Class_ComponentNestedClassifierLabel,Class_InterfaceNestedClassifierLabel,Operation_ClassOperationLabel,Operation_ComponentOperationLabel,Operation_InterfaceOperationLabel,Operation_PrimitiveTypeOperationLabel,Operation_DataTypeOperationLabel,ConnectableElementTemplateParameter_TemplateParameterLabel,OperationTemplateParameter_TemplateParameterLabel,ClassifierTemplateParameter_TemplateParameterLabel,TemplateParameter_TemplateParameterLabel,EnumerationLiteral_LiteralLabel,Reception_ReceptionLabel,Reception_InterfaceReceptionLabel,Slot_SlotLabel,RedefinableTemplateSignature_Shape,TemplateSignature_Shape,InstanceSpecification_Shape_CN,Component_Shape_CN,Signal_Shape_CN,Interface_Shape_CN,Model_Shape_CN,Enumeration_Shape_CN,Package_Shape_CN,InformationItem_Shape_CN,Class_Shape_CN,PrimitiveType_Shape_CN,DataType_Shape_CN,Comment_Shape_CN,_CN,Interface_ClassNestedClassifierLabel,Interface_ComponentNestedClassifierLabel,Interface_InterfaceNestedClassifierLabel,Enumeration_ClassNestedClassifierLabel,Enumeration_ComponentNestedClassifierLabel,Enumeration_InterfaceNestedClassifierLabel,PrimitiveType_ClassNestedClassifierLabel,PrimitiveType_ComponentNestedClassifierLabel,PrimitiveType_InterfaceNestedClassifierLabel,DataType_ClassNestedClassifierLabel,DataType_ComponentNestedClassifierLabel,DataType_InterfaceNestedClassifierLabel,Signal_ClassNestedClassifierLabel,Signal_ComponentNestedClassifierLabel,Signal_InterfaceNestedClassifierLabel,Component_ClassNestedClassifierLabel,Component_InterfaceNestedClassifierLabel,Component_ComponentNestedClassifierLabel"/>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Edge"
-            id="generated-links">
-            <method name="getType()" value="AssociationClass_TetherEdge,AssociationClass_Edge,Association_Edge,Association_BranchEdge,Generalization_Edge,InterfaceRealization_Edge,Substitution_Edge,Realization_Edge,Abstraction_Edge,Usage_Edge,Dependency_Edge,Dependency_BranchEdge,ElementImport_Edge,PackageImport_Edge,PackageMerge_Edge,ProfileApplication_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,TemplateBinding_Edge,GeneralizationSet_Edge,InstanceSpecification_Edge,Element_ContainmentEdge,TimeObservation_EventEdge,DurationObservation_EventEdge,InformationFlow_Edge,Constraint_ContextEdge"/>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Node"
-            id="generated-labels">
-            <method name="getType()" value="Dependency_MultiNameLabel,Dependency_FloatingNameLabel,AssociationClass_NameLabel,AssociationClass_FloatingNameLabel,Association_FloatingNameLabel,InstanceSpecification_NameLabel,InstanceSpecification_FloatingNameLabel,Component_NameLabel,Component_FloatingNameLabel,Signal_NameLabel,Signal_FloatingNameLabel,Interface_NameLabel,Interface_FloatingNameLabel,Model_NameLabel,Enumeration_NameLabel,Enumeration_FloatingNameLabel,Package_NameLabel,InformationItem_NameLabel,InformationItem_FloatingNameLabel,Class_NameLabel,Class_FloatingNameLabel,PrimitiveType_NameLabel,PrimitiveType_FloatingNameLabel,DataType_NameLabel,DataType_FloatingNameLabel,Constraint_NameLabel,Constraint_BodyLabel,Comment_BodyLabel,Diagram_NameLabel,DurationObservation_FloatingNameLabel,DurationObservation_StereotypeLabel,TimeObservation_FloatingNameLabel,TimeObservation_StereotypeLabel,NamedElement_NameLabel,InstanceSpecification_NameLabel_CN,InstanceSpecification_FloatingNameLabel_CN,Component_NameLabel_CN,Component_FloatingNameLabel_CN,Signal_NameLabel_CN,Signal_FloatingNameLabel_CN,Interface_NameLabel_CN,Interface_FloatingNameLabel_CN,Model_NameLabel_CN,Enumeration_NameLabel_CN,Enumeration_FloatingNameLabel_CN,Package_NameLabel_CN,InformationItem_NameLabel_CN,InformationItem_FloatingNameLabel_CN,Class_NameLabel_CN,Class_FloatingNameLabel_CN,PrimitiveType_NameLabel_CN,PrimitiveType_FloatingNameLabel_CN,DataType_NameLabel_CN,DataType_FloatingNameLabel_CN,Comment_BodyLabel_CN,Constraint_NameLabel_CN,Constraint_FloatingNameLabel_CN"/>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Node"
-            id="generated-compartments">
-            <method name="getType()" value="Class_AttributeCompartment_CN,Class_OperationCompartment_CN,Class_NestedClassifierCompartment_CN,Component_AttributeCompartment_CN,Component_OperationCompartment_CN,Component_NestedClassifierCompartment_CN,Signal_AttributeCompartment_CN,Interface_AttributeCompartment_CN,Interface_OperationCompartment_CN,Interface_NestedClassifierCompartment_CN,PrimitiveType_AttributeCompartment_CN,PrimitiveType_OperationCompartment_CN,DataType_AttributeCompartment_CN,DataType_OperationCompartment_CN,Model_PackagedElementCompartment_CN,Package_PackagedElementCompartment_CN,Enumeration_LiteralCompartment_CN,InstanceSpecification_SlotCompartment_CN,Class_AttributeCompartment,Class_OperationCompartment,Class_NestedClassifierCompartment,Component_AttributeCompartment,Component_OperationCompartment,Component_NestedClassifierCompartment,Interface_AttributeCompartment,Interface_OperationCompartment,Interface_NestedClassifierCompartment,PrimitiveType_AttributeCompartment,PrimitiveType_OperationCompartment,DataType_AttributeCompartment,DataType_OperationCompartment,AssociationClass_AttributeCompartment,InstanceSpecification_SlotCompartment,Signal_AttributeCompartment,Model_PackagedElementCompartment,Package_PackagedElementCompartment,Enumeration_LiteralCompartment,AssociationClass_OperationCompartment,AssociationClass_NestedClassifierCompartment,RedefinableTemplateSignature_TemplateParameterCompartment,TemplateSignature_TemplateParameterCompartment"/>
-      </object>
-      <object
-            id="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
-      </object>
-   </editpartProvider>
-</extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
-		<diagramMappings diagramID="RequirementDiagram">
-			<mapping
-				humanReadableType="attributes"
-				type="Class_AttributeCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="Class_OperationCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="nested classifiers"
-				type="Class_NestedClassifierCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="Component_AttributeCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="Component_OperationCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="nested classifiers"
-				type="Component_NestedClassifierCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="Signal_AttributeCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="Interface_AttributeCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="Interface_OperationCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="nested classifiers"
-				type="Interface_NestedClassifierCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="PrimitiveType_AttributeCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="PrimitiveType_OperationCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="DataType_AttributeCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="DataType_OperationCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="packaged elements"
-				type="Model_PackagedElementCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="packaged elements"
-				type="Package_PackagedElementCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="literals"
-				type="Enumeration_LiteralCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="slots"
-				type="InstanceSpecification_SlotCompartment_CN">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="Class_AttributeCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="Class_OperationCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="nested classifiers"
-				type="Class_NestedClassifierCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="Component_AttributeCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="Component_OperationCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="nested classifiers"
-				type="Component_NestedClassifierCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="Interface_AttributeCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="Interface_OperationCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="nested classifiers"
-				type="Interface_NestedClassifierCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="PrimitiveType_AttributeCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="PrimitiveType_OperationCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="DataType_AttributeCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="DataType_OperationCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="AssociationClass_AttributeCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="slots"
-				type="InstanceSpecification_SlotCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="attributes"
-				type="Signal_AttributeCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="packaged elements"
-				type="Model_PackagedElementCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="packaged elements"
-				type="Package_PackagedElementCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="literals"
-				type="Enumeration_LiteralCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="operations"
-				type="AssociationClass_OperationCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="nested classifiers"
-				type="AssociationClass_NestedClassifierCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="TemplateParameter"
-				type="RedefinableTemplateSignature_TemplateParameterCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="TemplateParameter"
-				type="TemplateSignature_TemplateParameterCompartment">
-			</mapping>
-			<mapping
-				humanReadableType="SourceRole"
-				type="AssociationClass_SourceRoleLabel">
-			</mapping>
-			<mapping
-				humanReadableType="TargetRole"
-				type="AssociationClass_TargetRoleLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Association_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Name"
-				type="Association_NameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="TargetRole"
-				type="Association_TargetRoleLabel">
-			</mapping>
-			<mapping
-				humanReadableType="SourceRole"
-				type="Association_SourceRoleLabel">
-			</mapping>
-			<mapping
-				humanReadableType="SourceMultiplicity"
-				type="Association_SourceMultiplicityLabel">
-			</mapping>
-			<mapping
-				humanReadableType="TargetMultiplicity"
-				type="Association_TargetMultiplicityLabel">
-			</mapping>
-			<mapping
-				humanReadableType="TargetRole"
-				type="Association_BranchRoleLabel">
-			</mapping>
-			<mapping
-				humanReadableType="TargetMultiplicity"
-				type="Association_BranchMultiplicityLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Generalization_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="InterfaceRealization_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Name"
-				type="InterfaceRealization_NameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Substitution_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Name"
-				type="Substitution_NameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Realization_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Name"
-				type="Realization_NameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Name"
-				type="Abstraction_NameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Abstraction_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Name"
-				type="Usage_NameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Usage_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Name"
-				type="Dependency_NameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Dependency_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Alias"
-				type="ElementImport_AliasLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="ElementImport_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="PackageImport_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="PackageMerge_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="TemplateParameterSubstitution"
-				type="TemplateBinding_SubstitutionLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="TemplateBinding_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="GeneralizationSet_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="SourceRole"
-				type="InstanceSpecification_SourceRoleLabel">
-			</mapping>
-			<mapping
-				humanReadableType="TargetRole"
-				type="InstanceSpecification_TargetRoleLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="InformationFlow_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="Constraint_KeywordLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="InstanceSpecification_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Component_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Signal_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Interface_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Enumeration_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="InformationItem_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Class_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="PrimitiveType_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="DataType_FloatingNameLabel_CN">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Dependency_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="AssociationClass_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Association_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="InstanceSpecification_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Component_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Signal_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Interface_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Enumeration_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="InformationItem_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="Class_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="PrimitiveType_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="DataType_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="DurationObservation_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="DurationObservation_StereotypeLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Floating Label"
-				type="TimeObservation_FloatingNameLabel">
-			</mapping>
-			<mapping
-				humanReadableType="Stereotype"
-				type="TimeObservation_StereotypeLabel">
-			</mapping>
-		</diagramMappings>
-	</extension>
-<extension
-      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
-   <diagramReconciler
-         diagramType="RequirementDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_1_0"
-         source="1.0.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="RequirementDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-   <diagramReconciler
-         diagramType="RequirementDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_2_0"
-         source="1.1.0"
-         target="1.3.0">
-   </diagramReconciler>
-</extension>
-<!-- // End of user code 
-  -->
-
-
-   <extension
-         point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
-      <visualTypeProvider
-            class="org.eclipse.papyrus.sysml.diagram.requirement.provider.RequirementVisualTypeProvider"
-            diagramType="RequirementDiagram">
-      </visualTypeProvider>
-   </extension>
-   
-   <extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<paletteDefinition
-		ID="org.eclipse.papyrus.sysml.diagram.requirement.paletteconfiguration"
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="Papyrus SysML requirement editor Plugin Palette" 
-		path="palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram this palette tools relate to -->
-		<editor
-			id="org.eclipse.papyrus.sysml.diagram.requirement">
-		</editor>
-	</paletteDefinition>
-</extension>
-</plugin>
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
deleted file mode 100644
index d7e9d8a6119..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

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

-	    <artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.sysml.diagram.requirement</artifactId>

-	<version>3.0.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-gen/org/eclipse/papyrus/sysml/diagram/requirement/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/Activator.java
deleted file mode 100644
index 46d1755d20d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/Activator.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:
- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.sysml.diagram.requirement.preferences.RequirementDiagramPreferenceInitializer;
-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.sysml.diagram.requirement";
-
-	/** The plug-in shared instance */
-	private static Activator plugin;
-
-	/** The logging helper */
-	public static LogHelper log;
-
-	/** The plug-in Preference store */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(PLUGIN_ID);
-
-	/** Default constructor */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the login helper
-		log = new LogHelper(plugin);
-
-		// register the preference store
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-
-		// Preferences initialization
-		RequirementDiagramPreferenceInitializer diagramPreferenceInitializer = new RequirementDiagramPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (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 getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 *
-	 * @return Shared Preference Store.
-	 */
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
deleted file mode 100644
index 9cd0ea0c7c4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
+++ /dev/null
@@ -1,52 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- * Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-/**
- * Represents the creation command for a SysML requirements diagram
- *
- * @author Laurent Wouters
- */
-public class RequirementDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDefaultDiagramName() {
-		return "New Requirements Diagram"; // //$NON-NLS-1$
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return ElementTypes.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
deleted file mode 100644
index 4bcb876fabf..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
+++ /dev/null
@@ -1,26 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class RequirementDiagramEditorFactory extends GmfEditorFactory {
-
-	public RequirementDiagramEditorFactory() {
-		super(RequirementDiagramForMultiEditor.class, ElementTypes.DIAGRAM_ID);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java
deleted file mode 100644
index ad4bba4a0bb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java
+++ /dev/null
@@ -1,134 +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:
- *   CEA LIST- Initial API and implementation
- *   Nizar GUEDIDI (CEA LIST)- modification
- *   Christian W. Damus (CEA) - bug 392301
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.editor.BackboneException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization;
-import org.eclipse.papyrus.sysml.diagram.requirement.part.RequirementDiagramEditor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-
-/**
- * An editor to be used in multitabs editor. This editor extends the original UML Diagram.
- *
- */
-public class RequirementDiagramForMultiEditor extends RequirementDiagramEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/Diagram_Requirement.gif";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(RequirementDiagramForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	private Image titleImage;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 *
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 *
-	 */
-	public RequirementDiagramForMultiEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws BackboneException, ServiceException {
-		super(servicesRegistry, diagram);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		setPartName(LabelInternationalization.getInstance().getDiagramLabel(getDiagram()));
-		titleImage = DIAG_IMG_DESC.createImage();
-		setTitleImage(titleImage);
-	}
-
-	@Override
-	public void dispose() {
-		if (titleImage != null) {
-			titleImage.dispose();
-			titleImage = null;
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setInput(IEditorInput input) {
-		try {
-			// Provide an URI with fragment in order to reuse the same Resource
-			// and set the diagram to the fragment.
-			URIEditorInput uriInput = new URIEditorInput(EcoreUtil.getURI(getDiagram()));
-			doSetInput(uriInput, true);
-		} catch (CoreException x) {
-			String title = "Problem opening";
-			String msg = "Cannot open input element:";
-			Shell shell = getSite().getShell();
-			ErrorDialog.openError(shell, title, msg, x.getStatus());
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createGraphicalViewer(Composite parent) {
-		splitter = parent;
-		super.createGraphicalViewer(parent);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setFocus() {
-		splitter.setFocus();
-		super.setFocus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEditingDomainID() {
-		return "org.eclipse.papyrus.sysml.diagram.requirement.EditingDomain";
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java
deleted file mode 100644
index cfae03d4a72..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java
+++ /dev/null
@@ -1,49 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
-import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;
-
-
-/**
- * 
- * @Generated NOT //change the super class
- */
-public class RequirementDiagramEditPart extends PapyrusDiagramEditPart {
-
-
-
-
-	public RequirementDiagramEditPart(View view) {
-		super(view);
-	}
-
-	@Override
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy());
-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());
-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java
deleted file mode 100644
index a66a022ed33..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,52 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.GraphicalTypeRegistry;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
-
-/** Customization of the DND edit policy for the Requirement Diagram */
-public class RequirementDiagramDragDropEditPolicy extends ClassDiagramDragDropEditPolicy {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeVisualID(View containerView, EObject domainElement) {
-		String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType());
-		if (IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getLinkWithClassVisualID(EObject domainElement) {
-		String domainType = registry.getEdgeGraphicalType(domainElement);
-		if (IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) {
-			return null; // undefined
-		}
-		return domainType;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java
deleted file mode 100644
index 90a8202768b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java
+++ /dev/null
@@ -1,26 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class RequirementDiagramViewFactory extends DiagramViewFactory {
-
-	@Override
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/part/RequirementDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/part/RequirementDiagramEditor.java
deleted file mode 100644
index cad1483ef0f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/part/RequirementDiagramEditor.java
+++ /dev/null
@@ -1,56 +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:
- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.part;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;
-
-/**
- * Diagram editor that extends the UMLDiagramEditor editor.
- */
-public class RequirementDiagramEditor extends org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param servicesRegistry
-	 *            registry to find services (label providers, editing domain, etc.)
-	 * @param diagram
-	 *            edited diagram
-	 * @throws ServiceException
-	 *             exception thrown ni case of issue during initialization
-	 */
-	public RequirementDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, diagram);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
deleted file mode 100644
index 07677239eab..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class AbstractionPreferencePage extends RequirementDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Abstraction"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public AbstractionPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Abstraction"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java
deleted file mode 100644
index 5ba3aaa4584..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,45 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class CommentPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index 23f96109921..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,45 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class ConstraintPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java
deleted file mode 100644
index 38985102b72..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java
+++ /dev/null
@@ -1,44 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class ContainmentLinkPreferencePage extends RequirementDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ContainmentLink"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public ContainmentLinkPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ContainmentLink"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java
deleted file mode 100644
index 8983bb2cb42..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class DataTypePreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_DataType"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public DataTypePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_DataType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
deleted file mode 100644
index 6e63109724e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class DependencyPreferencePage extends RequirementDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_DependencyLink"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public DependencyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_DependencyLink"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java
deleted file mode 100644
index 084d0559a65..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class EnumerationPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Enumeration"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public EnumerationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Enumeration"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java
deleted file mode 100644
index 96d23f5c491..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class InterfacePreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Interface"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public InterfacePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Interface"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
deleted file mode 100644
index 6228737c50b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
+++ /dev/null
@@ -1,48 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class NamedElementPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_DefaultNamedElement"; //$NON-NLS-1$
-
-
-	/** Default constructor */
-	public NamedElementPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_DefaultNamedElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 50);
-	}
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java
deleted file mode 100644
index 7288117d01b..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class OperationPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Operation"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public OperationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Operation"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
deleted file mode 100644
index 89471a0023c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class PackageImportPreferencePage extends RequirementDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_PackageImport"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public PackageImportPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_PackageImport"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
deleted file mode 100644
index 48780806add..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
+++ /dev/null
@@ -1,103 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class PackagePreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Package"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public PackagePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Package"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// Initialize default visibility for compartments in preference page.
-		for (String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference page.
-		for (String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java
deleted file mode 100644
index 5caa28773e0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class PrimitiveTypePreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_PrimitiveType"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public PrimitiveTypePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_PrimitiveType"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java
deleted file mode 100644
index 254b22afddb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class PropertyPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Property"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public PropertyPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Property"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
deleted file mode 100644
index 782d4b76e45..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class RealizationPreferencePage extends RequirementDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Realization"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public RealizationPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Realization"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java
deleted file mode 100644
index 53cb8baf8ca..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class ReceptionPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Reception"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public ReceptionPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Reception"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
deleted file mode 100644
index 4852b83277e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
+++ /dev/null
@@ -1,33 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class RequirementDiagramGeneralPreferencePage extends DiagramPreferencePage {
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @G
-	 */
-	public RequirementDiagramGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-		setPreferenceKey(ElementTypes.DIAGRAM_ID);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java
deleted file mode 100644
index 18fcead93b7..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java
+++ /dev/null
@@ -1,74 +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:

- * CEA LIST- Initial API and implementation

- * Nizar GUEDIDI (CEA LIST)- modification

- *

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

-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class RequirementDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {

-

-	/** The list of label names for this link */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public RequirementDiagramLinkPreferencePage() {

-		labelsList = new ArrayList<String>();

-		initializeLabelsList();

-		Collections.unmodifiableList(labelsList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java
deleted file mode 100644
index 91eb31da72d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java
+++ /dev/null
@@ -1,120 +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:

- * CEA LIST- Initial API and implementation

- * Nizar GUEDIDI (CEA LIST)- modification

- *

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

-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedCompartmentGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;

-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-public class RequirementDiagramNodePreferencePage extends AbstractPapyrusNodePreferencePage {

-

-	/** The list owning the names of compartments */

-	protected List<String> compartmentNamesList;

-

-	/** The list owning the names of compartment that have a title */

-	protected List<String> compartmentTitlesList;

-

-	/** The list of label names for this node */

-	protected List<String> labelsList;

-

-	/** Constructor */

-	public RequirementDiagramNodePreferencePage() {

-		this.labelsList = new ArrayList<String>();

-		this.compartmentNamesList = new ArrayList<String>();

-		this.compartmentTitlesList = new ArrayList<String>();

-

-		initializeLabelsList();

-		initializeCompartmentNamesList();

-		initializeCompartmentTitlesList();

-

-		Collections.unmodifiableList(labelsList);

-		Collections.unmodifiableList(compartmentNamesList);

-		Collections.unmodifiableList(compartmentTitlesList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-

-		// Add compartments visibility group

-		if (!compartmentNamesList.isEmpty()) {

-			OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());

-			addPreferenceGroup(compartmentGroup);

-		}

-

-		// Add label visibility group

-		if (!labelsList.isEmpty()) {

-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);

-			addPreferenceGroup(compartmentGroup);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/** Initialize the list containing names of labels. */

-	protected void initializeLabelsList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartments. */

-	protected void initializeCompartmentNamesList() {

-		// Implemented by subclasses.

-	}

-

-	/** Initialize the list containing the names of compartment that have titles. */

-	protected void initializeCompartmentTitlesList() {

-		// Implemented by subclasses.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {

-		return new TreeMap<String, Boolean>();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected final void initializeCompartmentsList() {

-		compartmentsList = Collections.emptyList();

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java
deleted file mode 100644
index 70a3ba92fb9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;
-
-public class RequirementDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.NamedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.AbstractionPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.ContainmentLinkPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.DependencyPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.RealizationPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackageImportPreferencePage.initDefaults(store);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java
deleted file mode 100644
index 516470fdf68..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java
+++ /dev/null
@@ -1,41 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
-
-public class SignalPreferencePage extends RequirementDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Signal"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public SignalPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Signal"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
deleted file mode 100644
index f925c69ce51..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java
+++ /dev/null
@@ -1,186 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
-
-public class ElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** SysML Requirement Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** SysML Requirement Diagram :: Diagram */
-	public static final String DIAGRAM_ID = "RequirementDiagram"; //$NON-NLS-1$
-
-
-
-
-	/** ********************************************************* */
-	/** SysML Requirement Diagram - ClassDiagram related elements */
-	/** ********************************************************* */
-
-
-	/** ClassDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType) UMLElementTypes.Package_Shape;
-
-	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPart.VISUAL_ID;
-
-	public static final String PACKAGE_LABEL_NAME_HINT = PackageNameEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType) UMLElementTypes.Package_Shape_CN;
-
-	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = PackagePackageableElementCompartmentEditPartCN.VISUAL_ID;
-
-	public static final String PACKAGE_CN_LABEL_NAME_HINT = PackageNameEditPartCN.VISUAL_ID;
-
-	/** ClassDiagram :: CLASS */
-	public static final IHintedType CLASS = (IHintedType) UMLElementTypes.Class_Shape;
-
-	public static final String CLASS_COMPARTMENT_ATTRIBUTE_HINT = ClassAttributeCompartmentEditPart.VISUAL_ID;
-
-	public static final String CLASS_COMPARTMENT_OPERATION_HINT = ClassOperationCompartmentEditPart.VISUAL_ID;
-
-	public static final String CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT = ClassNestedClassifierCompartmentEditPart.VISUAL_ID;
-
-	public static final String CLASS_LABEL_NAME_HINT = ClassNameEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: CLASS_CN */
-	public static final IHintedType CLASS_CN = (IHintedType) UMLElementTypes.Class_Shape_CN;
-
-	public static final String CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT = ClassAttributeCompartmentEditPartCN.VISUAL_ID;
-
-	public static final String CLASS_CN_COMPARTMENT_OPERATION_HINT = ClassOperationCompartmentEditPartCN.VISUAL_ID;
-
-	public static final String CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT = ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID;
-
-	public static final String CLASS_CN_LABEL_NAME_HINT = ClassNameEditPartCN.VISUAL_ID;
-
-	/** ClassDiagram :: DEFAULT_NAMED_ELEMENT */
-	public static final IHintedType DEFAULT_NAMED_ELEMENT = (IHintedType) UMLElementTypes.NamedElement_DefaultShape;
-
-	public static final String DEFAULT_NAMED_ELEMENT_LABEL_NAME_HINT = DefaultNamedElementNameEditPart.VISUAL_ID;
-
-
-	/** ClassDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType) UMLElementTypes.Comment_Shape;
-
-	public static final String COMMENT_LABEL_BODY_HINT = CommentBodyEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType) UMLElementTypes.Comment_Shape_CN;
-
-	public static final String COMMENT_CN_LABEL_BODY_HINT = CommentBodyEditPartCN.VISUAL_ID;
-
-	/** ClassDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape;
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = ConstraintNameEditPart.VISUAL_ID;
-
-	public static final String CONSTRAINT_LABEL_BODY_HINT = ConstraintBodyEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType) UMLElementTypes.Constraint_PackagedElementShape_CN;
-
-	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = ConstraintNameEditPartCN.VISUAL_ID;
-
-	public static final String CONSTRAINT_CN_LABEL_BODY_HINT = ConstraintBodyEditPartCN.VISUAL_ID;
-
-
-	/** ClassDiagram :: ABSTRACTION */
-	public static final IHintedType ABSTRACTION = (IHintedType) UMLElementTypes.Abstraction_Edge;
-
-	public static final String ABSTRACTION_LABEL_NAME_HINT = AbstractionNameEditPart.VISUAL_ID;
-
-	public static final String ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypeAbstractionEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: CONTAINMENT_LINK */
-	public static final IHintedType CONTAINMENT_LINK = (IHintedType) UMLElementTypes.Element_ContainmentEdge;
-
-
-	/** ClassDiagram :: DEPENDENCY */
-	public static final IHintedType DEPENDENCY = (IHintedType) UMLElementTypes.Dependency_Edge;
-
-	public static final String DEPENDENCY_LABEL_NAME_HINT = DependencyNameEditPart.VISUAL_ID;
-
-	public static final String DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypeDependencyEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType) UMLElementTypes.Comment_AnnotatedElementEdge;
-
-	/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType) UMLElementTypes.Constraint_ConstrainedElementEdge;
-
-	/** ClassDiagram :: REALIZATION */
-	public static final IHintedType REALIZATION = (IHintedType) UMLElementTypes.Realization_Edge;
-
-	public static final String REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypeRealizationEditPart.VISUAL_ID;
-
-	public static final String REALIZATION_LABEL_NAME_HINT = RealizationNameEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: PACKAGE_IMPORT */
-	public static final IHintedType PACKAGE_IMPORT = (IHintedType) UMLElementTypes.PackageImport_Edge;
-
-	public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = AppliedStereotypePackageImportEditPart.VISUAL_ID;
-
-	/** ClassDiagram :: ChildLabelNodes */
-	public static final IHintedType CLASS_PROPERTY_CLN = (IHintedType) UMLElementTypes.Property_ClassAttributeLabel;
-
-	public static final IHintedType CLASS_RECEPTION_CLN = (IHintedType) UMLElementTypes.Reception_ReceptionLabel;
-
-	public static final IHintedType CLASS_OPERATION_CLN = (IHintedType) UMLElementTypes.Operation_ClassOperationLabel;
-
-	public static final IHintedType CLASS_CLASS_CLN = (IHintedType) UMLElementTypes.Class_ClassNestedClassifierLabel;
-
-	public static final IHintedType CLASS_INTERFACE_CLN = (IHintedType) UMLElementTypes.Interface_ClassNestedClassifierLabel;
-
-	public static final IHintedType CLASS_ENUMERATION_CLN = (IHintedType) UMLElementTypes.Enumeration_ClassNestedClassifierLabel;
-
-	public static final IHintedType CLASS_PRIMITIVE_TYPE_CLN = (IHintedType) UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel;
-
-	public static final IHintedType CLASS_DATA_TYPE_CLN = (IHintedType) UMLElementTypes.DataType_ClassNestedClassifierLabel;
-
-	public static final IHintedType CLASS_SIGNAL_CLN = (IHintedType) UMLElementTypes.Signal_ClassNestedClassifierLabel;
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java
deleted file mode 100644
index 4ea87a22a37..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java
+++ /dev/null
@@ -1,322 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-/**
- * <pre>
- * This class provides graphical type id (used as View type) for
- * domain element according to their actual or expected graphical
- * container type.
- * </pre>
- */
-public class GraphicalTypeRegistry implements IGraphicalTypeRegistry {
-
-	/** A Set containing all known node graphical types */
-	protected Set<String> knownNodes = new HashSet<String>();
-
-	/** A Set containing all known edge graphical types */
-	protected Set<String> knownEdges = new HashSet<String>();
-
-	/** Default constructor */
-	public GraphicalTypeRegistry() {
-
-		// Fill known edges set
-		knownEdges.add(ElementTypes.ABSTRACTION.getSemanticHint());
-		knownEdges.add(ElementTypes.DEPENDENCY.getSemanticHint());
-		knownEdges.add(ElementTypes.REALIZATION.getSemanticHint());
-		knownEdges.add(ElementTypes.PACKAGE_IMPORT.getSemanticHint());
-		knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint());
-		knownEdges.add(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint());
-
-		// Fill known nodes set (primary nodes)
-		knownNodes.add(ElementTypes.PACKAGE.getSemanticHint());
-		knownNodes.add(ElementTypes.PACKAGE_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.DEFAULT_NAMED_ELEMENT.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT.getSemanticHint());
-		knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
-		knownNodes.add(ElementTypes.CONSTRAINT.getSemanticHint());
-		knownNodes.add(ElementTypes.CONSTRAINT_CN.getSemanticHint());
-
-		// Fill known nodes set (child label nodes)
-		knownNodes.add(ElementTypes.CLASS_PROPERTY_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_RECEPTION_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_OPERATION_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_CLASS_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_INTERFACE_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_ENUMERATION_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_PRIMITIVE_TYPE_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_DATA_TYPE_CLN.getSemanticHint());
-		knownNodes.add(ElementTypes.CLASS_SIGNAL_CLN.getSemanticHint());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(EObject domainElement) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if (domainElement == null) {
-			return UNDEFINED_TYPE;
-		}
-		if (domainElement instanceof org.eclipse.uml2.uml.Abstraction) {
-			graphicalType = ElementTypes.ABSTRACTION.getSemanticHint();
-		}
-		if (domainElement instanceof org.eclipse.uml2.uml.Dependency) {
-			graphicalType = ElementTypes.DEPENDENCY.getSemanticHint();
-		}
-		if (domainElement instanceof org.eclipse.uml2.uml.Realization) {
-			graphicalType = ElementTypes.REALIZATION.getSemanticHint();
-		}
-		if (domainElement instanceof org.eclipse.uml2.uml.PackageImport) {
-			graphicalType = ElementTypes.PACKAGE_IMPORT.getSemanticHint();
-		}
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(IElementType elementType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getEdgeGraphicalType(semanticHint);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getEdgeGraphicalType(String proposedType) {
-		if (isKnownEdgeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(EObject domainElement, String containerType) {
-
-		String graphicalType = UNDEFINED_TYPE;
-		if ((containerType == null) || (domainElement == null)) {
-			return UNDEFINED_TYPE;
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Package TopNode
-				graphicalType = ElementTypes.PACKAGE.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
-				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
-				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Class) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Class TopNode
-				graphicalType = ElementTypes.CLASS.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Class ChildNode
-				graphicalType = ElementTypes.CLASS_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Class ChildNode
-				graphicalType = ElementTypes.CLASS_CN.getSemanticHint();
-			}
-
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Class ChildLabelNode
-				graphicalType = ElementTypes.CLASS_CLASS_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Class ChildLabelNode
-				graphicalType = ElementTypes.CLASS_CLASS_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.NamedElement) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // NamedElement TopNode
-				graphicalType = ElementTypes.DEFAULT_NAMED_ELEMENT.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Comment TopNode
-				graphicalType = ElementTypes.COMMENT.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
-				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
-				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
-				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Property) {
-
-			if (ElementTypes.CLASS_COMPARTMENT_ATTRIBUTE_HINT.equals(containerType)) { // Property ChildLabelNode
-				graphicalType = ElementTypes.CLASS_PROPERTY_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerType)) { // Property ChildLabelNode
-				graphicalType = ElementTypes.CLASS_PROPERTY_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Reception) {
-
-			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Reception ChildLabelNode
-				graphicalType = ElementTypes.CLASS_RECEPTION_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Reception ChildLabelNode
-				graphicalType = ElementTypes.CLASS_RECEPTION_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Operation) {
-
-			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Operation ChildLabelNode
-				graphicalType = ElementTypes.CLASS_OPERATION_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerType)) { // Operation ChildLabelNode
-				graphicalType = ElementTypes.CLASS_OPERATION_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Interface) {
-
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Interface ChildLabelNode
-				graphicalType = ElementTypes.CLASS_INTERFACE_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Interface ChildLabelNode
-				graphicalType = ElementTypes.CLASS_INTERFACE_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Enumeration) {
-
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Enumeration ChildLabelNode
-				graphicalType = ElementTypes.CLASS_ENUMERATION_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Enumeration ChildLabelNode
-				graphicalType = ElementTypes.CLASS_ENUMERATION_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.PrimitiveType) {
-
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // PrimitiveType ChildLabelNode
-				graphicalType = ElementTypes.CLASS_PRIMITIVE_TYPE_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // PrimitiveType ChildLabelNode
-				graphicalType = ElementTypes.CLASS_PRIMITIVE_TYPE_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.DataType) {
-
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // DataType ChildLabelNode
-				graphicalType = ElementTypes.CLASS_DATA_TYPE_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // DataType ChildLabelNode
-				graphicalType = ElementTypes.CLASS_DATA_TYPE_CLN.getSemanticHint();
-			}
-		}
-
-		if (domainElement instanceof org.eclipse.uml2.uml.Signal) {
-
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Signal ChildLabelNode
-				graphicalType = ElementTypes.CLASS_SIGNAL_CLN.getSemanticHint();
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerType)) { // Signal ChildLabelNode
-				graphicalType = ElementTypes.CLASS_SIGNAL_CLN.getSemanticHint();
-			}
-		}
-
-		return graphicalType;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(IElementType elementType, String containerType) {
-		if (elementType instanceof IHintedType) {
-			String semanticHint = ((IHintedType) elementType).getSemanticHint();
-			return getNodeGraphicalType(semanticHint, containerType);
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getNodeGraphicalType(String proposedType, String containerType) {
-		if (isKnownNodeType(proposedType)) {
-			return proposedType;
-		}
-
-		return UNDEFINED_TYPE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isKnownEdgeType(String type) {
-		return knownEdges.contains(type);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isKnownNodeType(String type) {
-		return knownNodes.contains(type);
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java
deleted file mode 100644
index 24e23ee4f21..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- * Christian W. Damus - bug 477384
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * This interface provides an API for accessing the local graphical type registry.
- * This registry provides a graphical type for existing model elements.
- * 
- * @deprecated Use the {@link org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry} type, instead.
- */
-@Deprecated
-public interface IGraphicalTypeRegistry extends org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry {
-
-	/** Constant for undefined graphical type */
-	public static final String UNDEFINED_TYPE = "undefined_type";
-
-	/**
-	 * Get a valid edge graphical type for the domain element.
-	 *
-	 * @param domainElement
-	 *            the domain element.
-	 * @return the domain element graphical type.
-	 */
-	@Override
-	public String getEdgeGraphicalType(EObject domainElement);
-
-	/**
-	 * Get a valid edge graphical type for the element type.
-	 *
-	 * @param elementType
-	 *            the element type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	@Override
-	public String getEdgeGraphicalType(IElementType elementType);
-
-	/**
-	 * Get a valid edge graphical type for the proposed type.
-	 *
-	 * @param proposedType
-	 *            the proposed type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	@Override
-	public String getEdgeGraphicalType(String proposedType);
-
-	/**
-	 * Get a valid node graphical type for the domain element.
-	 *
-	 * @param domainElement
-	 *            the domain element.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	@Override
-	public String getNodeGraphicalType(EObject domainElement, String containerType);
-
-	/**
-	 * Get a valid node graphical type for the element type.
-	 *
-	 * @param elementType
-	 *            the element type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	@Override
-	public String getNodeGraphicalType(IElementType elementType, String containerType);
-
-	/**
-	 * Get a valid node graphical type for the proposed type.
-	 *
-	 * @param proposedType
-	 *            the proposed type.
-	 * @param containerType
-	 *            the type of the graphical owner of the domain element.
-	 * @return the domain element graphical type.
-	 */
-	@Override
-	public String getNodeGraphicalType(String proposedType, String containerType);
-
-	/**
-	 * Test if the type is a known edge graphical type in this diagram
-	 *
-	 * @param type
-	 *            the type to test
-	 * @return true if the type is known
-	 */
-	@Override
-	public boolean isKnownEdgeType(String type);
-
-	/**
-	 * Test if the type is a known node graphical type in this diagram
-	 *
-	 * @param type
-	 *            the type to test
-	 * @return true if the type is known
-	 */
-	@Override
-	public boolean isKnownNodeType(String type);
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java
deleted file mode 100644
index 144dc489c19..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java
+++ /dev/null
@@ -1,118 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLEditPartProvider;
-
-public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider {
-
-	@Override
-	public synchronized boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is a Requirement Diagram
-			if (!ElementTypes.DIAGRAM_ID.equals(view.getDiagram().getType())) {
-				return false;
-			}
-
-			// Test supported inherited types
-			EObject eobject = view.getElement();
-
-			/** Nodes (and ChildLabelNodes) *********** */
-			if (eobject instanceof org.eclipse.uml2.uml.Package) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Class) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.NamedElement) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Comment) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Constraint) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Property) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Reception) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Operation) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Interface) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Enumeration) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.PrimitiveType) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.DataType) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Signal) {
-				return true;
-			}
-
-			/** Edges *********** */
-			if (eobject instanceof org.eclipse.uml2.uml.Abstraction) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Dependency) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.Realization) {
-				return true;
-			}
-			if (eobject instanceof org.eclipse.uml2.uml.PackageImport) {
-				return true;
-			}
-
-			// Additional test needed here to decide whether to support Feature type links.
-			// As feature type link are not related to a MetaClass from the domain model
-			// they are not already handled by previous tests.
-			// Also concerns NotationType.
-			String hint = view.getType();
-
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-
-			/** Edges (NotationType) : CONTAINMENT_LINK *********** */
-			if (ElementTypes.CONTAINMENT_LINK.getSemanticHint().equals(hint)) {
-				return true;
-			}
-
-
-		}
-		return false;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
deleted file mode 100644
index be4e20256d8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java
+++ /dev/null
@@ -1,362 +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:
- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider;
-
-public class InheritedClassDiagramViewProvider extends UMLViewProvider {
-
-	/** Local graphical type registry */
-	protected IGraphicalTypeRegistry registry = new GraphicalTypeRegistry();
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Edge createdEdge = null;
-
-		IElementType elementType = (IElementType) semanticAdapter.getAdapter(IElementType.class);
-		if (elementType != null) {
-			createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-		} else {
-
-			EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
-
-			String domainElementGraphicalType = semanticHint;
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-
-			if ((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				// Cannot use createEdge from super class as it never take the graphical type (semanticHint) into account.
-				// createdEdge = super.createEdge(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-
-				if (ElementTypes.ABSTRACTION.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createAbstraction_Edge(domainElement, containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.CONTAINMENT_LINK.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createElement_ContainmentEdge(containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.DEPENDENCY.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createDependency_Edge(domainElement, containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.REALIZATION.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createRealization_Edge(domainElement, containerView, index, persisted, preferencesHint);
-				}
-				if (ElementTypes.PACKAGE_IMPORT.getSemanticHint().equals(domainElementGraphicalType)) {
-					createdEdge = createPackageImport_Edge(domainElement, containerView, index, persisted, preferencesHint);
-				}
-			}
-		}
-
-		if (createdEdge == null) {
-			Activator.log.error(new Exception("Could not create Edge."));
-		}
-
-		return createdEdge;
-	}
-
-	@Override
-	protected boolean provides(CreateViewForKindOperation op) {
-
-		// This provider is registered for Requirement Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	@Override
-	protected boolean provides(CreateEdgeViewOperation op) {
-
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-
-		// This provider is registered for Requirement Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if (elementType == ElementTypes.ABSTRACTION) {
-			return true;
-		}
-		if (elementType == ElementTypes.CONTAINMENT_LINK) {
-			return true;
-		}
-		if (elementType == ElementTypes.DEPENDENCY) {
-			return true;
-		}
-		if (elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			return true;
-		}
-		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
-			return true;
-		}
-		if (elementType == ElementTypes.REALIZATION) {
-			return true;
-		}
-		if (elementType == ElementTypes.PACKAGE_IMPORT) {
-			return true;
-		}
-
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-
-			if ((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected boolean provides(CreateNodeViewOperation op) {
-		// Must have a container
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		// Get the type of the container
-		String containerGraphicalType = op.getContainerView().getType();
-
-		// This provider is registered for Requirement Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the ElementType and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-
-		IElementType elementType = (IElementType) op.getSemanticAdapter().getAdapter(IElementType.class);
-		if (elementType == ElementTypes.PACKAGE) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.PACKAGE_CN) {
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_CN) {
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.DEFAULT_NAMED_ELEMENT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-
-		if (elementType == ElementTypes.COMMENT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.COMMENT_CN) {
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CONSTRAINT) {
-			if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CONSTRAINT_CN) {
-			if (ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_PROPERTY_CLN) {
-			if (ElementTypes.CLASS_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_RECEPTION_CLN) {
-			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_OPERATION_CLN) {
-			if (ElementTypes.CLASS_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_CLASS_CLN) {
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_INTERFACE_CLN) {
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_ENUMERATION_CLN) {
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_PRIMITIVE_TYPE_CLN) {
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_DATA_TYPE_CLN) {
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if (elementType == ElementTypes.CLASS_SIGNAL_CLN) {
-			if (ElementTypes.CLASS_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if (ElementTypes.CLASS_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-
-		// IElementType may be null (especially when drop from ModelExplorer).
-		// In such a case, test the semantic EObject instead.
-		if (elementType == null) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-			} else {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
-			}
-
-			if ((!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-
-		if (semanticHint != null) {
-			return super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-		}
-
-		// Use the GraphicalTypeRegistry to find the expected type for a domain element
-		// Get the type of the container
-		String containerGraphicalType = containerView.getType();
-		// Get the type of the domain element
-		EObject domainElement = (EObject) semanticAdapter.getAdapter(EObject.class);
-		String domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-
-		// Create the expected node
-		if (!IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) {
-			return super.createNode(semanticAdapter, containerView, domainElementGraphicalType, index, persisted, preferencesHint);
-		}
-
-		Activator.log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if (!ElementTypes.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", ElementTypes.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java
deleted file mode 100644
index 728917af7a1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java
+++ /dev/null
@@ -1,51 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;
-import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.RequirementDiagramEditPart;
-
-public class RequirementDiagramEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if (operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation) operation).getView();
-
-			// Ensure current diagram is Requirement Diagram
-			if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if (ElementTypes.DIAGRAM_ID.equals(view.getType())) {
-			return RequirementDiagramEditPart.class;
-		}
-
-		Activator.log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java
deleted file mode 100644
index 15c6f02d339..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java
+++ /dev/null
@@ -1,101 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
-import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy;
-
-public class RequirementDiagramEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-
-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
-		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {
-			return false;
-		}
-		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();
-		String diagramType = gep.getNotationView().getDiagram().getType();
-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {
-			return true;
-		}
-		if (gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	public void createEditPolicies(EditPart editPart) {
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java
deleted file mode 100644
index e2f43e52aba..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java
+++ /dev/null
@@ -1,44 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.papyrus.sysml.diagram.requirement.Activator;
-import org.eclipse.papyrus.sysml.diagram.requirement.factory.RequirementDiagramViewFactory;
-
-public class RequirementDiagramViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if (ElementTypes.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if (ElementTypes.DIAGRAM_ID.equals(diagramKind)) {
-			return RequirementDiagramViewFactory.class;
-		}
-
-		Activator.log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java
deleted file mode 100644
index 3651d89e983..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java
+++ /dev/null
@@ -1,27 +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:
- * CEA LIST- Initial API and implementation
- * Nizar GUEDIDI (CEA LIST)- modification
- *
- ****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.utils;
-
-public class RequirementDiagramGraphicalTypes {
-
-	/** ********************************************************* */
-	/** Diagram custom graphical types id *********************** */
-	/** ********************************************************* */
-
-
-
-
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/Messages.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/Messages.java
deleted file mode 100644
index 17b09d4509d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/Messages.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Hubert Dubois (CEA LIST) hubert.dubois@cea.fr - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.requirement;

-

-import org.eclipse.osgi.util.NLS;

-

-/**

- * @generated

- */

-public class Messages extends NLS {

-

-	/**

-	 * @generated

-	 */

-	public static String Diagram_Name;

-

-	/**

-	 * @generated

-	 */

-	public static String Problem_Opening;

-

-	/**

-	 * @generated

-	 */

-	public static String Cannot_Open_Input_Element;

-

-	/**

-	 * @generated

-	 */

-	public static String No_EditPart_Can_Be_Created;

-

-	/**

-	 * @generated

-	 */

-	public static String No_View_Can_Be_Created;

-

-	/**

-	 * @generated

-	 */

-	static {

-		NLS.initializeMessages("messages", Messages.class);

-	}

-

-	// TODO: put accessor fields manually

-

-	/**

-	 * @generated

-	 */

-	private Messages() {

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
deleted file mode 100644
index dcc3159edf8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application

- *

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

-package org.eclipse.papyrus.sysml.diagram.requirement;

-

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

-import org.eclipse.papyrus.infra.ui.extension.commands.PerspectiveContextDependence;

-

-/**

- * RequirementDiagramCondition to set conditions for the diagram creation

- */

-public class RequirementDiagramCreationCondition extends PerspectiveContextDependence {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean create(EObject selectedElement) {

-		return false;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomAbstractRequirementInformationLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomAbstractRequirementInformationLabelEditPart.java
deleted file mode 100644
index fce18347ab4..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomAbstractRequirementInformationLabelEditPart.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************

- * 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.edit.part;

-

-import org.eclipse.draw2d.IFigure;

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomRequirementInfoLabelUpdateEditPolicy;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.swt.widgets.Display;

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

-

-public abstract class CustomAbstractRequirementInformationLabelEditPart extends LabelEditPart {

-

-	Requirement requirement;

-

-	public CustomAbstractRequirementInformationLabelEditPart(View view) {

-		super(view);

-	}

-

-	@Override

-	protected void createDefaultEditPolicies() {

-

-		/*

-		 * edit policy used to refresh the labels when the stereotype application "Requirement" is updated.

-		 */

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new CustomRequirementInfoLabelUpdateEditPolicy());

-		super.createDefaultEditPolicies();

-		// Removing useless edit policies installed by superclasses.

-		removeEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		removeEditPolicy(EditPolicy.COMPONENT_ROLE);

-	}

-

-	@Override

-	protected IFigure createFigure() {

-		IFigure figure = new WrappingLabel();

-		((WrappingLabel) figure).setTextWrap(true);

-		figure.setFont(Display.getDefault().getSystemFont());

-		return figure;

-	}

-

-	@Override

-	public IFigure getFigure() {

-		IFigure figure = super.getFigure();

-		refreshLabelText();

-		return figure;

-	}

-

-	public abstract void refreshLabelText();

-

-	/**

-	 * Refreshes the text of the label.

-	 */

-	@Override

-	public void refresh() {

-		this.refreshLabelText();

-		super.refresh();

-	}

-

-	/**

-	 * Gets the requirement associated to this edit part.

-	 */

-	protected Requirement getRequirement() {

-		EditPart compartment = this.getParent();

-		EditPart classEditPart = compartment.getParent();

-		// Getting the class out of the edit part.

-		Element clazz = (Element) ((View) classEditPart.getModel()).getElement();

-		// Getting the requirement out of the class.

-		if (clazz != null) {

-			for (EObject appliedStereotype : clazz.getStereotypeApplications()) {

-				if (appliedStereotype instanceof Requirement) {

-					return ((Requirement) appliedStereotype);

-				}

-			}

-		}

-		return null;

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementEditPart.java
deleted file mode 100644
index fc917caf9bb..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementEditPart.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * 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
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- ******************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.requirement.edit.part;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.diagram.requirement.figure.CustomRequirementFigure;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
-import org.eclipse.papyrus.uml.diagram.common.commands.ShowHideCompartmentRequest;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.uml2.uml.NamedElement;
-
-public class CustomRequirementEditPart extends ClassEditPart {
-
-	//protected static final String ICONS_PATH = "/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif"; //$NON-NLS-1$
-
-	public CustomRequirementEditPart(View view) {
-		super(view);
-	}
-
-
-	@Override
-	protected IFigure createNodeShape() {
-		// Showing the information compartment.
-		View notationView = getNotationView();
-		Request request = new ShowHideCompartmentRequest(ShowHideCompartmentRequest.SHOW, notationView);
-		request.setType(ShowHideCompartmentRequest.SHOW_HIDE_COMPARTMENT);
-		Command showCompartmentCommand = this.getCommand(request);
-		getEditDomain().getCommandStack().execute(showCompartmentCommand);
-
-		primaryShape = new CustomRequirementFigure();
-		// ((CustomRequirementFigure)primaryShape).setTagIcon(Activator.getPluginIconImage(Activator.ID, ICONS_PATH));
-		return primaryShape;
-	}
-
-	public void refreshTitle() {
-		NamedElement clazz = (NamedElement) ((View) this.getModel()).getElement();
-		String requirementName = UMLLabelInternationalization.getInstance().getLabel(clazz);
-		((CustomRequirementFigure) this.getFigure()).setName(requirementName);
-	}
-
-	@Override
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CustomRequirementInformationCompartmentEditPart) {
-			IFigure pane = ((CustomRequirementFigure) getPrimaryShape()).getRequirementIdInformationCompartmentFigure();
-			setupContentPane(pane); // FIXME each compartment should handle his content pane in his own way
-			pane.add(((CustomRequirementInformationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return super.addFixedChild(childEditPart);
-	}
-
-	@Override
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CustomRequirementInformationCompartmentEditPart) {
-			IFigure pane = ((CustomRequirementFigure) getPrimaryShape()).getRequirementIdInformationCompartmentFigure();
-			setupContentPane(pane); // FIXME each compartment should handle his content pane in his own way
-			pane.remove(((CustomRequirementInformationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return super.removeFixedChild(childEditPart);
-	}
-
-	@Override
-	public IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof CustomRequirementInformationCompartmentEditPart) {
-			return ((CustomRequirementFigure) getPrimaryShape()).getRequirementIdInformationCompartmentFigure();
-		}
-		return super.getContentPaneFor(editPart);
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementIdLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementIdLabelEditPart.java
deleted file mode 100644
index eee3e13b79c..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementIdLabelEditPart.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************

- * 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.edit.part;

-

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-

-/**

- * Label used to display the id of a requirement

- */

-public class CustomRequirementIdLabelEditPart extends CustomAbstractRequirementInformationLabelEditPart {

-

-	public CustomRequirementIdLabelEditPart(View view) {

-		super(view);

-	}

-

-	@Override

-	public void refreshLabelText() {

-		if (this.figure != null && this.getRequirement() != null) {

-			WrappingLabel wrappingLabel = (WrappingLabel) figure;

-			Requirement req = this.getRequirement();

-			String id = req.getId();

-			if (id == null) {

-				id = ""; //$NON-NLS-1$

-			}

-			wrappingLabel.setText("id = \"" + id + "\""); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementInformationCompartmentEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementInformationCompartmentEditPart.java
deleted file mode 100644
index e4ee08a1f7f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementInformationCompartmentEditPart.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************

- * 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.edit.part;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

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

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

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy;

-

-/**

- * Compartment used to display the id and the text of the requirement.

- * The actual display of these information is performed by

- * RequirementIdLabelEditPart and RequirementTextLabelEditPart

- *

- */

-public class CustomRequirementInformationCompartmentEditPart extends ResizeableListCompartmentEditPart {

-

-	public static final String COMPARTMENT_NAME = "InformationCompartment"; //$NON-NLS-1$

-

-	public CustomRequirementInformationCompartmentEditPart(EObject model) {

-		super(model);

-	}

-

-	@Override

-	protected boolean hasModelChildrenChanged(Notification evt) {

-		return false;

-	}

-

-	@Override

-	public String getCompartmentName() {

-		return COMPARTMENT_NAME;

-	}

-

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());

-		installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy());

-	}

-

-	@Override

-	protected void setRatio(Double ratio) {

-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	@Override

-	protected void handleNotificationEvent(Notification notification) {

-		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

-			refreshBounds();

-		}

-		super.handleNotificationEvent(notification);

-	}

-

-	@Override

-	protected void refreshBounds() {

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

-		Dimension size = new Dimension(width, height);

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

-	}

-

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshBounds();

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementNameEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementNameEditPart.java
deleted file mode 100644
index da5a3de1894..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementNameEditPart.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.requirement.edit.part;

-

-import java.util.List;

-

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

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;

-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.swt.graphics.Image;

-

-public class CustomRequirementNameEditPart extends ClassNameEditPart { // NamedElementNodeLabelNameEditPart {

-

-	/** Constructor */

-	public CustomRequirementNameEditPart(View view) {

-		super(view);

-	}

-

-	@Override

-	protected Image getLabelIcon() {

-		EObject parserElement = getParserElement();

-		if (parserElement == null) {

-			return null;

-		}

-

-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

-				return org.eclipse.papyrus.sysml.diagram.common.Activator.getInstance().getLabelProvider().getImage(parserElement);

-			}

-		}

-		return null;

-

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementTextLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementTextLabelEditPart.java
deleted file mode 100644
index c89c739bb41..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/CustomRequirementTextLabelEditPart.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************

- * 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.edit.part;

-

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-

-/**

- * Label used to display the text of a requirement

- */

-public class CustomRequirementTextLabelEditPart extends CustomAbstractRequirementInformationLabelEditPart {

-

-	public CustomRequirementTextLabelEditPart(View view) {

-		super(view);

-	}

-

-	@Override

-	public void refreshLabelText() {

-		if (this.figure != null && this.getRequirement() != null) {

-			WrappingLabel wrappingLabel = (WrappingLabel) figure;

-			Requirement req = this.getRequirement();

-			String text = req.getText();

-			if (text == null) {

-				text = ""; //$NON-NLS-1$

-			}

-			wrappingLabel.setText("text = \"" + text + "\""); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomAppliedStereotypeLabelDisplayEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomAppliedStereotypeLabelDisplayEditPolicy.java
deleted file mode 100644
index 889e1765ea1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomAppliedStereotypeLabelDisplayEditPolicy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************

- * 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) olivier.melois@atos.net - Initial API and implementation

- *

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

-

-package org.eclipse.papyrus.sysml.diagram.requirement.edit.policy;

-

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-

-/**

- * Edit policy responsible of the display of stereotypes. It does not rely

- * on commands to get the stereotypes (the computation of the text was

- * formerly processed by commands executed when the object was dragged

- * from a palette, from instance).

- *

- * @author omelois

- */

-public class CustomAppliedStereotypeLabelDisplayEditPolicy extends AppliedStereotypeNodeLabelDisplayEditPolicy {

-

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomDragDropEditPolicy.java
deleted file mode 100644
index a5a4a9c367a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomDragDropEditPolicy.java
+++ /dev/null
@@ -1,123 +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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

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

-package org.eclipse.papyrus.sysml.diagram.requirement.edit.policy;

-

-import java.util.HashSet;

-import java.util.Set;

-

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

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;

-import org.eclipse.papyrus.sysml.util.SysmlResource;

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

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

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

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

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

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

-

-public class CustomDragDropEditPolicy extends RequirementDiagramDragDropEditPolicy {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Set<String> getDroppableElementVisualId() {

-		Set<String> droppableElementsVisualID = new HashSet<String>();

-		return droppableElementsVisualID;

-	}

-

-	@Override

-	public String getNodeVisualID(View containerView, EObject domainElement) {

-		String semanticHint = null;

-

-		// Fill the semantic hint during the drop when the top level is the Requirement Diagram

-		if (containerView instanceof Diagram) {

-			if (domainElement instanceof org.eclipse.uml2.uml.Package) {

-				semanticHint = ElementTypes.PACKAGE.getSemanticHint();

-			}

-			if ((domainElement instanceof org.eclipse.uml2.uml.Class)) {

-				org.eclipse.uml2.uml.Class domainElementClass = (org.eclipse.uml2.uml.Class) domainElement;

-				if (domainElementClass.getAppliedStereotype(SysmlResource.REQUIREMENT_ID) != null) {

-					semanticHint = ElementTypes.CLASS.getSemanticHint();

-				}

-			}

-

-			if (domainElement instanceof Comment) {

-				semanticHint = ElementTypes.COMMENT.getSemanticHint();

-			}

-

-			if (domainElement instanceof Constraint) {

-				semanticHint = ElementTypes.CONSTRAINT.getSemanticHint();

-			}

-

-		}

-

-		// Fill the semantic hint during the drop when the top level is the an element in the Requirement Diagram (a Package for instance)

-		else {

-			if (domainElement instanceof org.eclipse.uml2.uml.Package) {

-				semanticHint = ElementTypes.PACKAGE_CN.getSemanticHint();

-			}

-			if ((domainElement instanceof org.eclipse.uml2.uml.Class)) {

-				org.eclipse.uml2.uml.Class domainElementClass = (org.eclipse.uml2.uml.Class) domainElement;

-				if (domainElementClass.getAppliedStereotype(SysmlResource.REQUIREMENT_ID) != null) {

-					semanticHint = ElementTypes.CLASS_CN.getSemanticHint();

-				}

-			}

-

-			if (domainElement instanceof Comment) {

-				semanticHint = ElementTypes.COMMENT_CN.getSemanticHint();

-			}

-

-			if (domainElement instanceof Constraint) {

-				semanticHint = ElementTypes.CONSTRAINT_CN.getSemanticHint();

-			}

-

-		}

-

-		// In the case of we want to Drag and drop something else than a package or a Requirement, if this is a NamedElement,

-		// we can fill the semanticHint with the NamedElement dedicated Value

-		if (semanticHint == null) {

-			if ((domainElement instanceof org.eclipse.uml2.uml.NamedElement)) {

-				semanticHint = ElementTypes.DEFAULT_NAMED_ELEMENT.getSemanticHint();

-			}

-		}

-

-		return semanticHint;

-	}

-

-	@Override

-	public String getLinkWithClassVisualID(EObject domainElement) {

-		String semanticHint = null;

-

-		if (domainElement instanceof Abstraction) {

-			semanticHint = ElementTypes.ABSTRACTION.getSemanticHint();

-		}

-

-		if (domainElement instanceof Dependency) {

-			semanticHint = ElementTypes.DEPENDENCY.getSemanticHint();

-		}

-

-		if (domainElement instanceof PackageImport) {

-			semanticHint = ElementTypes.PACKAGE_IMPORT.getSemanticHint();

-		}

-		if (domainElement instanceof Realization) {

-			semanticHint = ElementTypes.REALIZATION.getSemanticHint();

-		}

-

-		return semanticHint;

-

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomRequirementInfoLabelUpdateEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomRequirementInfoLabelUpdateEditPolicy.java
deleted file mode 100644
index e0fe59b85f1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/CustomRequirementInfoLabelUpdateEditPolicy.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************

- * 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.edit.policy;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

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

-

-/**

- * Edit policy used to refresh the label that display the id and the text of a requirement.

- *

- */

-public class CustomRequirementInfoLabelUpdateEditPolicy extends AbstractAppliedStereotypeDisplayEditPolicy {

-

-

-	@Override

-	protected Element getUMLElement() {

-		EditPart host = this.getHost();

-		// Reminder : the label is in the compartment, which is in the class edit part.

-		EditPart compartment = host.getParent();

-		EditPart classEditPart = compartment.getParent();

-		// Getting the class out of the edit part.

-		Element clazz = (Element) ((View) classEditPart.getModel()).getElement();

-		return clazz;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy#refreshDisplay()

-	 *

-	 */

-	@Override

-	public void refreshDisplay() {

-		// Do nothing

-

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/factory/CustomRequirementUMLEditPartFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/factory/CustomRequirementUMLEditPartFactory.java
deleted file mode 100644
index bcdfd68727e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/factory/CustomRequirementUMLEditPartFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

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

-package org.eclipse.papyrus.sysml.diagram.requirement.factory;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.CustomRequirementNameEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.custom.factory.CustomUMLEditPartFactory;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-

-/**

- * this is custom editpart factory to create our own editpart

- */

-public class CustomRequirementUMLEditPartFactory extends CustomUMLEditPartFactory {

-

-	@Override

-	public EditPart createEditPart(EditPart context, Object model) {

-		if (model instanceof View) {

-			View view = (View) model;

-			String visualID = UMLVisualIDRegistry.getVisualID(view);

-

-			if (visualID != null) {

-				switch (visualID) {

-				// redefined classes to modify the method createNodePlate

-				case ClassNameEditPart.VISUAL_ID:

-					return new CustomRequirementNameEditPart(view);

-				}

-			}

-		}

-		return super.createEditPart(context, model);

-	}

-}

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
deleted file mode 100644
index 663628fda0e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/figure/CustomRequirementFigure.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * 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.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CUMLEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CUMLEditPartProvider.java
deleted file mode 100644
index 1f940b5fa18..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CUMLEditPartProvider.java
+++ /dev/null
@@ -1,25 +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:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

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

-

-package org.eclipse.papyrus.sysml.diagram.requirement.provider;

-

-import org.eclipse.papyrus.sysml.diagram.requirement.factory.CustomRequirementUMLEditPartFactory;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLEditPartProvider;

-

-public class CUMLEditPartProvider extends UMLEditPartProvider {

-

-	public CUMLEditPartProvider() {

-		setFactory(new CustomRequirementUMLEditPartFactory());

-		setAllowCaching(true);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomEditPolicyProvider.java
deleted file mode 100644
index 6b898bf2b87..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomEditPolicyProvider.java
+++ /dev/null
@@ -1,50 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.requirement.provider;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-

-/**

- * Requirement Diagram edit policy provider

- */

-public class CustomEditPolicyProvider extends RequirementDiagramEditPolicyProvider {

-

-	@Override

-	public boolean provides(IOperation operation) {

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-		if (!(epOperation.getEditPart() instanceof GraphicalEditPart)) {

-			return false;

-		}

-		GraphicalEditPart gep = (GraphicalEditPart) epOperation.getEditPart();

-		String diagramType = gep.getNotationView().getDiagram().getType();

-		if (!ElementTypes.DIAGRAM_ID.equals(diagramType)) {

-			return false;

-		}

-

-		if ((gep instanceof PackagePackageableElementCompartmentEditPart) || (gep instanceof PackagePackageableElementCompartmentEditPartCN)) {

-			return true;

-		}

-

-		return false;

-	}

-

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDragDropEditPolicy());

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
deleted file mode 100644
index a66cfc04b93..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 510587

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.requirement.provider;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;

-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.Shape;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

-

-/**

- * SysML Requirement diagram inherited elements view providers from UML Class diagram view providers

- *

- */

-public class CustomInheritedElementViewProvider extends InheritedClassDiagramViewProvider {

-

-	public CustomInheritedElementViewProvider() {

-		super();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation)

-	 */

-	@Override

-	protected boolean provides(final CreateNodeViewOperation operation) {

-		boolean provides = false;

-

-		// Must have a container

-		if (operation.getContainerView() != null) {

-

-			// This provider is registered for Requirement Diagram only

-			String diagramType = operation.getContainerView().getDiagram().getType();

-			if (ElementTypes.DIAGRAM_ID.equals(diagramType)) {

-

-				// Get the type of the container

-				String containerGraphicalType = operation.getContainerView().getType();

-				if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {

-

-					// get the type

-					IElementType elementType = (IElementType) operation.getSemanticAdapter().getAdapter(IElementType.class);

-					if (SysMLElementTypes.REQUIREMENT == elementType

-							|| SysMLElementTypes.PROBLEM == elementType

-							|| SysMLElementTypes.RATIONALE == elementType) {

-						provides = true;

-					}

-				}

-			}

-		}

-		return provides || super.provides(operation);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation)

-	 */

-	@Override

-	protected boolean provides(final CreateEdgeViewOperation operation) {

-		boolean provides = false;

-

-		// Must have a container

-		if (operation.getContainerView() != null) {

-

-			String diagramType = operation.getContainerView().getDiagram().getType();

-			if (ElementTypes.DIAGRAM_ID.equals(diagramType)) {

-

-				// get the type

-				IElementType elementType = (IElementType) operation.getSemanticAdapter().getAdapter(IElementType.class);

-				if (SysMLElementTypes.COPY == elementType

-						|| SysMLElementTypes.DERIVE_REQT == elementType

-						|| SysMLElementTypes.SATISFY == elementType

-						|| SysMLElementTypes.VERIFY == elementType) {

-					provides = true;

-				}

-			}

-		}

-		return provides || super.provides(operation);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#createNode(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean,

-	 *      org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)

-	 */

-	@Override

-	public Node createNode(final IAdaptable semanticAdapter, final View containerView, final String semanticHint, final int index, final boolean persisted, final PreferencesHint preferencesHint) {

-		Node node = null;

-		if (SysMLElementTypes.REQUIREMENT.getDisplayName().equals(semanticHint)) {

-			node = createRequirementNode(semanticAdapter, containerView, index, persisted, preferencesHint);

-		} else if (SysMLElementTypes.PROBLEM.getDisplayName().equals(semanticHint)

-				|| SysMLElementTypes.RATIONALE.getDisplayName().equals(semanticHint)) {

-

-			final EObject domainElement = getSemanticElement(semanticAdapter);

-			node = createComment_Shape(domainElement, containerView, index, persisted, preferencesHint);

-		}

-

-		return null != node ? node : super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#createEdge(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean,

-	 *      org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)

-	 */

-	@Override

-	public Edge createEdge(final IAdaptable semanticAdapter, final View containerView, final String semanticHint, final int index, final boolean persisted, final PreferencesHint preferencesHint) {

-		Edge edge = null;

-

-		if (SysMLElementTypes.COPY.getDisplayName().equals(semanticHint)

-				|| SysMLElementTypes.DERIVE_REQT.getDisplayName().equals(semanticHint)

-				|| SysMLElementTypes.SATISFY.getDisplayName().equals(semanticHint)

-				|| SysMLElementTypes.VERIFY.getDisplayName().equals(semanticHint)) {

-			final EObject domainElement = getSemanticElement(semanticAdapter);

-			edge = createAbstraction_Edge(domainElement, containerView, index, persisted, preferencesHint);

-		}

-

-		return null != edge ? edge : super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);

-	}

-

-	/**

-	 * create a <code>Requirement Node</code>.

-	 * 

-	 * @param IAdaptable

-	 *            (for semantic element)

-	 * @param containerView

-	 *            the container view that will contain the created view.

-	 * @param index

-	 *            position in the container view's list of children views.

-	 * @param persisted

-	 *            indicates if the created view will be persisted or not

-	 * @param preferencesHint

-	 *            The preference hint that is to be used to find the appropriate

-	 *            preference store from which to retrieve diagram preference

-	 *            values. The preference hint is mapped to a preference store in

-	 *            the preference registry <@link DiagramPreferencesRegistry>.

-	 * @return the created <code>Requirement Node</code>

-	 */

-	protected Shape createRequirementNode(final IAdaptable semanticAdapter, final View containerView, final int index, final boolean persisted, final PreferencesHint preferencesHint) {

-		Shape node;

-		node = NotationFactory.eINSTANCE.createShape();

-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		node.setType(SysMLGraphicalTypes.SHAPE_SYSML_REQUIREMENT_AS_CLASSIFER_ID);

-		ViewUtil.insertChildView(containerView, node, index, persisted);

-		final EObject domainElement = getSemanticElement(semanticAdapter);

-		node.setElement(domainElement);

-		stampShortcut(containerView, node);

-		// initializeFromPreferences

-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Class");//$NON-NLS-1$

-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");//$NON-NLS-1$

-		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Class");//$NON-NLS-1$

-

-		// createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));

-

-		createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));

-

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

-		createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true);

-

-		/*

-		 * Addition of the information compartment, and the labels it contains.

-		 */

-		Node compartment = createCompartment(node, SysMLGraphicalTypes.COMPARTMENT_SYSML_REQUIREMENT_IDINFO_AS_LIST_ID, true, true, true, true);

-		createLabel(compartment, SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_ID_ID);

-		createLabel(compartment, SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_TEXT_ID);

-

-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");//$NON-NLS-1$

-		return node;

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomRequirementEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomRequirementEditPartProvider.java
deleted file mode 100644
index 5b705edfdf1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomRequirementEditPartProvider.java
+++ /dev/null
@@ -1,69 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.requirement.provider;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

-import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.CustomRequirementEditPart;

-import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.CustomRequirementIdLabelEditPart;

-import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.CustomRequirementInformationCompartmentEditPart;

-import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.CustomRequirementTextLabelEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

-

-/**

- * Reuse the Custom EditPartProvider from the Class Diagram

- *

- * @author Nizar GUEDIDI

- */

-public class CustomRequirementEditPartProvider extends CUMLEditPartProvider {

-

-	@Override

-	public synchronized boolean provides(IOperation operation) {

-		super.provides(operation);

-		if (operation instanceof CreateGraphicEditPartOperation) {

-			View view = ((IEditPartOperation) operation).getView();

-			if (!ElementTypes.DIAGRAM_ID.equals(UMLVisualIDRegistry.getModelID(view))) {

-				return false;

-			}

-			if (isAllowCaching() && getCachedPart(view) != null) {

-				return true;

-			}

-			IGraphicalEditPart part = createEditPart(view);

-			if (part != null) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	@Override

-	protected IGraphicalEditPart createEditPart(View view) {

-		if (view.getType().equals(SysMLGraphicalTypes.COMPARTMENT_SYSML_REQUIREMENT_IDINFO_AS_LIST_ID)) {

-			return new CustomRequirementInformationCompartmentEditPart(view);

-		}

-		if (view.getType().equals(SysMLGraphicalTypes.SHAPE_SYSML_REQUIREMENT_AS_CLASSIFER_ID)) {

-			return new CustomRequirementEditPart(view);

-		}

-		if (view.getType().equals(SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_ID_ID)) {

-			return new CustomRequirementIdLabelEditPart(view);

-		}

-		if (view.getType().equals(SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_TEXT_ID)) {

-			return new CustomRequirementTextLabelEditPart(view);

-		}

-

-		return super.createEditPart(view);

-	}

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementVisualTypeProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementVisualTypeProvider.java
deleted file mode 100644
index 55025bfdc28..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementVisualTypeProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.sysml.diagram.requirement.provider;
-
-import org.eclipse.papyrus.gmf.diagram.common.provider.SysMLVisualTypeProvider;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLVisualTypeProvider;
-
-/**
- * Visual type provider for the SysML Requirement Diagram.
- */
-public class RequirementVisualTypeProvider extends SysMLVisualTypeProvider {
-
-	public RequirementVisualTypeProvider() {
-		super(new GraphicalTypeRegistry(), new UMLVisualTypeProvider());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.classpath b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.project
deleted file mode 100644
index 32eb33f6dc5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.diagram.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 2a0618ddfd8..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.diagram.ui
-Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sysml.architecture;bundle-version="[1.0.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.ui.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/build.properties
deleted file mode 100644
index a80caeca5e9..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#

-#Mon Sep 12 09:30:15 CEST 2011

-bin.includes=META-INF/,.,about.html,icons/,plugin.xml,plugin.properties

-output..=bin/

-src.includes = about.html

-source..=src/

-bin..=bin/

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/icons/papyrus/new_sysml_model.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/icons/papyrus/new_sysml_model.gif
deleted file mode 100644
index ecc0b715e2d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/icons/papyrus/new_sysml_model.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/icons/papyrus/new_sysml_project.gif b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/icons/papyrus/new_sysml_project.gif
deleted file mode 100644
index 3637e8aefe0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/icons/papyrus/new_sysml_project.gif
+++ /dev/null
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.properties
deleted file mode 100644
index 429d335e824..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.properties
+++ /dev/null
@@ -1,14 +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:
-#     Tatiana Fesenko (CEA LIST) tatiana.fesenko@cea.fr - initial API and implementation
-##################################################################################
-pluginName=UI Plugin for papyrus SysML diagrams
-providerName=Eclipse Modeling Project
-wizardSysMLProject=Papyrus SysML Project
-wizardSysMLModel=Papyrus SysML Model
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.xml
deleted file mode 100644
index 40a5a9d322e..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin>

-<extension point="org.eclipse.ui.newWizards">

-	<!-- @generated NOT -->

-	<wizard

-         category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.components.category"

-         class="org.eclipse.papyrus.sysml.diagram.ui.NewSysMLProjectWizard"

-         finalPerspective="org.eclipse.papyrus.infra.core.perspective"

-         icon="icons/papyrus/new_sysml_project.gif"

-         id="org.eclipse.papyrus.uml.diagram.wizards.createsysmlproject"

-         name="%wizardSysMLProject"

-         project="true">

-      <description>

-         New SysML Project

-      </description>

-	</wizard>

-    <wizard

-         category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.components.category"

-         class="org.eclipse.papyrus.sysml.diagram.ui.NewSysMLModelWizard"

-         finalPerspective="org.eclipse.papyrus.infra.core.perspective"

-         icon="icons/papyrus/new_sysml_model.gif"

-         id="org.eclipse.papyrus.uml.diagram.wizards.createsysmlmodel"

-         name="%wizardSysMLModel">

-      <selection

-            class="org.eclipse.core.resources.IResource">

-      </selection>

-   </wizard>

-</extension>

-

-<!--<extension-point id="templates" name="UML2 Model Templates" schema="schema/templates.exsd"/>-->

-

-</plugin>

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
deleted file mode 100644
index b0b831521f5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.sysml.diagram.ui</artifactId>

-	<version>2.0.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.ui/src/org/eclipse/papyrus/sysml/diagram/ui/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/Activator.java
deleted file mode 100644
index 48d9c486814..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/Activator.java
+++ /dev/null
@@ -1,63 +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:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.ui;

-

-import org.eclipse.core.runtime.Plugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml.diagram.ui"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
deleted file mode 100644
index 396da4b0e54..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
- *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.ui;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * The Class NewSysMLModelWizard.
- */
-public class NewSysMLModelWizard extends CreateModelWizard {
-
-	/**
-	 * Instantiates a new new sys ml model wizard.
-	 */
-	public NewSysMLModelWizard() {
-		super();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		super.init(workbench, selection);
-		setWindowTitle("New SysML Model");
-	}
-
-	@Override
-	public String getModelKindName() {
-		return "Papyrus SysML";
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String[] getSelectedContexts() {
-		return new String[] { SysMLArchitectureContextIds.SysML };
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
-		// here SysML is the only available category
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void saveDiagramCategorySettings() {
-		// here SysML is the only available category
-	}
-
-	@Override
-	public boolean isPapyrusRootWizard() {
-		return false;
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
deleted file mode 100644
index 1d868b8406f..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
+++ /dev/null
@@ -1,80 +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:
- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.ui;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-
-/**
- * The Class NewSysMLProjectWizard.
- */
-public class NewSysMLProjectWizard extends NewPapyrusProjectWizard {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		super.init(workbench, selection);
-		setWindowTitle("New SysML Project");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected WizardNewProjectCreationPage createNewProjectCreationPage() {
-		WizardNewProjectCreationPage newProjectPage = super.createNewProjectCreationPage();
-		newProjectPage.setTitle("Papyrus SysML Project");
-		newProjectPage.setDescription("Create a New Papyrus SysML Project");
-		return newProjectPage;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
-		// here SysML is the only available category
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void saveDiagramCategorySettings() {
-		// do nothing
-		// here SysML is the only available category
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String[] getSelectedContexts() {
-		return new String[] { SysMLArchitectureContextIds.SysML };
-	}
-
-	@Override
-	public boolean isPapyrusRootWizard() {
-		return false;
-	}
-
-}
diff --git a/plugins/sysml/diagram/pom.xml b/plugins/sysml/diagram/pom.xml
deleted file mode 100644
index 4d228e7ac0e..00000000000
--- a/plugins/sysml/diagram/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.sysml-diagram</artifactId>
-	<packaging>pom</packaging>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-    </parent>
-	<name>Papyrus SysSML Diagrams</name>
-	<description>The Papyrus implementations of the SysML 1.1 diagram editors.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.sysml.diagram.blockdefinition</module>
-		<module>org.eclipse.papyrus.sysml.diagram.common</module>
-		<module>org.eclipse.papyrus.sysml.diagram.css</module>
-		<module>org.eclipse.papyrus.sysml.diagram.internalblock</module>
-		<module>org.eclipse.papyrus.sysml.diagram.parametric</module>
-		<module>org.eclipse.papyrus.sysml.diagram.requirement</module>
-		<module>org.eclipse.papyrus.sysml.diagram.ui</module>
-	</modules>
-</project>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.classpath b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.classpath
deleted file mode 100644
index 0c22b5d7e6d..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.project b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.project
deleted file mode 100644
index f44b102edff..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.modelexplorer</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f00da6..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.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/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 72c81a4fa5b..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.modelexplorer;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.sysml.modelexplorer
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- bin
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.modelexplorer.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.modelexplorer;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/about.html b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/build.properties b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/build.properties
deleted file mode 100644
index 9df3ee6bf0d..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Mon Sep 12 09:30:16 CEST 2011
-bin.includes=META-INF/,.,plugin.xml,resources/,about.html,plugin.properties
-output..=bin/
-src.includes = about.html
-source..=src/,src-gen/
-bin..=bin/
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/plugin.properties b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/plugin.properties
deleted file mode 100644
index 16569df9b6a..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/plugin.properties
+++ /dev/null
@@ -1,16 +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:
-#  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
-#
-########################################################################################
-pluginName=ModelExplorer customization for SysML
-providerName=Eclipse Modeling Project
-
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/plugin.xml b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/plugin.xml
deleted file mode 100644
index 6024232a803..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<extension
-      point="org.eclipse.papyrus.infra.newchild">
-   <menuCreationModel
-         model="resources/SysML.creationmenumodel">
-   </menuCreationModel>
-</extension>
-</plugin>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/pom.xml b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/pom.xml
deleted file mode 100644
index bf0ec546b93..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml-modelexplorer</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.modelexplorer</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SimpleSysML.custom b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SimpleSysML.custom
deleted file mode 100644
index 941b5c86251..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SimpleSysML.custom
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<custom:Customization xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet" xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery" name="SimpleSysML" documentation="Display SysML elements">

-  <eClassifiers xsi:type="custom:EClassCustomization" name="SysMLElement">

-    <extendedMetaclass href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-    <facetOperations name="GetSysMLElementIcon">

-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>

-      <eParameters name="eStructuralElement">

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>

-      </eParameters>

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.GetImageQuery"/>

-      <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>

-    </facetOperations>

-  </eClassifiers>

-  <eClassifiers xsi:type="custom:EClassCustomization" name="NamedElement">

-    <extendedMetaclass href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

-    <facetOperations name="GetSysMLElementLabel">

-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eParameters name="eObject">

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      </eParameters>

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.GetLabelQuery"/>

-      <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>

-    </facetOperations>

-    <extendedFacets href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>

-  </eClassifiers>

-</custom:Customization>

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysML.creationmenumodel b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysML.creationmenumodel
deleted file mode 100644
index c0e65859e2e..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysML.creationmenumodel
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<ElementCreationMenuModel:Folder xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="New SysML Child" xmi:id="_R2sjUOJYEeOKT_prO3j7bg" xmi:version="2.0">

-  <menu displayAllRoles="false" label="ActorPart" xmi:id="_ENmJAOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ActorPartProperty" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Allocate" xmi:id="_ENmJAeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Allocate" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Block" xmi:id="_ENmJCeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Block" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Conform" xmi:id="_ENmJCuJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Conform" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="ConstraintBlock" xmi:id="_ENmJC-JbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ConstraintBlock" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="ConstraintProperty" xmi:id="_ENmJDOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ConstraintProperty" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Copy" xmi:id="_ENmJDeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Copy" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="DeriveReqt" xmi:id="_ENmJDuJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.DeriveReqt" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Dimension" xmi:id="_ENmJD-JbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Dimension" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="FlowPort" xmi:id="_ENmJEOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="FlowPort In" xmi:id="_ENmJEeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_In" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="FlowPort Out" xmi:id="_ENmJFOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_Out" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="FlowPort InOut" xmi:id="_ENmJEuJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_InOut" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="FlowPort (non atomic)" xmi:id="_ENmJE-JbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort_NA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="FlowProperty" xmi:id="_ENmJFeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowProperty" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="FlowSpecification" xmi:id="_ENmJFuJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowSpecification" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="ItemFlow" xmi:id="_ENmJF-JbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ItemFlow" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" icon="" label="Parameter" xmi:id="_0BGyoOJiEeOfp_s9yPC7Ww" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ConstraintBlockParameter" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Part" xmi:id="_ENmJGOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.PartProperty" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Problem" xmi:id="_ENmJGeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Problem" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Rationale" xmi:id="_ENmJGuJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Rationale" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Reference" xmi:id="_ENmJG-JbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ReferenceProperty" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Requirement" xmi:id="_ENmJHOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Requirement" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Satisfy" xmi:id="_ENmJHeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Satisfy" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Unit" xmi:id="_ENmJHuJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Unit" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Value" xmi:id="_ENmJH-JbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ValueProperty" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="ValueType" xmi:id="_ENmJIOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ValueType" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="Verify" xmi:id="_ENmJI-JbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Verify" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="View" xmi:id="_ENmJJOJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.View" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-  <menu displayAllRoles="false" label="ViewPoint" xmi:id="_ENmJJeJbEeOKdcZwTkb3kA" xsi:type="ElementCreationMenuModel:CreationMenu">

-    <elementType href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.ViewPoint" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </menu>

-</ElementCreationMenuModel:Folder>

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java
deleted file mode 100644
index fb2783814d2..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011-2012 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.filter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.views.modelexplorer.ICommandFilter;
-
-public class CommandFilter implements ICommandFilter {
-
-	private List<IElementType> visibleCommands;
-
-	@Override
-	public List<IElementType> getVisibleCommands() {
-		if (visibleCommands == null) {
-			visibleCommands = new ArrayList<IElementType>();
-
-			visibleCommands.add(SysMLElementTypes.ACTOR_PART_PROPERTY);
-			// visibleCommands.add(SysMLElementTypes.ALLOCATE);
-			// visibleCommands.add(SysMLElementTypes.ASSOCIATION);
-			// visibleCommands.add(SysMLElementTypes.ASSOCIATION_COMPOSITE);
-			// visibleCommands.add(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED);
-			// visibleCommands.add(SysMLElementTypes.ASSOCIATION_NONE);
-			// visibleCommands.add(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED);
-			// visibleCommands.add(SysMLElementTypes.ASSOCIATION_SHARED);
-			// visibleCommands.add(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED);
-			visibleCommands.add(SysMLElementTypes.BLOCK);
-			// visibleCommands.add(SysMLElementTypes.CONFORM);
-			visibleCommands.add(SysMLElementTypes.CONSTRAINT_BLOCK);
-			visibleCommands.add(SysMLElementTypes.CONSTRAINT_PROPERTY);
-			// visibleCommands.add(SysMLElementTypes.COPY);
-			// visibleCommands.add(SysMLElementTypes.DERIVE_REQT);
-			visibleCommands.add(SysMLElementTypes.DIMENSION);
-			visibleCommands.add(SysMLElementTypes.FLOW_PORT);
-			visibleCommands.add(SysMLElementTypes.FLOW_PORT_IN_OUT);
-			visibleCommands.add(SysMLElementTypes.FLOW_PORT_IN);
-			visibleCommands.add(SysMLElementTypes.FLOW_PORT_OUT);
-			// visibleCommands.add(SysMLElementTypes.FLOW_PORT_NA);
-			visibleCommands.add(SysMLElementTypes.FLOW_PROPERTY);
-			visibleCommands.add(SysMLElementTypes.FLOW_SPECIFICATION);
-			// visibleCommands.add(SysMLElementTypes.ITEM_FLOW);
-			visibleCommands.add(SysMLElementTypes.PART_PROPERTY);
-			visibleCommands.add(SysMLElementTypes.PROBLEM);
-			visibleCommands.add(SysMLElementTypes.RATIONALE);
-			visibleCommands.add(SysMLElementTypes.REFERENCE_PROPERTY);
-			visibleCommands.add(SysMLElementTypes.REQUIREMENT);
-			// visibleCommands.add(SysMLElementTypes.SATISFY);
-			visibleCommands.add(SysMLElementTypes.UNIT);
-			visibleCommands.add(SysMLElementTypes.VALUE_PROPERTY);
-			visibleCommands.add(SysMLElementTypes.VALUE_TYPE);
-			// visibleCommands.add(SysMLElementTypes.VALUE_TYPE_ENUMERATION);
-			// visibleCommands.add(SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE);
-			// visibleCommands.add(SysMLElementTypes.VERIFY);
-			visibleCommands.add(SysMLElementTypes.VIEW);
-			visibleCommands.add(SysMLElementTypes.VIEW_POINT);
-
-			// UMLElementTypes.PROPERTY is required by ConstraintBlock Parameter
-			visibleCommands.add(UMLElementTypes.PROPERTY);
-
-		}
-
-		return visibleCommands;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ActorPartPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ActorPartPropertyHandler.java
deleted file mode 100644
index aac1dcdaf7b..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ActorPartPropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelexplorer.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateActorPartWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for ActorPart (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class ActorPartPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.ACTOR_PART_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java
deleted file mode 100644
index 07b63b09566..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Allocate creation
- *
- * </pre>
- *
- * @generated
- */
-public class AllocateHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ALLOCATE;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeDirectedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeDirectedHandler.java
deleted file mode 100644
index a647bb0f608..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeDirectedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationCompositeDirected creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationCompositeDirectedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeHandler.java
deleted file mode 100644
index 61a4c1f5bf9..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationCompositeHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationComposite creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationCompositeHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_COMPOSITE;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationHandler.java
deleted file mode 100644
index 28bb2cc7da4..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Association creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneDirectedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneDirectedHandler.java
deleted file mode 100644
index bb11abf30ac..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneDirectedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationNoneDirected creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationNoneDirectedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_NONE_DIRECTED;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneHandler.java
deleted file mode 100644
index ecbe2d7d63d..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationNoneHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationNone creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationNoneHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_NONE;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedDirectedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedDirectedHandler.java
deleted file mode 100644
index 514aa149412..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedDirectedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationSharedDirected creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationSharedDirectedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedHandler.java
deleted file mode 100644
index ab5d3e8fb4d..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AssociationSharedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationShared creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationSharedHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_SHARED;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
deleted file mode 100644
index d333eaf1a34..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Block creation
- *
- * </pre>
- *
- * @generated
- */
-public class BlockHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.BLOCK;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java
deleted file mode 100644
index f4423007530..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Conform creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConformHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONFORM;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java
deleted file mode 100644
index dd139c324c8..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConstraintBlock creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConstraintBlockHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONSTRAINT_BLOCK;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockParameterHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockParameterHandler.java
deleted file mode 100644
index 1c8cc33068f..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockParameterHandler.java
+++ /dev/null
@@ -1,96 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <pre>
- * Command handler for Problem creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConstraintBlockParameterHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * &#64;see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * &#64;return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if (getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		if (!(container instanceof Element)) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if (reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-
-		String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", ((Element) container).eContents()); //$NON-NLS-1$
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), name));
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if (createGMFCommand != null) {
-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
-			return emfCommand;
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java
deleted file mode 100644
index 12e7b9816b6..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java
+++ /dev/null
@@ -1,85 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateConstraintPropertyWithTypeConfigureCommandFactory;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConstraintProperty creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConstraintPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * &#64;see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * &#64;return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONSTRAINT_PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if (getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if (reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateConstraintPropertyWithTypeConfigureCommandFactory());
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
-		return emfCommand;
-	}
-
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java
deleted file mode 100644
index 4b681633b09..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Copy creation
- *
- * </pre>
- *
- * @generated
- */
-public class CopyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.COPY;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java
deleted file mode 100644
index 43fd8d55920..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DeriveReqt creation
- *
- * </pre>
- *
- * @generated
- */
-public class DeriveReqtHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.DERIVE_REQT;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java
deleted file mode 100644
index eb07175f932..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Dimension creation
- *
- * </pre>
- *
- * @generated
- */
-public class DimensionHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.DIMENSION;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java
deleted file mode 100644
index bd523b21f83..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPortHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java
deleted file mode 100644
index 221f7f37cd5..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_In creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPort_InHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_IN;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java
deleted file mode 100644
index 760e439eab7..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_InOut creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPort_InOutHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_IN_OUT;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_NAHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_NAHandler.java
deleted file mode 100644
index cb5787f2f1c..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_NAHandler.java
+++ /dev/null
@@ -1,70 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelexplorer.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;

-

-/**

- * <pre>

- * Command handler for FlowPort non atomic creation

- *

- * </pre>

- *

- * @generated

- */

-public class FlowPort_NAHandler extends FlowPortHandler {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java
deleted file mode 100644
index 540868f3644..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_Out creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPort_OutHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_OUT;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
deleted file mode 100644
index 2dfe047f96e..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowProperty creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PROPERTY;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
deleted file mode 100644
index a4551a9e1c7..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowSpecification creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowSpecificationHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_SPECIFICATION;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java
deleted file mode 100644
index 10485baf091..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ItemFlow creation
- *
- * </pre>
- *
- * @generated
- */
-public class ItemFlowHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ITEM_FLOW;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/PartPropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/PartPropertyHandler.java
deleted file mode 100644
index 91bcfc9eb76..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/PartPropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelexplorer.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for Part (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class PartPropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.PART_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java
deleted file mode 100644
index 8d25a4dad18..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Problem creation
- *
- * </pre>
- *
- * @generated
- */
-public class ProblemHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.PROBLEM;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java
deleted file mode 100644
index c48f97d29da..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Rationale creation
- *
- * </pre>
- *
- * @generated
- */
-public class RationaleHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.RATIONALE;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ReferencePropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ReferencePropertyHandler.java
deleted file mode 100644
index 726fda970d7..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ReferencePropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelexplorer.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateReferenceWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for Reference (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class ReferencePropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.REFERENCE_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
deleted file mode 100644
index 2efaa5c6c3f..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Requirement creation
- *
- * </pre>
- *
- * @generated
- */
-public class RequirementHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.REQUIREMENT;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java
deleted file mode 100644
index 93bdceb145a..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Satisfy creation
- *
- * </pre>
- *
- * @generated
- */
-public class SatisfyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.SATISFY;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java
deleted file mode 100644
index 17ac159ed1b..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Unit creation
- *
- * </pre>
- *
- * @generated
- */
-public class UnitHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.UNIT;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValuePropertyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValuePropertyHandler.java
deleted file mode 100644
index 5180ec1cc40..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValuePropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelexplorer.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateValueWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for Value (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class ValuePropertyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.VALUE_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java
deleted file mode 100644
index 02ac11cca51..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType creation
- *
- * </pre>
- *
- * @generated
- */
-public class ValueTypeHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java
deleted file mode 100644
index 2cdd503eef9..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType_Enumeration creation
- *
- * </pre>
- *
- * @generated
- */
-public class ValueType_EnumerationHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE_ENUMERATION;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java
deleted file mode 100644
index 10f29ac8135..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType_PrimitiveType creation
- *
- * </pre>
- *
- * @generated
- */
-public class ValueType_PrimitiveTypeHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java
deleted file mode 100644
index 2ff47d5b242..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Verify creation
- *
- * </pre>
- *
- * @generated
- */
-public class VerifyHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VERIFY;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java
deleted file mode 100644
index 681eff0691e..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for View creation
- *
- * </pre>
- *
- * @generated
- */
-public class ViewHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VIEW;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java
deleted file mode 100644
index db18e9fa269..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ViewPoint creation
- *
- * </pre>
- *
- * @generated
- */
-public class ViewPointHandler extends AbstractSysmlModelExplorerCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VIEW_POINT;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/Activator.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/Activator.java
deleted file mode 100644
index 5e9a146f202..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/Activator.java
+++ /dev/null
@@ -1,56 +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:
- *  Patrick Tessier (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.osgi.framework.BundleContext;
-
-/** The activator class controls the plug-in life cycle */
-public class Activator extends Plugin {
-
-	/** The plug-in ID */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml.modelexplorer"; //$NON-NLS-1$
-
-	/** The plug-in shared instance */
-	private static Activator plugin;
-
-	/** The log service */
-	public static LogHelper log;
-
-	/** Default constructor */
-	public Activator() {
-	}
-
-	@Override
-	public void start(final BundleContext context) throws Exception {
-		super.start(context);
-		Activator.plugin = this;
-		log = new LogHelper(plugin);
-	}
-
-	@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/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/AbstractSysmlModelExplorerCreateCommandHandler.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/AbstractSysmlModelExplorerCreateCommandHandler.java
deleted file mode 100644
index 8955c0d1df5..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/AbstractSysmlModelExplorerCreateCommandHandler.java
+++ /dev/null
@@ -1,35 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.papyrus.sysml.service.types.handlers.AbstractSysmlCreateCommandHandler;
-import org.eclipse.papyrus.uml.modelexplorer.util.ModelExplorerUtils;
-import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;
-
-
-/**
- * Abstract handler supertype for every generated handler for the creation of SysML elements from the model explorer.
- * (Create SysML child...)
- */
-public abstract class AbstractSysmlModelExplorerCreateCommandHandler extends AbstractSysmlCreateCommandHandler {
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCommandHandler#getCommandContext()
-	 *
-	 * @return
-	 */
-	@Override
-	protected ICommandContext getCommandContext() {
-		return ModelExplorerUtils.getSelectionCommandContext();
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
deleted file mode 100644
index 39e1a4013a8..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
+++ /dev/null
@@ -1,62 +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:
- *  Patrick Tessier (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.query;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;
-import org.eclipse.papyrus.emf.facet.custom.ui.ImageUtils;
-import org.eclipse.papyrus.emf.facet.custom.ui.internal.query.ImageQuery;
-import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
-import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
-import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
-import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Stereotype;
-
-/** Create a basic label based on element name */
-public class GetImageQuery implements IJavaQuery2<Element, IImage> {
-
-	public static final String sysml_plugin_path = "platform:/plugin/org.eclipse.papyrus.sysml/";
-
-
-	@Override
-	public IImage evaluate(Element source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		String iconPath = "";
-		if (!source.getAppliedStereotypes().isEmpty()) {
-			Stereotype first_stereotype = source.getAppliedStereotypes().get(0);
-
-			if (!first_stereotype.getIcons().isEmpty()) {
-				org.eclipse.uml2.uml.Image icon = ElementUtil.getStereotypeImage(source, first_stereotype, "icon");
-				if (icon != null) {
-					iconPath = icon.getLocation();
-				}
-			}
-		}
-
-		String imagePath = "";
-
-		if (iconPath != null && !"".equals(iconPath)) {
-			URI iconURI = URI.createURI(iconPath);
-			if (iconURI.isRelative()) {
-				imagePath = sysml_plugin_path + iconPath;
-			} else {
-				imagePath = iconURI.toString();
-			}
-		}
-		if ("".equals(imagePath)) {
-			return ImageQuery.getEObjectImage(source);
-		}
-		return ImageUtils.wrap(imagePath);
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetLabelQuery.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetLabelQuery.java
deleted file mode 100644
index 0eb523de87b..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetLabelQuery.java
+++ /dev/null
@@ -1,44 +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:
- *  Patrick Tessier (CEA LIST) - Initial API and implementation
- *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- /*****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.query;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
-import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
-import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.uml2.uml.NamedElement;
-
-/** Create a basic label based on element name */
-public class GetLabelQuery implements IJavaQuery2<NamedElement, String> {
-
-	public static final String UNNAMED = "";
-
-
-	@Override
-	public String evaluate(NamedElement source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		ParameterValue parameterValue = parameterValues.getParameterValueByName("eObject");
-		if (parameterValue.getValue() instanceof EStructuralFeature) {
-			return ((EStructuralFeature) parameterValue.getValue()).getName();
-		}
-
-		String label = UNNAMED;
-		if (source.isSetName() && (!"".equals(source.getName().trim()))) {
-			label = UMLLabelInternationalization.getInstance().getLabel(source);
-		}
-		return label;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/HasImageQuery.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/HasImageQuery.java
deleted file mode 100644
index 7c07417ea63..00000000000
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/HasImageQuery.java
+++ /dev/null
@@ -1,35 +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:
- *  Patrick Tessier (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.query;
-
-import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
-import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
-import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
-import org.eclipse.uml2.uml.Element;
-
-/** Check is the element has a stereotype icon that can be used */
-public class HasImageQuery implements IJavaQuery2<Element, Boolean> {
-
-
-	@Override
-	public Boolean evaluate(Element source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		// IJavaQuery2<Element, String> ImgageGetter = new GetImageQuery();
-		// String temp_img_path = ImgageGetter.evaluate(source, parameterValues,facetManager);
-		// if(!"".equals(temp_img_path)) {
-		// return true;
-		// }
-
-		return false;
-	}
-}
diff --git a/plugins/sysml/modelexplorer/pom.xml b/plugins/sysml/modelexplorer/pom.xml
deleted file mode 100644
index cea29c20908..00000000000
--- a/plugins/sysml/modelexplorer/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.sysml-modelexplorer</artifactId>
-	<packaging>pom</packaging>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-    </parent>
-	<name>Papyrus SysML Model Explorer</name>
-	<description>Papyrus Model Explorer content providers for SysML.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.sysml.modelexplorer</module>
-	</modules>
-</project>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.classpath b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.project
deleted file mode 100644
index e23f3f7fa61..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.nattable.allocation.config</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 410244d65a6..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index cdb2a9f3e64..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml.nattable.menu;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.nattable.menu;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.config.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation.config;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/OSGI-INF/l10n/bundle.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 9b200ddddae..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation.config

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = SysML Allocation Table Configuration
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/about.html b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/build.properties
deleted file mode 100644
index bc8ea3707a0..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               build.properties,\

-               icons/,\

-               resources/,\

-               about.html,\

-               OSGI-INF/

-src.includes = about.html

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/old/table_SysML_Allocation.gif b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/old/table_SysML_Allocation.gif
deleted file mode 100644
index 6d9e22c5df6..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/old/table_SysML_Allocation.gif
+++ /dev/null
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/old/table_SysML_Allocation.png b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/old/table_SysML_Allocation.png
deleted file mode 100644
index 761ea002323..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/old/table_SysML_Allocation.png
+++ /dev/null
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png
deleted file mode 100644
index ad1a9335191..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png
+++ /dev/null
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
deleted file mode 100644
index 5c1e1a8350d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.nattable.tester">
-      <tester
-            class="org.eclipse.papyrus.sysml.nattable.allocation.config.tester.TableAllocationCreationTester"
-            id="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtablecreationtester">
-      </tester>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.nattable.configuration">
-      <configuration
-            file="resources/allocation.nattableconfiguration"
-            type="PapyrusSysMLAllocationTable">
-      </configuration>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.papyrus.sysml.nattable.allocation.config.handler.CreateAllocateHandler"
-            commandId="org.eclipse.papyrus.sysml.service.types.AllocateCreateCommand">
-         <activeWhen>
-            <with
-                  variable="selection">
-               <test
-                     forcePluginActivation="true"
-                     property="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtable.propertyTester.isAllocationTable"
-                     value="true">
-               </test>
-            </with>
-         </activeWhen>
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.eclipse.papyrus.sysml.nattable.allocation.config.tester.AllocationPropertyTester"
-            id="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtable.propertyTester"
-            namespace="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtable.propertyTester"
-            properties="isAllocationTable"
-            type="org.eclipse.jface.viewers.IStructuredSelection">
-      </propertyTester>
-   </extension>
-
-</plugin>
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
deleted file mode 100644
index 17ad2c3aad6..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml-nattable</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.nattable.allocation.config</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration
deleted file mode 100644
index 69444faad09..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table is used to display SysML Allocation" name="AllocationTable" type="PapyrusSysMLAllocationTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">

-    <stringListValue>ROW_HEADER</stringListValue>

-  </styles>

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml.nattable.allocation.config.allocationtablecreationtester"/>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">

-      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.sysml.Allocate">

-      <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      <postActions>applyStereotype:/SysML::Allocations::Allocate</postActions>

-      <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axisIdentifier>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml.nattable.allocate.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/client"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-    </axis>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>

-</nattableconfiguration:TableConfiguration>

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java
deleted file mode 100644
index d737e0ce926..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/Activator.java
+++ /dev/null
@@ -1,71 +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.sysml.nattable.allocation.config;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml.nattable.allocation.config"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java
deleted file mode 100644
index 67de9234ef3..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/handler/CreateAllocateHandler.java
+++ /dev/null
@@ -1,56 +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.sysml.nattable.allocation.config.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.INattableModelManagerUtils;

-import org.eclipse.papyrus.sysml.nattable.menu.handlers.AllocateHandler;

-

-/**

- * This handler allows to create an Allocate object, only if the table is a PapyrusSysMLAllocationTable

- *

- * @author vl222926

- *

- */

-public class CreateAllocateHandler extends AllocateHandler {

-

-	/**

-	 * the id used for the Papyrus SysML Allocation Table

-	 */

-	public static final String TABLE_ALLOCATION_TYPE = "PapyrusSysMLAllocationTable"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.sysml.nattable.menu.handlers.AbstractSysmlNattableCreateCommandHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		Command command = getCommand();

-		boolean isEnabled = command.canExecute();

-		INattableModelManager tableManager = INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());

-		isEnabled = isEnabled && tableManager.getTable().getTableConfiguration().getType().equals(TABLE_ALLOCATION_TYPE);

-		if (isEnabled) {

-			IElementType newElementType = getElementTypeToCreate();

-			String id = newElementType.getId();

-			isEnabled = tableManager.canCreateRowElement(id);

-		}

-		setBaseEnabled(isEnabled);

-

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/Messages.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/Messages.java
deleted file mode 100644
index 6ed417c2730..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/Messages.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.papyrus.sysml.nattable.allocation.config.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.sysml.nattable.allocation.config.messages.messages"; //$NON-NLS-1$

-

-	public static String TableAllocationCreationTester_NotAnUMLElement;

-

-	public static String TableAllocationCreationTester_OKMessage;

-

-	public static String TableAllocationCreationTester_ProfileNotApplied;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/messages.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/messages.properties
deleted file mode 100644
index 45f52336124..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-TableAllocationCreationTester_NotAnUMLElement=The context is not an UML Element

-TableAllocationCreationTester_OKMessage=The context allows to create an Allocation Table

-TableAllocationCreationTester_ProfileNotApplied=The profile {0} is not applied on the model

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java
deleted file mode 100644
index f2c3071a370..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/AllocationPropertyTester.java
+++ /dev/null
@@ -1,35 +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.sysml.nattable.allocation.config.tester;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.NattableWidgetPropertyTester;

-import org.eclipse.papyrus.sysml.nattable.allocation.config.handler.CreateAllocateHandler;

-

-

-public class AllocationPropertyTester extends NattableWidgetPropertyTester {

-

-	private static final String IS_ALLOCATION_TABLE = "isAllocationTable"; //$NON-NLS-1$

-

-	@Override

-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

-		final INattableModelManager manager = getNattableModelManager();

-		if (manager != null) {

-			if (IS_ALLOCATION_TABLE.equals(property) && expectedValue instanceof Boolean) {

-				return expectedValue.equals(manager.getTable().getTableConfiguration().getType().equals(CreateAllocateHandler.TABLE_ALLOCATION_TYPE));

-			}

-		}

-		return false;

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java
deleted file mode 100644
index b2383e36a65..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/src/org/eclipse/papyrus/sysml/nattable/allocation/config/tester/TableAllocationCreationTester.java
+++ /dev/null
@@ -1,53 +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.sysml.nattable.allocation.config.tester;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.nattable.allocation.config.Activator;

-import org.eclipse.papyrus.sysml.nattable.allocation.config.messages.Messages;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-public class TableAllocationCreationTester implements ITableTester {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.tester.ITableTester#isAllowed(java.lang.Object)

-	 *

-	 * @param context

-	 * @return

-	 */

-	@Override

-	public IStatus isAllowed(Object context) {

-		if (context instanceof Element) {

-			Element el = (Element) context;

-			boolean result = context instanceof Package;

-			if (result) {

-				final String packageQN = UMLUtil.getProfile(AllocationsPackage.eINSTANCE, el).getQualifiedName();

-				result = result && el.getNearestPackage().getAppliedProfile(packageQN, true) != null;

-				if (result) {

-					return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableAllocationCreationTester_OKMessage);

-				} else {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format(Messages.TableAllocationCreationTester_ProfileNotApplied, packageQN));

-				}

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableAllocationCreationTester_NotAnUMLElement);

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.classpath b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.project
deleted file mode 100644
index 3a7399c7bd7..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.nattable.allocation</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 410244d65a6..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 2f64a4dce27..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/OSGI-INF/l10n/bundle.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index dc8e278f9d7..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = SysML Allocation Table
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/about.html b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/build.properties
deleted file mode 100644
index 7c889ec2b89..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               OSGI-INF/,\

-               build.properties,\

-               icons/

-src.includes = about.html

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/icons/table_SysML_Allocation_new.png b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/icons/table_SysML_Allocation_new.png
deleted file mode 100644
index fc8ff255e1a..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/icons/table_SysML_Allocation_new.png
+++ /dev/null
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml
deleted file mode 100644
index d22991c9b73..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a SysML Allocation NatTable Editor"

-            id="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-            name="Create a new Allocation Table">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-            icon="icons/table_SysML_Allocation_new.png">

-      </image>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusSysMLAllocationTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-

-</plugin>

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
deleted file mode 100644
index 3eb82cbf29f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml-nattable</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.nattable.allocation</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java
deleted file mode 100644
index d9df1df13c2..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/src/org/eclipse/papyrus/sysml/nattable/allocation/Activator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.papyrus.sysml.nattable.allocation;

-

-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.sysml.nattable.allocation"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.classpath b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.classpath
deleted file mode 100644
index 9a39368d975..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.project
deleted file mode 100644
index fbcfc11693d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.nattable.menu</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4d72ad12656..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,288 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index eb998c34f59..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.nattable.menu.handlers
-Require-Bundle: org.eclipse.papyrus.uml.nattable.menu;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.menu.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.menu;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/OSGI-INF/l10n/bundle.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index ff2b1717df9..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.menu

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Menu for the creation of Sysml elements in the tabular editor
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/about.html b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/build.properties
deleted file mode 100644
index 8b230b23b15..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/,\

-           src-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               OSGI-INF/

-src.includes = about.html

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.properties
deleted file mode 100644
index 69523a809d3..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################
-# Copyright (c) 2015 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
-##################################################################################)
-
-pluginDescription=This plugin provides the context menu for the tabular editor in SysML, with handlers for the creation of SysML model elements
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.xml
deleted file mode 100644
index b48570ab753..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.xml
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-<extension point="org.eclipse.ui.handlers">

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ActorPartPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ActorPartCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-    <!-- commented because unactivated by the filter see bug 408984

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AllocateHandler" commandId="org.eclipse.papyrus.sysml.service.types.AllocateCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler> 

-    -->

-      <!-- commented because unactivated by the filter see bug 408984

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationCompositeHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationCompositeCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationCompositeDirectedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationCompositeDirectedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationNoneHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationNoneCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationNoneDirectedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationNoneDirectedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationSharedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationSharedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.AssociationSharedDirectedHandler" commandId="org.eclipse.papyrus.sysml.service.types.AssociationSharedDirectedCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-    -->

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.BlockHandler" commandId="org.eclipse.papyrus.sysml.service.types.BlockCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-      <!-- commented because unactivated by the filter see bug 408984

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConformHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConformCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-    -->

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConstraintBlockHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConstraintBlockCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConstraintBlockParameterHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConstraintBlockParameterCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ConstraintPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ConstraintPropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-      <!-- commented because unactivated by the filter see bug 408984

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.CopyHandler" commandId="org.eclipse.papyrus.sysml.service.types.CopyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.DeriveReqtHandler" commandId="org.eclipse.papyrus.sysml.service.types.DeriveReqtCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-    -->

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.DimensionHandler" commandId="org.eclipse.papyrus.sysml.service.types.DimensionCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPortHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPortCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_InOutHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_InOutCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_InHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_InCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_OutHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_OutCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPort_NAHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_NACreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowPropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.FlowSpecificationHandler" commandId="org.eclipse.papyrus.sysml.service.types.FlowSpecificationCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-      <!-- commented because unactivated by the filter see bug 408984

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ItemFlowHandler" commandId="org.eclipse.papyrus.sysml.service.types.ItemFlowCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-    -->

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.PartPropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.PartPropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ProblemHandler" commandId="org.eclipse.papyrus.sysml.service.types.ProblemCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.RationaleHandler" commandId="org.eclipse.papyrus.sysml.service.types.RationaleCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ReferencePropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ReferencePropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.RequirementHandler" commandId="org.eclipse.papyrus.sysml.service.types.RequirementCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-      <!-- commented because unactivated by the filter see bug 408984

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.SatisfyHandler" commandId="org.eclipse.papyrus.sysml.service.types.SatisfyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-    -->

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.UnitHandler" commandId="org.eclipse.papyrus.sysml.service.types.UnitCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValuePropertyHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValuePropertyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValueTypeHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValueTypeCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-      <!-- commented because unactivated by the filter see bug 408984

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValueType_EnumerationHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValueType_EnumerationCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ValueType_PrimitiveTypeHandler" commandId="org.eclipse.papyrus.sysml.service.types.ValueType_PrimitiveTypeCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.VerifyHandler" commandId="org.eclipse.papyrus.sysml.service.types.VerifyCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-    -->

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ViewHandler" commandId="org.eclipse.papyrus.sysml.service.types.ViewCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-	<handler class= "org.eclipse.papyrus.sysml.nattable.menu.handlers.ViewPointHandler" commandId="org.eclipse.papyrus.sysml.service.types.ViewPointCreateCommand" >

-    <activeWhen>

-       <with

-             variable="selection">

-          <test

-                property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                value="true">

-          </test>

-       </with>

-    </activeWhen></handler>

-</extension>

-

-<extension

-        point="org.eclipse.ui.menus">

-   <menuContribution

-         allPopups="true"

-         locationURI="popup:org.eclipse.papyrus.infra.nattable.widget.menu?after=org.eclipse.papyrus.uml.nattable.create.uml.menu">

-      <menu

-            id="org.eclipse.papyrus.sysml.nattable.create.sysml.menu"

-            label="Create SysML Element">

-         <visibleWhen

-               checkEnabled="false">

-            <with

-                  variable="selection">

-               <test

-                     property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                     value="true">

-               </test>

-            </with>

-         </visibleWhen>

-      </menu>

-   </menuContribution>

-      <menuContribution

-            allPopups="false"

-            class="org.eclipse.papyrus.sysml.nattable.menu.handlers.SysmlNattableCreateMenu"

-            locationURI="popup:org.eclipse.papyrus.sysml.nattable.create.sysml.menu">

-      </menuContribution>

-      

-      

-   </extension>

-</plugin>

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
deleted file mode 100644
index 365c39f81b9..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml-nattable</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.nattable.menu</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java
deleted file mode 100644
index 6039a1552be..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ActorPartPropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateActorPartWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for ActorPart (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class ActorPartPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.ACTOR_PART_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateActorPartWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java
deleted file mode 100644
index e8490f41414..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AllocateHandler.java
+++ /dev/null
@@ -1,43 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Allocate creation
- *
- * </pre>
- *
- * @generated
- */
-public class AllocateHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ALLOCATE;
-	}
-
-
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java
deleted file mode 100644
index 6267a35e828..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeDirectedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationCompositeDirected creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationCompositeDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java
deleted file mode 100644
index b7f134c5ff7..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationCompositeHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationComposite creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationCompositeHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_COMPOSITE;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java
deleted file mode 100644
index 2e1583d7772..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Association creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java
deleted file mode 100644
index 14cf814051b..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneDirectedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationNoneDirected creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationNoneDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_NONE_DIRECTED;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java
deleted file mode 100644
index c502e737a8b..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationNoneHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationNone creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationNoneHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_NONE;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java
deleted file mode 100644
index f8890d0aa14..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedDirectedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationSharedDirected creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationSharedDirectedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java
deleted file mode 100644
index f525a7d6f8e..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/AssociationSharedHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for AssociationShared creation
- *
- * </pre>
- *
- * @generated
- */
-public class AssociationSharedHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ASSOCIATION_SHARED;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java
deleted file mode 100644
index 6e7fa9d35ef..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/BlockHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Block creation
- *
- * </pre>
- *
- * @generated
- */
-public class BlockHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.BLOCK;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java
deleted file mode 100644
index 2369b67eca1..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConformHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Conform creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConformHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONFORM;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java
deleted file mode 100644
index 2127cf9a41c..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConstraintBlock creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConstraintBlockHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONSTRAINT_BLOCK;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java
deleted file mode 100644
index ed345c0fe6b..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintBlockParameterHandler.java
+++ /dev/null
@@ -1,92 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <pre>
- * Command handler for Problem creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConstraintBlockParameterHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * &#64;see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * &#64;return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return UMLElementTypes.PROPERTY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Command buildCommand() {
-
-		if (getCommandContext() == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		EObject container = getCommandContext().getContainer();
-		EReference reference = getCommandContext().getReference();
-
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		CreateElementRequest createRequest = null;
-		if (reference == null) {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());
-		} else {
-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);
-		}
-
-		String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", ((Element) container).eContents()); //$NON-NLS-1$
-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getNamedElement_Name(), name));
-
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(createRequest);
-		if (createGMFCommand != null) {
-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
-			return emfCommand;
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java
deleted file mode 100644
index 6d270547c11..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ConstraintPropertyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ConstraintProperty creation
- *
- * </pre>
- *
- * @generated
- */
-public class ConstraintPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.CONSTRAINT_PROPERTY;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java
deleted file mode 100644
index 6fc699f754e..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/CopyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Copy creation
- *
- * </pre>
- *
- * @generated
- */
-public class CopyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.COPY;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java
deleted file mode 100644
index 6b6297be4b3..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DeriveReqtHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for DeriveReqt creation
- *
- * </pre>
- *
- * @generated
- */
-public class DeriveReqtHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.DERIVE_REQT;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java
deleted file mode 100644
index bdbea1f7552..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/DimensionHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Dimension creation
- *
- * </pre>
- *
- * @generated
- */
-public class DimensionHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.DIMENSION;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java
deleted file mode 100644
index 2aca0311d14..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPortHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPortHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java
deleted file mode 100644
index e0b6b2afa5f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_In creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPort_InHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_IN;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java
deleted file mode 100644
index 9e044ef8f70..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_InOutHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_InOut creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPort_InOutHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_IN_OUT;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java
deleted file mode 100644
index 2b06eeabebd..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_NAHandler.java
+++ /dev/null
@@ -1,70 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;

-

-/**

- * <pre>

- * Command handler for FlowPort non atomic creation

- *

- * </pre>

- *

- * @generated

- */

-public class FlowPort_NAHandler extends FlowPortHandler {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java
deleted file mode 100644
index 235a5aa787a..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPort_OutHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowPort_Out creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPort_OutHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PORT_OUT;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java
deleted file mode 100644
index 99afccedef1..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowPropertyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowProperty creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PROPERTY;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java
deleted file mode 100644
index 25b7544adaa..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/FlowSpecificationHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for FlowSpecification creation
- *
- * </pre>
- *
- * @generated
- */
-public class FlowSpecificationHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_SPECIFICATION;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java
deleted file mode 100644
index c2a124b361d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ItemFlowHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ItemFlow creation
- *
- * </pre>
- *
- * @generated
- */
-public class ItemFlowHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.ITEM_FLOW;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java
deleted file mode 100644
index 108247b745a..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/PartPropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreatePartWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for Part (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class PartPropertyHandler extends AbstractSysmlNattableCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.PART_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java
deleted file mode 100644
index 97a39a53268..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ProblemHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Problem creation
- *
- * </pre>
- *
- * @generated
- */
-public class ProblemHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.PROBLEM;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java
deleted file mode 100644
index 096ead26553..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RationaleHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Rationale creation
- *
- * </pre>
- *
- * @generated
- */
-public class RationaleHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.RATIONALE;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java
deleted file mode 100644
index 9a66f9a4ae0..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ReferencePropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateReferenceWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for Reference (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class ReferencePropertyHandler extends AbstractSysmlNattableCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.REFERENCE_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java
deleted file mode 100644
index 618b6e8477a..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/RequirementHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Requirement creation
- *
- * </pre>
- *
- * @generated
- */
-public class RequirementHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.REQUIREMENT;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java
deleted file mode 100644
index 7ccea609f06..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/SatisfyHandler.java
+++ /dev/null
@@ -1,42 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Satisfy creation
- *
- * </pre>
- *
- * @generated
- */
-public class SatisfyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.SATISFY;
-	}
-
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java
deleted file mode 100644
index ac027f325e6..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/UnitHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Unit creation
- *
- * </pre>
- *
- * @generated
- */
-public class UnitHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.UNIT;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java
deleted file mode 100644
index 34cb377383d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValuePropertyHandler.java
+++ /dev/null
@@ -1,87 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateValueWithTypeConfigureCommandFactory;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-

-/**

- * <pre>

- * Command handler for Value (Property) creation

- *

- * </pre>

- *

- * @generated

- */

-public class ValuePropertyHandler extends AbstractSysmlNattableCreateCommandHandler {

-

-	/**

-	 * <pre>

-	 * &#64;see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()

-	 *

-	 * &#64;return the IElementType this handler is supposed to create

-	 *

-	 * </pre>

-	 *

-	 * @generated

-	 */

-	@Override

-	protected IElementType getElementTypeToCreate() {

-		return SysMLElementTypes.VALUE_PROPERTY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Command buildCommand() {

-

-		if (getCommandContext() == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		EObject container = getCommandContext().getContainer();

-		EReference reference = getCommandContext().getReference();

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

-		if (provider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		CreateElementRequest createRequest = null;

-		if (reference == null) {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate());

-		} else {

-			createRequest = new CreateElementRequest(container, getElementTypeToCreate(), reference);

-		}

-		createRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());

-

-		// Retrieve create command from the Element Edit service

-		ICommand createGMFCommand = provider.getEditCommand(createRequest);

-		if (createGMFCommand != null) {

-			Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);

-			return emfCommand;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java
deleted file mode 100644
index a39d92880d7..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueTypeHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType creation
- *
- * </pre>
- *
- * @generated
- */
-public class ValueTypeHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java
deleted file mode 100644
index 5612bce9b3b..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_EnumerationHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType_Enumeration creation
- *
- * </pre>
- *
- * @generated
- */
-public class ValueType_EnumerationHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE_ENUMERATION;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java
deleted file mode 100644
index 8588412d3a0..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ValueType_PrimitiveTypeHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ValueType_PrimitiveType creation
- *
- * </pre>
- *
- * @generated
- */
-public class ValueType_PrimitiveTypeHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java
deleted file mode 100644
index 8620f3b9175..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/VerifyHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Verify creation
- *
- * </pre>
- *
- * @generated
- */
-public class VerifyHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VERIFY;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java
deleted file mode 100644
index 3519efd56b3..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for View creation
- *
- * </pre>
- *
- * @generated
- */
-public class ViewHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VIEW;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java
deleted file mode 100644
index 429643d85b5..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src-gen/org/eclipse/papyrus/sysml/nattable/menu/handlers/ViewPointHandler.java
+++ /dev/null
@@ -1,41 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for ViewPoint creation
- *
- * </pre>
- *
- * @generated
- */
-public class ViewPointHandler extends AbstractSysmlNattableCreateCommandHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
-	 *
-	 * @return the IElementType this handler is supposed to create
-	 *
-	 * </pre>
-	 *
-	 * @generated
-	 */
-	@Override
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.VIEW_POINT;
-	}
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java
deleted file mode 100644
index 2513db21ea0..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/Activator.java
+++ /dev/null
@@ -1,69 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml.nattable.menu"; //$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(plugin);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java
deleted file mode 100644
index f8795698416..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/AbstractSysmlNattableCreateCommandHandler.java
+++ /dev/null
@@ -1,78 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.utils.INattableModelManagerUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.sysml.service.types.handlers.AbstractSysmlCreateElementCommandHandler;
-import org.eclipse.papyrus.uml.nattable.menu.util.TableMenuUtils;
-import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;
-
-/**
- * Abstract handler for the creation commands of Sysml elements in the Nattable editor
- *
- */
-public abstract class AbstractSysmlNattableCreateCommandHandler extends AbstractSysmlCreateElementCommandHandler {
-
-	/**
-	 * <pre>
-	 *
-	 * Build the create command for an element creation in the selected container.
-	 * The create command is given by the {@link IElementEditService} of selected
-	 * element.
-	 *
-	 * @return the composite creation command for current selection
-	 *
-	 * </pre>
-	 */
-	@Override
-	protected Command buildCommand() {
-		Command createCmd = super.buildCommand();
-		return TableMenuUtils.buildNattableCreationCommand(createCmd, this.createRequest);
-	}
-
-	/**
-	 * Obtain the context of the active table editor.
-	 *
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCommandHandler#getCommandContext()
-	 *
-	 * @return
-	 */
-	@Override
-	protected ICommandContext getCommandContext() {
-		return TableMenuUtils.getTableCreateElementCommandContext(INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart()));
-
-	}
-
-	/**
-	 * Verify if this handler is currently active and the command can execute. Additionally, verify if this table can add this type of element.
-	 *
-	 * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#setEnabled(java.lang.Object)
-	 *
-	 * @param evaluationContext
-	 */
-	@Override
-	public void setEnabled(Object evaluationContext) {
-		INattableModelManager tableManager = INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());
-		boolean isEnabled = tableManager.canCreateRowElement(getElementTypeToCreate().getId());
-		if (isEnabled) {
-			// we test the enable of the super implementation
-			super.setEnabled(evaluationContext);
-			isEnabled = super.isEnabled();
-		}
-		setBaseEnabled(isEnabled);
-
-	}
-
-}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java
deleted file mode 100644
index 824b86527b7..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/src/org/eclipse/papyrus/sysml/nattable/menu/handlers/SysmlNattableCreateMenu.java
+++ /dev/null
@@ -1,35 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.menu.handlers;

-

-import org.eclipse.papyrus.infra.nattable.utils.NattableWidgetPropertyTester;

-import org.eclipse.papyrus.sysml.service.types.menu.AbstractCreateSysmlChildMenu;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.menus.IContributionRoot;

-import org.eclipse.ui.services.IServiceLocator;

-

-/**

- * Menu contributions for the creation of Sysml elements from the Nattable editor

- */

-public class SysmlNattableCreateMenu extends AbstractCreateSysmlChildMenu {

-

-	private NattableWidgetPropertyTester tester = new NattableWidgetPropertyTester();

-

-	@Override

-	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {

-		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

-		if (tester.test(part, NattableWidgetPropertyTester.IS_NATTABLE_WIDGET, null, Boolean.TRUE)) {

-			super.createContributionItems(serviceLocator, additions);

-		}

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.classpath b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.project
deleted file mode 100644
index 6c7037e739c..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.nattable.requirement.config</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 410244d65a6..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 190f0ff29a7..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sysml.nattable;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.papyrus.sysml.nattable.requirement.config
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.config.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.config;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/OSGI-INF/l10n/bundle.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index c52b7a230b6..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.requirement.config

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Nattable Requirement Configuration
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/about.html b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties
deleted file mode 100644
index e9f93383ebb..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               configs/,\

-               icons/,\

-               about.html

-src.includes = about.html

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration
deleted file mode 100644
index c3145f797bc..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusSysMLRequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">

-    <stringListValue>ROW_HEADER</stringListValue>

-  </styles>

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml.nattable.config.canCreateRequirementTable"/>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">

-      <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.sysml.Requirement">

-      <postActions>applyStereotype:/SysML::Requirements::Requirement</postActions>

-      <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axisIdentifier>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml.nattable.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-</nattableconfiguration:TableConfiguration>

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/old/table_SysML_Requirement.gif b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/old/table_SysML_Requirement.gif
deleted file mode 100644
index 91fc98b9a8f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/old/table_SysML_Requirement.gif
+++ /dev/null
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.png b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.png
deleted file mode 100644
index a3254323439..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.png
+++ /dev/null
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.properties
deleted file mode 100644
index f4c3f32fc68..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################
-# Copyright (c) 2015 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
-##################################################################################)
-
-pluginDescription=This plugin provides the configuration to use for Requirement Table.
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
deleted file mode 100644
index da01c0a1d25..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.nattable.configuration">
-      <configuration
-            file="configs/requirement.nattableconfiguration"
-            type="PapyrusSysMLRequirementTable">
-      </configuration>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.nattable.tester">
-      <tester
-            class="org.eclipse.papyrus.sysml.nattable.requirement.tester.RequirementTableTester"
-            id="org.eclipse.papyrus.sysml.nattable.config.canCreateRequirementTable">
-      </tester>
-   </extension>
-</plugin>
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
deleted file mode 100644
index 0f19ef83fac..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml-nattable</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.nattable.requirement.config</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java
deleted file mode 100644
index 1c0970ea69d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/config/Activator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.papyrus.sysml.nattable.requirement.config;

-

-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.sysml.nattable.requirement.config"; //$NON-NLS-1$

-

-	public static final String TABLE_TYPE = "PapyrusSysMLRequirementTable"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java
deleted file mode 100644
index dca1839203c..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/src/org/eclipse/papyrus/sysml/nattable/requirement/tester/RequirementTableTester.java
+++ /dev/null
@@ -1,62 +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.sysml.nattable.requirement.tester;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

-import org.eclipse.papyrus.sysml.nattable.requirement.config.Activator;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * The tester used to know if we can create requirement table

- *

- * @author Vincent Lorenzo

- *

- */

-public class RequirementTableTester implements ITableTester {

-

-	private static final IElementMatcher matcher = new RequirementMatcher();

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.tester.ITableTester#isAllowed(java.lang.Object)

-	 *

-	 * @param context

-	 * @return

-	 */

-	@Override

-	public IStatus isAllowed(Object context) {

-		if (context instanceof Element) {

-			Element el = (Element) context;

-			boolean result = context instanceof Package || matcher.matches(el);

-			if (result) {

-				final String packageQN = UMLUtil.getProfile(RequirementsPackage.eINSTANCE, el).getQualifiedName();

-				result = result && el.getNearestPackage().getAppliedProfile(packageQN, true) != null;

-				if (result) {

-					return new Status(IStatus.OK, Activator.PLUGIN_ID, "The context allowed to create a Requirement Table");

-				} else {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("The profile {0} is not applied on the model", packageQN));

-				}

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The context is not an UML Element");

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.classpath b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.project
deleted file mode 100644
index f501be3c500..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.nattable.requirement</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4d72ad12656..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,288 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-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/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 00aabed78cd..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.nattable;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/OSGI-INF/l10n/bundle.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index d1e2991f453..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.requirement

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Nattable Requirement Editor
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/about.html b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/build.properties
deleted file mode 100644
index 73e2dede47b..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               OSGI-INF/,\

-               icons/

-src.includes = about.html

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/icons/table_SysML_Requirement_new.png b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/icons/table_SysML_Requirement_new.png
deleted file mode 100644
index ed086b5b812..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/icons/table_SysML_Requirement_new.png
+++ /dev/null
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.properties
deleted file mode 100644
index 8895526e182..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################
-# Copyright (c) 2015 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
-##################################################################################)
-
-pluginDescription=This plugin provides the nattable editor for SysML Requirements.
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml
deleted file mode 100644
index 19aa4a4f0ca..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

- <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a SysML Requirement NatTable Editor"

-            id="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-            name="Create a new Requirement Table">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a SysML Requirement NatTable Editor Without Dialog for Name"

-            id="org.eclipse.papyrus.sysml.nattable.requirement.create.withoutdialog.command"

-            name="Create a new Requirement Table">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusSysMLRequirementTable">

-            </parameter>

-         </class>

-      </handler>

-      <handler

-            commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.withoutdialog.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorWithoutDialogHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusSysMLRequirementTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-            icon="icons/table_SysML_Requirement_new.png">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.withoutdialog.command"

-            icon="icons/table_SysML_Requirement_new.png">

-      </image>

-   </extension>

-</plugin>

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
deleted file mode 100644
index 22756004257..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml-nattable</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.nattable.requirement</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java
deleted file mode 100644
index ad040752873..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/src/org/eclipse/papyrus/sysml/nattable/requirement/Activator.java
+++ /dev/null
@@ -1,67 +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.sysml.nattable.requirement;

-

-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.sysml.nattable.requirement"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.classpath b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/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/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.project b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.project
deleted file mode 100644
index 8576e75bec3..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.nattable</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4d72ad12656..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,288 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-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/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 8048f715d94..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.nattable.manager.axis
-Require-Bundle: org.eclipse.papyrus.uml.nattable;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.nattable.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/OSGI-INF/l10n/bundle.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 9481fc3d62c..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = SysML Nattable
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/about.html b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/build.properties
deleted file mode 100644
index b9407811706..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html

-src.includes = about.html

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.properties
deleted file mode 100644
index 37d84869cb4..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################
-# Copyright (c) 2015 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
-##################################################################################)
-
-pluginDescription=This plugin provides common classes for the sysml nattable.
\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.xml
deleted file mode 100644
index c8f6f79da45..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="1700"

-            provider="org.eclipse.papyrus.sysml.nattable.provider.SysMLFlowPortDirectionLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.body.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.cellmanager">

-      <cellManager

-            id="org.eclipse.papyrus.sysml.nattable.common.stereotype.property.cell.manager"

-            manager="org.eclipse.papyrus.sysml.nattable.manager.cell.SysMLStereotypePropertyCellManager"

-            order="250">

-      </cellManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.axismanager">

-      <axisManager

-            id="org.eclipse.papyrus.sysml.nattable.requirement.axis.manager"

-            manager="org.eclipse.papyrus.sysml.nattable.manager.axis.RequirementAxisManager">

-      </axisManager>

-      <axisManager

-            id="org.eclipse.papyrus.sysml.nattable.allocate.axis.manager"

-            manager="org.eclipse.papyrus.sysml.nattable.manager.axis.AllocateAxisManager">

-      </axisManager>

-   </extension>

-</plugin>

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/pom.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/pom.xml
deleted file mode 100644
index 1595bf62b01..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.sysml-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.sysml.nattable</artifactId>

-	<version>2.0.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/src/org/eclipse/papyrus/sysml/nattable/Activator.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java
deleted file mode 100644
index e0b8269191d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/Activator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.papyrus.sysml.nattable;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.sysml.nattable"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		log = new LogHelper(this);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java
deleted file mode 100644
index 81e4e10f12d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/AllocateAxisManager.java
+++ /dev/null
@@ -1,108 +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.sysml.nattable.manager.axis;

-

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.papyrus.sysml.allocations.Allocate;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Axis Manager for Allocate

- *

- * @author vl222926

- *

- */

-public class AllocateAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<Allocate> {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 *

-	 * @param elementId

-	 * @return

-	 */

-	@Override

-	public boolean canCreateAxisElement(final String elementId) {

-		return ((ISpecializationType) SysMLElementTypes.ALLOCATE).getId().equals(elementId);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	protected boolean isInstanceOfRequiredStereotypeApplication(Object object) {

-		return object instanceof Allocate;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)

-	 *

-	 * @param el

-	 * @return

-	 */

-	@Override

-	protected Allocate getStereotypeApplication(final Element el) {

-		return UMLUtil.getStereotypeApplication(el, Allocate.class);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeBaseElement(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param stereotypeApplication

-	 * @return

-	 */

-	@Override

-	protected Element getStereotypeBaseElement(final Allocate stereotypeApplication) {

-		return stereotypeApplication.getBase_Abstraction();

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getStereotypeApplicationBasePropertyName() {

-		return AllocationsPackage.eINSTANCE.getAllocate_Base_Abstraction().getName();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean isAllowedAsBaseElement(Element element) {

-		return element instanceof Abstraction;

-	}

-

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java
deleted file mode 100644
index 937bfd4f960..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/axis/RequirementAxisManager.java
+++ /dev/null
@@ -1,108 +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.sysml.nattable.manager.axis;

-

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-

-

-/**

- * AxisManager for SysML Requirements

- *

- * @author Vincent Lorenzo

- *

- */

-public class RequirementAxisManager extends AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager<Requirement> {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 *

-	 * @param elementId

-	 * @return

-	 */

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return ((ISpecializationType) SysMLElementTypes.REQUIREMENT).getId().equals(elementId);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplication(org.eclipse.uml2.uml.Element)

-	 *

-	 * @param el

-	 * @return

-	 */

-	@Override

-	protected Requirement getStereotypeApplication(Element el) {

-		return UMLUtil.getStereotypeApplication(el, Requirement.class);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isInstanceOfRequiredStereotypeApplication(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	protected boolean isInstanceOfRequiredStereotypeApplication(final Object object) {

-		return object instanceof Requirement;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeBaseElement(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param stereotypeApplication

-	 * @return

-	 */

-	@Override

-	protected Element getStereotypeBaseElement(final Requirement stereotypeApplication) {

-		return stereotypeApplication.getBase_Class();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#isAllowedAsBaseElement(org.eclipse.uml2.uml.Element)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean isAllowedAsBaseElement(final Element element) {

-		return element instanceof Class;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.axis.AbstractStereotypedElementUMLSynchronizedOnFeatureAxisManager#getStereotypeApplicationBasePropertyName()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getStereotypeApplicationBasePropertyName() {

-		return RequirementsPackage.eINSTANCE.getRequirement_Base_Class().getName();

-	}

-

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java
deleted file mode 100644
index 1c1d7e8405d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/manager/cell/SysMLStereotypePropertyCellManager.java
+++ /dev/null
@@ -1,86 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.nattable.manager.cell;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher;

-import org.eclipse.papyrus.uml.nattable.manager.cell.StereotypePropertyCellManager;

-import org.eclipse.papyrus.uml.nattable.utils.Constants;

-import org.eclipse.uml2.uml.Port;

-

-/**

- *

- * This cell manager manages the cell displaying the direction of the FlowPort.

- * If the flowport is not atomic, the cell is not editable and the direction is N/A.

- *

- */

-public class SysMLStereotypePropertyCellManager extends StereotypePropertyCellManager {

-

-	/**

-	 * the FlowPort isAtomicMatcher

-	 */

-	private static FlowPortNAMatcher matcher = new FlowPortNAMatcher();

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.cell.manager.StereotypePropertyCellManager#handles(java.lang.Object, java.lang.Object, INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(final Object columnElement, final Object rowElement, final INattableModelManager tableManager) {

-		if (super.handles(columnElement, rowElement, tableManager)) {

-			final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement, null);

-			if (objects.size() == 2) {

-				final EObject object = (EObject) objects.get(0);

-				if (object instanceof Port) {

-					String propertyQualifiedName = (String) objects.get(1);

-					propertyQualifiedName = propertyQualifiedName.substring(Constants.PROPERTY_OF_STEREOTYPE_PREFIX.length(), propertyQualifiedName.length());

-					return propertyQualifiedName.equals(org.eclipse.papyrus.sysml.nattable.utils.Constants.STEREOTYPE_FLOWPORT_DIRECTION);

-				}

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.uml.nattable.manager.cell.manager.StereotypePropertyCellManager#isCellEditable(java.lang.Object, java.lang.Object, INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public boolean isCellEditable(final Object columnElement, final Object rowElement, final INattableModelManager tableManager) {

-		boolean value = super.isCellEditable(columnElement, rowElement, tableManager);

-		if (value) {

-			final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement, null);

-			if (objects.size() == 2) {

-				final EObject object = (EObject) objects.get(0);

-				if (matcher.matches(object)) {

-					value = false;

-				}

-			}

-		}

-		return value;

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
deleted file mode 100644
index dd08ded4134..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
+++ /dev/null
@@ -1,80 +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.sysml.nattable.provider;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher;

-import org.eclipse.papyrus.uml.nattable.provider.AbstractUMLNattableCellLabelProvider;

-import org.eclipse.uml2.uml.Port;

-

-/**

- * This label provider allows to display N/A for the direction of the FlowPort when its requred!

- *

- * @author Vincent Lorenzo

- *

- */

-public class SysMLFlowPortDirectionLabelProvider extends AbstractUMLNattableCellLabelProvider {

-

-	/**

-	 * N/A FlowPort matcher

-	 */

-	private static final FlowPortNAMatcher matcher = new FlowPortNAMatcher();

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(final Object element) {

-		if (element instanceof LabelProviderCellContextElementWrapper) {

-			final ILayerCell cell = ((LabelProviderCellContextElementWrapper) element);

-			final IConfigRegistry registry = ((LabelProviderCellContextElementWrapper) element).getConfigRegistry();

-			final Object columnObject = getColumnObject(cell, registry);

-			String str = AxisUtils.getPropertyId(columnObject);

-			if (str == null) {

-				final Object rowObject = getRowObject(cell, registry);

-				str = AxisUtils.getPropertyId(rowObject);

-			}

-			if (str != null) {

-				return str.endsWith(org.eclipse.papyrus.sysml.nattable.utils.Constants.STEREOTYPE_FLOWPORT_DIRECTION);

-			}

-		}

-		return false;

-	}

-

-	@Override

-	public String getText(Object element) {

-		final ILayerCell cell = ((LabelProviderCellContextElementWrapper) element);

-		final IConfigRegistry configRegistry = ((LabelProviderCellContextElementWrapper) element).getConfigRegistry();

-		final Object rowObject = getRowObject(cell, configRegistry);

-		final Object columObject = getColumnObject(cell, configRegistry);

-		Port port = null;

-		if (rowObject instanceof Port) {

-			port = (Port) rowObject;

-		} else if (columObject instanceof Port) {

-			port = (Port) columObject;

-		}

-		if (port != null && matcher.matches(port)) {

-			return Constants.NOT_AVALAIBLE;

-		}

-		return super.getText(element);

-	}

-}

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java
deleted file mode 100644
index dbe83d90d9d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/utils/Constants.java
+++ /dev/null
@@ -1,28 +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.sysml.nattable.utils;

-

-

-public class Constants {

-

-	private Constants() {

-		// to prevent instanciation

-	}

-

-

-	/**

-	 * The qualified name of the property direction

-	 */

-	public static final String STEREOTYPE_FLOWPORT_DIRECTION = "SysML::PortAndFlows::FlowPort::direction";

-}

diff --git a/plugins/sysml/nattable/pom.xml b/plugins/sysml/nattable/pom.xml
deleted file mode 100755
index 3f3b44a90d0..00000000000
--- a/plugins/sysml/nattable/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml-nattable</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Papyrus SysML NatTable</name>
-	<description>Papyrus Nattable are a set of plugins dedicated to manage tables in relation with models.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.sysml.nattable</module>
-		<module>org.eclipse.papyrus.sysml.nattable.allocation</module>
-		<module>org.eclipse.papyrus.sysml.nattable.allocation.config</module>
-		<module>org.eclipse.papyrus.sysml.nattable.menu</module>
-		<module>org.eclipse.papyrus.sysml.nattable.requirement</module>
-		<module>org.eclipse.papyrus.sysml.nattable.requirement.config</module>
-	</modules>
-</project>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.classpath b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.classpath
deleted file mode 100644
index b3d4acc64d3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="custom-src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.project b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.project
deleted file mode 100644
index 74419a68154..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f00da6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.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/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index d9510f3a65b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.sysml.activities.provider,
- org.eclipse.papyrus.sysml.allocations.provider,
- org.eclipse.papyrus.sysml.blocks.provider,
- org.eclipse.papyrus.sysml.constraints.provider,
- org.eclipse.papyrus.sysml.edit.provider,
- org.eclipse.papyrus.sysml.edit.umllayer,
- org.eclipse.papyrus.sysml.modelelements.provider,
- org.eclipse.papyrus.sysml.portandflows.provider,
- org.eclipse.papyrus.sysml.provider,
- org.eclipse.papyrus.sysml.registry,
- org.eclipse.papyrus.sysml.requirements.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.provider.SysmlEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/about.html b/plugins/sysml/org.eclipse.papyrus.sysml.edit/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/build.properties b/plugins/sysml/org.eclipse.papyrus.sysml.edit/build.properties
deleted file mode 100644
index b36b6fdbd32..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#

-#Mon Sep 12 09:30:15 CEST 2011

-output..=bin/

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html,\

-               custom-src/

-jars.compile.order=.

-src.includes = icons/,\

-               about.html

-source.. = src/,\

-           custom-src/

-bin..=bin/

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IComposableAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IComposableAdapterFactory.java
deleted file mode 100644
index a32c9617bc8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IComposableAdapterFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.edit.provider;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-

-

-/**

- * The purpose of this interface is to create composable adapterFactory but in a

- * way much simpler than EMF does.

- *

- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net

- *         ">arthur.daussy@atos.net</a>"

- *

- */

-public interface IComposableAdapterFactory {

-

-	/**

-	 * Return the root of the adapter factory

-	 *

-	 * @return {@link AdapterFactory}

-	 */

-	public IRootAdapterFactory getIRootAdapterFactory();

-

-	/**

-	 * Set the root AdapterFactory

-	 *

-	 * @param root

-	 */

-	public void setRootAdapterFactory(IRootAdapterFactory root);

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IRootAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IRootAdapterFactory.java
deleted file mode 100644
index 06663c15a02..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IRootAdapterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.edit.provider;

-

-/**

- * Interfaces which has to be implemented by Root AdapterFactory

- */

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-

-public interface IRootAdapterFactory {

-

-	/**

-	 * Give back the itemProvider which correspond to the given EClass In this

-	 * prog : used to get back the UML ItemProvider of the EClass

-	 *

-	 * @param eClass

-	 * @return

-	 */

-	public ItemProviderAdapter getItemProvider(EClass eClass);

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IVisibilityOverlayImage.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IVisibilityOverlayImage.java
deleted file mode 100644
index 5dbb64dfac3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/IVisibilityOverlayImage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.edit.provider;

-

-import org.eclipse.emf.edit.provider.ComposedImage;

-

-/**

- * Interface that allow an ItemProvider to compose an overlay that handle

- * visibility logo

- *

- * @author Arthur Daussy <a

- *         href=mailto:arthur.daussy@atos.net>arthur.daussy@atos.net</a>

- *

- */

-public interface IVisibilityOverlayImage {

-

-	ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage);

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/SysMLItemProviderAdapter.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/SysMLItemProviderAdapter.java
deleted file mode 100644
index 9f7876c3d9c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/provider/SysMLItemProviderAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.edit.provider;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * Extends org.eclipse.emf.edit.provider.ItemProviderAdapter in order to

- * implement specific SysML itemProvider fonctions

- *

- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net

- *         ">arthur.daussy@atos.net</a>"

- *

- */

-public class SysMLItemProviderAdapter extends ItemProviderAdapter implements IVisibilityOverlayImage {

-

-	public SysMLItemProviderAdapter(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * Compose the image with specific visibility logo Copied from UML

-	 * implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	@Override

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-		return composedImage;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/umllayer/SysLMOverUMLItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/umllayer/SysLMOverUMLItemProviderAdapterFactory.java
deleted file mode 100644
index e425847bd39..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/custom-src/org/eclipse/papyrus/sysml/edit/umllayer/SysLMOverUMLItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/**

- *  Copyright (c) 2011 Atos.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Atos - Initial API and implementation

- *

- */

-package org.eclipse.papyrus.sysml.edit.umllayer;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Map;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChildCreationExtender;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.edit.provider.IRootAdapterFactory;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.papyrus.sysml.registry.SysmlRegistryAdapterFactoryRegistry;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * This class implement an ItemProvider for all sysml elements. It will add a

- * new layer in order to have only one ItemProvider instead of one for each

- * EPackage. Moreover this ItemProvider will accept UML elements stereotypes by

- * SysML profile in order to display them as SysML elements

- *

- * @author Arthur Daussy - arthur.daussy@atos.net

- *

- */

-public class SysLMOverUMLItemProviderAdapterFactory extends AdapterFactoryImpl implements IChildCreationExtender, IRootAdapterFactory, ComposeableAdapterFactory {

-

-	/**

-	 * registry of all needed UMLItemProvider

-	 */

-	private Map<EClass, ItemProviderAdapter> umlItemProviderRegistery;

-

-	/**

-	 * This helps manage the child creation extenders. <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 */

-	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(SysmlEditPlugin.INSTANCE, UMLPackage.eNS_URI);

-

-	/**

-	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 */

-	protected static EPackage modelPackage;

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * Keet track of the Adapter registery

-	 */

-	protected SysmlRegistryAdapterFactoryRegistry registery = null;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 */

-	public SysLMOverUMLItemProviderAdapterFactory() {

-		/**

-		 * Initialise all composable factory

-		 */

-		getSysmlRegistryAdapterFactoryRegistry().setRootAdapterFactory(this);

-		/*

-		 * Supported type

-		 */

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		/*

-		 * Initialize model package

-		 */

-		supportedTypes.add(IItemPropertySource.class);

-		if (modelPackage == null) {

-			modelPackage = UMLPackage.eINSTANCE;

-		}

-		/**

-		 * Initialize all UMLItemProviderNeeded

-		 */

-		umlItemProviderRegistery = getSysmlRegistryAdapterFactoryRegistry().getUMLItemProviderClassifedByUMLElement(this);

-	}

-

-	/**

-	 * {@link AdapterFactoryImpl#adapt(Notifier, Object)} Look among the sysml

-	 * item provider adapter factory if on is correct. If not use the UML item

-	 * provider adapter factory

-	 */

-	@Override

-	public Adapter adapt(Notifier target, Object type) {

-		Adapter result = null;

-		for (AdapterFactory adFac : getSysmlRegistryAdapterFactoryRegistry().getAdapterFactoriesForType(target)) {

-			result = adFac.adaptNew(target, type);

-			if (result != null) {

-				return result;

-			}

-		}

-		return getSysmlRegistryAdapterFactoryRegistry().getDefaultAdapterFactory().adapt(target, type);

-	}

-

-	/**

-	 * Get the getSysmlRegistryAdapterFactoryRegistry

-	 *

-	 * @return

-	 */

-	private SysmlRegistryAdapterFactoryRegistry getSysmlRegistryAdapterFactoryRegistry() {

-		if (registery == null) {

-			registery = SysmlRegistryAdapterFactoryRegistry.getSingleton();

-		}

-		return registery;

-	}

-

-	/**

-	 * {@link AdapterFactoryImpl#adapt(Object, Object)}

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * {@link AdapterFactoryImpl#isFactoryForType(Object)}

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || superIsFactoryForType(type);

-	}

-

-	/**

-	 * Test if the EPackage correspond to UML

-	 *

-	 * @param object

-	 * @return

-	 */

-	public boolean superIsFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return (((EObject) object).eClass().getEPackage() == modelPackage);

-		}

-		return false;

-	}

-

-	/**

-	 * {@link IChildCreationExtender}

-	 */

-	@Override

-	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {

-		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);

-	}

-

-	/**

-	 * {@link IChildCreationExtender}

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return childCreationExtenderManager;

-	}

-

-	@Override

-	public ItemProviderAdapter getItemProvider(EClass eClass) {

-		return umlItemProviderRegistery.get(eClass);

-	}

-

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return this;

-	}

-

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Allocate.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Allocate.gif
deleted file mode 100644
index 9250fecbffd..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Allocate.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/AllocateActivityPartition.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/AllocateActivityPartition.gif
deleted file mode 100644
index 338fb8d9a72..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/AllocateActivityPartition.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Allocated.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Allocated.gif
deleted file mode 100644
index c673a5200a5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Allocated.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/BindingConnector.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/BindingConnector.gif
deleted file mode 100644
index 2124f3e3ab2..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/BindingConnector.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Block.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Block.gif
deleted file mode 100644
index bc5ab8372bc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Block.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Conform.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Conform.gif
deleted file mode 100644
index 1c2c5c231fa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Conform.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConnectorProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConnectorProperty.gif
deleted file mode 100644
index 45731fe28e7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConnectorProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConstraintBlock.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConstraintBlock.gif
deleted file mode 100644
index 3e7750a2cad..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConstraintBlock.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConstraintProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConstraintProperty.gif
deleted file mode 100644
index 7c948e8ed58..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ConstraintProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Continuous.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Continuous.gif
deleted file mode 100644
index 1e5345fb323..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Continuous.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ControlOperator.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ControlOperator.gif
deleted file mode 100644
index 136e3b27269..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ControlOperator.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Copy.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Copy.gif
deleted file mode 100644
index 47caa0b1671..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Copy.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/DeriveReqt.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/DeriveReqt.gif
deleted file mode 100644
index 62177483fec..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/DeriveReqt.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Dimension.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Dimension.gif
deleted file mode 100644
index eb861a0905c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Dimension.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Discrete.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Discrete.gif
deleted file mode 100644
index 2b692560297..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Discrete.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/DistributedProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/DistributedProperty.gif
deleted file mode 100644
index 739ebbfa6ac..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/DistributedProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowPort.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowPort.gif
deleted file mode 100644
index 1f675ce162f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowPort.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowProperty.gif
deleted file mode 100644
index 9b87262d3d1..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowSpecification.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowSpecification.gif
deleted file mode 100644
index 1df635f4775..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowSpecification.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ItemFlow.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ItemFlow.gif
deleted file mode 100644
index 31c9dc87412..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ItemFlow.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/NestedConnectorEnd.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/NestedConnectorEnd.gif
deleted file mode 100644
index c00aedf4135..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/NestedConnectorEnd.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/NoBuffer.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/NoBuffer.gif
deleted file mode 100644
index 420eee17752..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/NoBuffer.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Overwrite.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Overwrite.gif
deleted file mode 100644
index d92f34c8aea..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Overwrite.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ParticipantProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ParticipantProperty.gif
deleted file mode 100644
index db7414e9372..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ParticipantProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Probability.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Probability.gif
deleted file mode 100644
index d92f34c8aea..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Probability.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Problem.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Problem.gif
deleted file mode 100644
index cd989e8be58..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Problem.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/PropertySpecificType.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/PropertySpecificType.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/PropertySpecificType.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Rate.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Rate.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Rate.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Rationale.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Rationale.gif
deleted file mode 100644
index a82851f5e4a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Rationale.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Requirement.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Requirement.gif
deleted file mode 100644
index 50618e0067a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Requirement.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/RequirementRelated.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/RequirementRelated.gif
deleted file mode 100644
index 33854e98c25..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/RequirementRelated.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Satisfy.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Satisfy.gif
deleted file mode 100644
index 00848d83b70..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Satisfy.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/TestCase.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/TestCase.gif
deleted file mode 100644
index ac296118622..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/TestCase.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Unit.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Unit.gif
deleted file mode 100644
index 33bfb2643a6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Unit.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ValueType.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ValueType.gif
deleted file mode 100644
index eb5441278bb..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ValueType.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Verify.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Verify.gif
deleted file mode 100644
index 2d54efc4f84..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Verify.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/View.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/View.gif
deleted file mode 100644
index 2d874ff442c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/View.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ViewPoint.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ViewPoint.gif
deleted file mode 100644
index a1cd28589be..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/ViewPoint.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
deleted file mode 100644
index 7fb34ecc912..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
+++ /dev/null
@@ -1,207 +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:

-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation

-##################################################################################

-pluginName = Edit support for SysML

-providerName=Eclipse Modeling Project

-

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-

-_UI_PropertyDescriptor_description = The {0} of the {1}

-

-_UI_Conform_type = Conform

-_UI_View_type = View

-_UI_ViewPoint_type = View Point

-_UI_Rationale_type = Rationale

-_UI_Problem_type = Problem

-_UI_Block_type = Block

-_UI_DistributedProperty_type = Distributed Property

-_UI_Dimension_type = Dimension

-_UI_Unit_type = Unit

-_UI_ValueType_type = Value Type

-_UI_NestedConnectorEnd_type = Nested Connector End

-_UI_ParticipantProperty_type = Participant Property

-_UI_ConnectorProperty_type = Connector Property

-_UI_BindingConnector_type = Binding Connector

-_UI_PropertySpecificType_type = Property Specific Type

-_UI_FlowPort_type = Flow Port

-_UI_FlowProperty_type = Flow Property

-_UI_FlowSpecification_type = Flow Specification

-_UI_ItemFlow_type = Item Flow

-_UI_ConstraintBlock_type = Constraint Block

-_UI_ConstraintProperty_type = Constraint Property

-_UI_Optionnal_type = Optionnal

-_UI_Rate_type = Rate

-_UI_Probability_type = Probability

-_UI_Continuous_type = Continuous

-_UI_Discrete_type = Discrete

-_UI_ControlOperator_type = Control Operator

-_UI_NoBuffer_type = No Buffer

-_UI_Overwrite_type = Overwrite

-_UI_Allocate_type = Allocate

-_UI_Allocated_type = Allocated

-_UI_AllocateActivityPartition_type = Allocate Activity Partition

-_UI_DeriveReqt_type = Derive Reqt

-_UI_Verify_type = Verify

-_UI_Copy_type = Copy

-_UI_Satisfy_type = Satisfy

-_UI_TestCase_type = Test Case

-_UI_Requirement_type = Requirement

-_UI_RequirementRelated_type = Requirement Related

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_Conform_base_Dependency_feature = Base Dependency

-_UI_View_viewPoint_feature = View Point

-_UI_View_base_Package_feature = Base Package

-_UI_ViewPoint_base_Class_feature = Base Class

-_UI_ViewPoint_stakeHolders_feature = Stake Holders

-_UI_ViewPoint_purpose_feature = Purpose

-_UI_ViewPoint_concerns_feature = Concerns

-_UI_ViewPoint_languages_feature = Languages

-_UI_ViewPoint_methods_feature = Methods

-_UI_Rationale_base_Comment_feature = Base Comment

-_UI_Problem_base_Comment_feature = Base Comment

-_UI_Block_isEncapsulated_feature = Is Encapsulated

-_UI_Block_base_Class_feature = Base Class

-_UI_DistributedProperty_base_Property_feature = Base Property

-_UI_Dimension_base_InstanceSpecification_feature = Base Instance Specification

-_UI_Unit_base_InstanceSpecification_feature = Base Instance Specification

-_UI_Unit_dimension_feature = Dimension

-_UI_ValueType_base_DataType_feature = Base Data Type

-_UI_ValueType_unit_feature = Unit

-_UI_ValueType_dimension_feature = Dimension

-_UI_NestedConnectorEnd_propertyPath_feature = Property Path

-_UI_NestedConnectorEnd_base_ConnectorEnd_feature = Base Connector End

-_UI_ParticipantProperty_base_Property_feature = Base Property

-_UI_ParticipantProperty_end_feature = End

-_UI_ConnectorProperty_base_Property_feature = Base Property

-_UI_ConnectorProperty_connector_feature = Connector

-_UI_BindingConnector_base_Connector_feature = Base Connector

-_UI_PropertySpecificType_base_Classifier_feature = Base Classifier

-_UI_FlowPort_base_Port_feature = Base Port

-_UI_FlowPort_isAtomic_feature = Is Atomic

-_UI_FlowPort_isConjugated_feature = Is Conjugated

-_UI_FlowPort_direction_feature = Direction

-_UI_FlowProperty_base_Property_feature = Base Property

-_UI_FlowProperty_direction_feature = Direction

-_UI_FlowSpecification_base_Interface_feature = Base Interface

-_UI_ItemFlow_base_InformationFlow_feature = Base Information Flow

-_UI_ItemFlow_itemProperty_feature = Item Property

-_UI_ConstraintProperty_base_Property_feature = Base Property

-_UI_Optionnal_base_Parameter_feature = Base Parameter

-_UI_Rate_base_Parameter_feature = Base Parameter

-_UI_Rate_base_ActivityEdge_feature = Base Activity Edge

-_UI_Rate_rate_feature = Rate

-_UI_Probability_base_ActivityEdge_feature = Base Activity Edge

-_UI_Probability_base_ParameterSet_feature = Base Parameter Set

-_UI_Probability_probability_feature = Probability

-_UI_ControlOperator_base_Operation_feature = Base Operation

-_UI_ControlOperator_base_Behavior_feature = Base Behavior

-_UI_NoBuffer_base_ObjectNode_feature = Base Object Node

-_UI_Overwrite_base_ObjectNode_feature = Base Object Node

-_UI_Allocate_base_Abstraction_feature = Base Abstraction

-_UI_Allocated_base_NamedElement_feature = Base Named Element

-_UI_Allocated_allocatedFrom_feature = Allocated From

-_UI_Allocated_allocatedTo_feature = Allocated To

-_UI_AllocateActivityPartition_base_ActivityPartition_feature = Base Activity Partition

-_UI_TestCase_base_Behavior_feature = Base Behavior

-_UI_TestCase_base_Operation_feature = Base Operation

-_UI_TestCase_verifies_feature = Verifies

-_UI_Requirement_text_feature = Text

-_UI_Requirement_id_feature = Id

-_UI_Requirement_derived_feature = Derived

-_UI_Requirement_derivedFrom_feature = Derived From

-_UI_Requirement_satisfiedBy_feature = Satisfied By

-_UI_Requirement_refinedBy_feature = Refined By

-_UI_Requirement_tracedTo_feature = Traced To

-_UI_Requirement_verifiedBy_feature = Verified By

-_UI_Requirement_master_feature = Master

-_UI_Requirement_base_Class_feature = Base Class

-_UI_RequirementRelated_base_NamedElement_feature = Base Named Element

-_UI_RequirementRelated_tracedFrom_feature = Traced From

-_UI_RequirementRelated_satisfies_feature = Satisfies

-_UI_RequirementRelated_refines_feature = Refines

-_UI_RequirementRelated_verifies_feature = Verifies

-_UI_Unknown_feature = Unspecified

-

-_UI_FlowDirection_in_literal = in

-_UI_FlowDirection_out_literal = out

-_UI_FlowDirection_inout_literal = inout

-_UI_Optional_type = Optional

-_UI_Optional_base_Parameter_feature = Base Parameter

-_UI_Auxiliary_type = Auxiliary

-_UI_Call_type = Call

-_UI_Create_type = Create

-_UI_Derive_type = Derive

-_UI_Destroy_type = Destroy

-_UI_Document_type = Document

-_UI_File_type = File

-_UI_Entity_type = Entity

-_UI_Executable_type = Executable

-_UI_Focus_type = Focus

-_UI_Framework_type = Framework

-_UI_Implement_type = Implement

-_UI_ImplementationClass_type = Implementation Class

-_UI_Instantiate_type = Instantiate

-_UI_Library_type = Library

-_UI_Metaclass_type = Metaclass

-_UI_ModelLibrary_type = Model Library

-_UI_Process_type = Process

-_UI_Realization_type = Realization

-_UI_Refine_type = Refine

-_UI_Responsibility_type = Responsibility

-_UI_Script_type = Script

-_UI_Send_type = Send

-_UI_Service_type = Service

-_UI_Source_type = Source

-_UI_Specification_type = Specification

-_UI_Subsystem_type = Subsystem

-_UI_Trace_type = Trace

-_UI_Type_type = Type

-_UI_Utility_type = Utility

-_UI_Auxiliary_base_Class_feature = Base Class

-_UI_Call_base_Usage_feature = Base Usage

-_UI_Create_base_BehavioralFeature_feature = Base Behavioral Feature

-_UI_Create_base_Usage_feature = Base Usage

-_UI_Derive_base_Abstraction_feature = Base Abstraction

-_UI_Derive_computation_feature = Computation

-_UI_Destroy_base_BehavioralFeature_feature = Base Behavioral Feature

-_UI_File_base_Artifact_feature = Base Artifact

-_UI_Entity_base_Component_feature = Base Component

-_UI_Focus_base_Class_feature = Base Class

-_UI_Framework_base_Package_feature = Base Package

-_UI_Implement_base_Component_feature = Base Component

-_UI_ImplementationClass_base_Class_feature = Base Class

-_UI_Instantiate_base_Usage_feature = Base Usage

-_UI_Metaclass_base_Class_feature = Base Class

-_UI_ModelLibrary_base_Package_feature = Base Package

-_UI_Process_base_Component_feature = Base Component

-_UI_Realization_base_Classifier_feature = Base Classifier

-_UI_Refine_base_Abstraction_feature = Base Abstraction

-_UI_Responsibility_base_Usage_feature = Base Usage

-_UI_Send_base_Usage_feature = Base Usage

-_UI_Service_base_Component_feature = Base Component

-_UI_Specification_base_Classifier_feature = Base Classifier

-_UI_Subsystem_base_Component_feature = Base Component

-_UI_Trace_base_Abstraction_feature = Base Abstraction

-_UI_Type_base_Class_feature = Base Class

-_UI_Utility_base_Class_feature = Base Class

-_UI_BuildComponent_type = Build Component

-_UI_Metamodel_type = Metamodel

-_UI_SystemModel_type = System Model

-_UI_BuildComponent_base_Component_feature = Base Component

-_UI_Metamodel_base_Model_feature = Base Model

-_UI_SystemModel_base_Model_feature = Base Model

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.xml
deleted file mode 100644
index 475ade161a7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements"

-            class="org.eclipse.papyrus.sysml.modelelements.provider.ModelelementsItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks"

-            class="org.eclipse.papyrus.sysml.blocks.provider.BlocksItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows"

-            class="org.eclipse.papyrus.sysml.portandflows.provider.PortandflowsItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints"

-            class="org.eclipse.papyrus.sysml.constraints.provider.ConstraintsItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities"

-            class="org.eclipse.papyrus.sysml.activities.provider.ActivitiesItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations"

-            class="org.eclipse.papyrus.sysml.allocations.provider.AllocationsItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements"

-            class="org.eclipse.papyrus.sysml.requirements.provider.RequirementsItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/pom.xml b/plugins/sysml/org.eclipse.papyrus.sysml.edit/pom.xml
deleted file mode 100644
index a6b97206802..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.edit</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
deleted file mode 100644
index cd45f3a2586..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.activities.util.ActivitiesAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc --> <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Optional} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected OptionalItemProvider optionalItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createOptionalAdapter() {

-		if (optionalItemProvider == null) {

-			optionalItemProvider = new OptionalItemProvider(this);

-		}

-

-		return optionalItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Rate} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RateItemProvider rateItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Rate}.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createRateAdapter() {

-		if (rateItemProvider == null) {

-			rateItemProvider = new RateItemProvider(this);

-		}

-

-		return rateItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Probability} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ProbabilityItemProvider probabilityItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Probability}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createProbabilityAdapter() {

-		if (probabilityItemProvider == null) {

-			probabilityItemProvider = new ProbabilityItemProvider(this);

-		}

-

-		return probabilityItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Continuous} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ContinuousItemProvider continuousItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Continuous}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createContinuousAdapter() {

-		if (continuousItemProvider == null) {

-			continuousItemProvider = new ContinuousItemProvider(this);

-		}

-

-		return continuousItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Discrete} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DiscreteItemProvider discreteItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Discrete}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createDiscreteAdapter() {

-		if (discreteItemProvider == null) {

-			discreteItemProvider = new DiscreteItemProvider(this);

-		}

-

-		return discreteItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.ControlOperator} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ControlOperatorItemProvider controlOperatorItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.ControlOperator}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createControlOperatorAdapter() {

-		if (controlOperatorItemProvider == null) {

-			controlOperatorItemProvider = new ControlOperatorItemProvider(this);

-		}

-

-		return controlOperatorItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.NoBuffer} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected NoBufferItemProvider noBufferItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.NoBuffer}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createNoBufferAdapter() {

-		if (noBufferItemProvider == null) {

-			noBufferItemProvider = new NoBufferItemProvider(this);

-		}

-

-		return noBufferItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Overwrite} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected OverwriteItemProvider overwriteItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Overwrite}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createOverwriteAdapter() {

-		if (overwriteItemProvider == null) {

-			overwriteItemProvider = new OverwriteItemProvider(this);

-		}

-

-		return overwriteItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (optionalItemProvider != null) {

-			optionalItemProvider.dispose();

-		}

-		if (rateItemProvider != null) {

-			rateItemProvider.dispose();

-		}

-		if (probabilityItemProvider != null) {

-			probabilityItemProvider.dispose();

-		}

-		if (continuousItemProvider != null) {

-			continuousItemProvider.dispose();

-		}

-		if (discreteItemProvider != null) {

-			discreteItemProvider.dispose();

-		}

-		if (controlOperatorItemProvider != null) {

-			controlOperatorItemProvider.dispose();

-		}

-		if (noBufferItemProvider != null) {

-			noBufferItemProvider.dispose();

-		}

-		if (overwriteItemProvider != null) {

-			overwriteItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
deleted file mode 100644
index a4048a803a7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Continuous} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ContinuousItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ContinuousItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns Continuous.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Continuous"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Continuous_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Compose the image with specific visibility logo

-	 * Copied from UML implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-

-		return composedImage;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java
deleted file mode 100644
index 4c0263a6d93..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.ControlOperator} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ControlOperatorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ControlOperatorItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_OperationPropertyDescriptor(object);

-			addBase_BehaviorPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Operation feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_OperationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Operation_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Operation_feature", "_UI_ControlOperator_type"), ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_OPERATION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Behavior feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_BehaviorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Behavior_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Behavior_feature", "_UI_ControlOperator_type"), ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_BEHAVIOR, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns ControlOperator.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ControlOperator"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_ControlOperator_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
deleted file mode 100644
index 81d7aa6629a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Discrete} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class DiscreteItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DiscreteItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns Discrete.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Discrete"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Discrete_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Compose the image with specific visibility logo

-	 * Copied from UML implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-

-		return composedImage;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
deleted file mode 100644
index e045cb6c389..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.NoBuffer} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class NoBufferItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NoBufferItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ObjectNodePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Object Node feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ObjectNodePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NoBuffer_base_ObjectNode_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_NoBuffer_base_ObjectNode_feature", "_UI_NoBuffer_type"), ActivitiesPackage.Literals.NO_BUFFER__BASE_OBJECT_NODE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns NoBuffer.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NoBuffer"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_NoBuffer_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
deleted file mode 100644
index ebcc8414549..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class OptionalItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public OptionalItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ParameterPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Parameter feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ParameterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optional_base_Parameter_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Optional_base_Parameter_feature", "_UI_Optional_type"), ActivitiesPackage.Literals.OPTIONAL__BASE_PARAMETER, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Optional.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Optional"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Optional_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
deleted file mode 100644
index 74808c868c4..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Overwrite} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class OverwriteItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public OverwriteItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ObjectNodePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Object Node feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ObjectNodePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Overwrite_base_ObjectNode_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Overwrite_base_ObjectNode_feature", "_UI_Overwrite_type"), ActivitiesPackage.Literals.OVERWRITE__BASE_OBJECT_NODE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Overwrite.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Overwrite"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Overwrite_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
deleted file mode 100644
index 751e63a66ff..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Probability} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ProbabilityItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ProbabilityItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ActivityEdgePropertyDescriptor(object);

-			addBase_ParameterSetPropertyDescriptor(object);

-			addProbabilityPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Activity Edge feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ActivityEdgePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ActivityEdge_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ActivityEdge_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__BASE_ACTIVITY_EDGE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Parameter Set feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ParameterSetPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ParameterSet_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ParameterSet_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__BASE_PARAMETER_SET, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Probability feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addProbabilityPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_probability_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Probability_probability_feature", "_UI_Probability_type"), ActivitiesPackage.Literals.PROBABILITY__PROBABILITY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Probability.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Probability"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Probability_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
deleted file mode 100644
index 91588c6b6d9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Rate} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class RateItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RateItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ParameterPropertyDescriptor(object);

-			addBase_ActivityEdgePropertyDescriptor(object);

-			addRatePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Parameter feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ParameterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_Parameter_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_Parameter_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__BASE_PARAMETER, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Activity Edge feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ActivityEdgePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_ActivityEdge_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_ActivityEdge_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__BASE_ACTIVITY_EDGE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Rate feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addRatePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_rate_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Rate_rate_feature", "_UI_Rate_type"), ActivitiesPackage.Literals.RATE__RATE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Rate.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Rate"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Rate_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
deleted file mode 100644
index 688a1a8ee40..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class AllocateActivityPartitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocateActivityPartitionItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ActivityPartitionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Activity Partition feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ActivityPartitionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AllocateActivityPartition_base_ActivityPartition_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_AllocateActivityPartition_base_ActivityPartition_feature", "_UI_AllocateActivityPartition_type"), AllocationsPackage.Literals.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, true,

-				false, true, null, null, null));

-	}

-

-	/**

-	 * This returns AllocateActivityPartition.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AllocateActivityPartition"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_AllocateActivityPartition_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java
deleted file mode 100644
index 0cae37eba05..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocate} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class AllocateItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocateItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_AbstractionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Abstraction feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocate_base_Abstraction_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Allocate_base_Abstraction_feature", "_UI_Allocate_type"), AllocationsPackage.Literals.ALLOCATE__BASE_ABSTRACTION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Allocate.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Allocate"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Allocate_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
deleted file mode 100644
index 0b88d42c90c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocated} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class AllocatedItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocatedItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_NamedElementPropertyDescriptor(object);

-			addAllocatedFromPropertyDescriptor(object);

-			addAllocatedToPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Named Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_NamedElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_base_NamedElement_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Allocated_base_NamedElement_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__BASE_NAMED_ELEMENT, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Allocated From feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addAllocatedFromPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedFrom_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedFrom_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__ALLOCATED_FROM, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Allocated To feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addAllocatedToPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedTo_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedTo_feature", "_UI_Allocated_type"), AllocationsPackage.Literals.ALLOCATED__ALLOCATED_TO, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This returns Allocated.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Allocated"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Allocated_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocationsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocationsItemProviderAdapterFactory.java
deleted file mode 100644
index e6721a812df..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocationsItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.allocations.util.AllocationsAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc --> <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class AllocationsItemProviderAdapterFactory extends AllocationsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public AllocationsItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.allocations.Allocate} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AllocateItemProvider allocateItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocate}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createAllocateAdapter() {

-		if (allocateItemProvider == null) {

-			allocateItemProvider = new AllocateItemProvider(this);

-		}

-

-		return allocateItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.allocations.Allocated} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AllocatedItemProvider allocatedItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocated}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createAllocatedAdapter() {

-		if (allocatedItemProvider == null) {

-			allocatedItemProvider = new AllocatedItemProvider(this);

-		}

-

-		return allocatedItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AllocateActivityPartitionItemProvider allocateActivityPartitionItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition}.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createAllocateActivityPartitionAdapter() {

-		if (allocateActivityPartitionItemProvider == null) {

-			allocateActivityPartitionItemProvider = new AllocateActivityPartitionItemProvider(this);

-		}

-

-		return allocateActivityPartitionItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (allocateItemProvider != null) {

-			allocateItemProvider.dispose();

-		}

-		if (allocatedItemProvider != null) {

-			allocatedItemProvider.dispose();

-		}

-		if (allocateActivityPartitionItemProvider != null) {

-			allocateActivityPartitionItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java
deleted file mode 100644
index cc126197d99..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.BindingConnector} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class BindingConnectorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BindingConnectorItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ConnectorPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Connector feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ConnectorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_BindingConnector_base_Connector_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_BindingConnector_base_Connector_feature", "_UI_BindingConnector_type"), BlocksPackage.Literals.BINDING_CONNECTOR__BASE_CONNECTOR, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns BindingConnector.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BindingConnector"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_BindingConnector_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java
deleted file mode 100644
index b4abf10346e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Block} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class BlockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlockItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addIsEncapsulatedPropertyDescriptor(object);

-			addBase_ClassPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Is Encapsulated feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIsEncapsulatedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_isEncapsulated_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Block_isEncapsulated_feature", "_UI_Block_type"), BlocksPackage.Literals.BLOCK__IS_ENCAPSULATED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Class feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_base_Class_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Block_base_Class_feature", "_UI_Block_type"), BlocksPackage.Literals.BLOCK__BASE_CLASS, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Block.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Block"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		Block block = (Block) object;

-		return getString("_UI_Block_type") + " " + block.isEncapsulated();

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(Block.class)) {

-		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlocksItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlocksItemProviderAdapterFactory.java
deleted file mode 100644
index f6111765313..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlocksItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.blocks.util.BlocksAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc --> <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class BlocksItemProviderAdapterFactory extends BlocksAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public BlocksItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.Block} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected BlockItemProvider blockItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.Block}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createBlockAdapter() {

-		if (blockItemProvider == null) {

-			blockItemProvider = new BlockItemProvider(this);

-		}

-

-		return blockItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.DistributedProperty} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DistributedPropertyItemProvider distributedPropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.DistributedProperty}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createDistributedPropertyAdapter() {

-		if (distributedPropertyItemProvider == null) {

-			distributedPropertyItemProvider = new DistributedPropertyItemProvider(this);

-		}

-

-		return distributedPropertyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.Dimension} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DimensionItemProvider dimensionItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.Dimension}.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createDimensionAdapter() {

-		if (dimensionItemProvider == null) {

-			dimensionItemProvider = new DimensionItemProvider(this);

-		}

-

-		return dimensionItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.Unit} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected UnitItemProvider unitItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.Unit}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createUnitAdapter() {

-		if (unitItemProvider == null) {

-			unitItemProvider = new UnitItemProvider(this);

-		}

-

-		return unitItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.ValueType} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ValueTypeItemProvider valueTypeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.ValueType}.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createValueTypeAdapter() {

-		if (valueTypeItemProvider == null) {

-			valueTypeItemProvider = new ValueTypeItemProvider(this);

-		}

-

-		return valueTypeItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected NestedConnectorEndItemProvider nestedConnectorEndItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createNestedConnectorEndAdapter() {

-		if (nestedConnectorEndItemProvider == null) {

-			nestedConnectorEndItemProvider = new NestedConnectorEndItemProvider(this);

-		}

-

-		return nestedConnectorEndItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ParticipantPropertyItemProvider participantPropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createParticipantPropertyAdapter() {

-		if (participantPropertyItemProvider == null) {

-			participantPropertyItemProvider = new ParticipantPropertyItemProvider(this);

-		}

-

-		return participantPropertyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConnectorPropertyItemProvider connectorPropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createConnectorPropertyAdapter() {

-		if (connectorPropertyItemProvider == null) {

-			connectorPropertyItemProvider = new ConnectorPropertyItemProvider(this);

-		}

-

-		return connectorPropertyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.BindingConnector} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected BindingConnectorItemProvider bindingConnectorItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.BindingConnector}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createBindingConnectorAdapter() {

-		if (bindingConnectorItemProvider == null) {

-			bindingConnectorItemProvider = new BindingConnectorItemProvider(this);

-		}

-

-		return bindingConnectorItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PropertySpecificTypeItemProvider propertySpecificTypeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createPropertySpecificTypeAdapter() {

-		if (propertySpecificTypeItemProvider == null) {

-			propertySpecificTypeItemProvider = new PropertySpecificTypeItemProvider(this);

-		}

-

-		return propertySpecificTypeItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (blockItemProvider != null) {

-			blockItemProvider.dispose();

-		}

-		if (distributedPropertyItemProvider != null) {

-			distributedPropertyItemProvider.dispose();

-		}

-		if (dimensionItemProvider != null) {

-			dimensionItemProvider.dispose();

-		}

-		if (unitItemProvider != null) {

-			unitItemProvider.dispose();

-		}

-		if (valueTypeItemProvider != null) {

-			valueTypeItemProvider.dispose();

-		}

-		if (nestedConnectorEndItemProvider != null) {

-			nestedConnectorEndItemProvider.dispose();

-		}

-		if (participantPropertyItemProvider != null) {

-			participantPropertyItemProvider.dispose();

-		}

-		if (connectorPropertyItemProvider != null) {

-			connectorPropertyItemProvider.dispose();

-		}

-		if (bindingConnectorItemProvider != null) {

-			bindingConnectorItemProvider.dispose();

-		}

-		if (propertySpecificTypeItemProvider != null) {

-			propertySpecificTypeItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java
deleted file mode 100644
index 5ebdf626862..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConnectorPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConnectorPropertyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_PropertyPropertyDescriptor(object);

-			addConnectorPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Property feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_base_Property_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_base_Property_feature", "_UI_ConnectorProperty_type"), BlocksPackage.Literals.CONNECTOR_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Connector feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addConnectorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_connector_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_connector_feature", "_UI_ConnectorProperty_type"), BlocksPackage.Literals.CONNECTOR_PROPERTY__CONNECTOR, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns ConnectorProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConnectorProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_ConnectorProperty_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
deleted file mode 100644
index e358b7c61ff..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Dimension} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class DimensionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DimensionItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_InstanceSpecificationPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Instance Specification feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_InstanceSpecificationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_base_InstanceSpecification_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Dimension_base_InstanceSpecification_feature", "_UI_Dimension_type"), BlocksPackage.Literals.DIMENSION__BASE_INSTANCE_SPECIFICATION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Dimension.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Dimension"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Dimension_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java
deleted file mode 100644
index be4081dcdfc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.DistributedProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class DistributedPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DistributedPropertyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_PropertyPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Property feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DistributedProperty_base_Property_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_DistributedProperty_base_Property_feature", "_UI_DistributedProperty_type"), BlocksPackage.Literals.DISTRIBUTED_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns DistributedProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DistributedProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_DistributedProperty_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
deleted file mode 100644
index 0c0aa96e900..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class NestedConnectorEndItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NestedConnectorEndItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addPropertyPathPropertyDescriptor(object);

-			addBase_ConnectorEndPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Property Path feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addPropertyPathPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_propertyPath_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_propertyPath_feature", "_UI_NestedConnectorEnd_type"), BlocksPackage.Literals.NESTED_CONNECTOR_END__PROPERTY_PATH, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Connector End feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ConnectorEndPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_base_ConnectorEnd_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_base_ConnectorEnd_feature", "_UI_NestedConnectorEnd_type"), BlocksPackage.Literals.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns NestedConnectorEnd.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NestedConnectorEnd"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_NestedConnectorEnd_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java
deleted file mode 100644
index 354b03623ca..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ParticipantPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ParticipantPropertyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_PropertyPropertyDescriptor(object);

-			addEndPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Property feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_base_Property_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_base_Property_feature", "_UI_ParticipantProperty_type"), BlocksPackage.Literals.PARTICIPANT_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the End feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addEndPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_end_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_end_feature", "_UI_ParticipantProperty_type"), BlocksPackage.Literals.PARTICIPANT_PROPERTY__END, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns ParticipantProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ParticipantProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_ParticipantProperty_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java
deleted file mode 100644
index 04e2e53a6be..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class PropertySpecificTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PropertySpecificTypeItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ClassifierPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Classifier feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ClassifierPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PropertySpecificType_base_Classifier_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_PropertySpecificType_base_Classifier_feature", "_UI_PropertySpecificType_type"), BlocksPackage.Literals.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns PropertySpecificType.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PropertySpecificType"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_PropertySpecificType_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
deleted file mode 100644
index 8ae50cbb644..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Unit} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class UnitItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UnitItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_InstanceSpecificationPropertyDescriptor(object);

-			addDimensionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Instance Specification feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_InstanceSpecificationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_base_InstanceSpecification_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Unit_base_InstanceSpecification_feature", "_UI_Unit_type"), BlocksPackage.Literals.UNIT__BASE_INSTANCE_SPECIFICATION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Dimension feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDimensionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_dimension_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Unit_dimension_feature", "_UI_Unit_type"), BlocksPackage.Literals.UNIT__DIMENSION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Unit.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Unit"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Unit_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
deleted file mode 100644
index bafe6a792f8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ValueType} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ValueTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ValueTypeItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_DataTypePropertyDescriptor(object);

-			addUnitPropertyDescriptor(object);

-			addDimensionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Data Type feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_DataTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_base_DataType_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ValueType_base_DataType_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__BASE_DATA_TYPE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Unit feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addUnitPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_unit_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ValueType_unit_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__UNIT, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Dimension feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDimensionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_dimension_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ValueType_dimension_feature", "_UI_ValueType_type"), BlocksPackage.Literals.VALUE_TYPE__DIMENSION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns ValueType.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueType"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_ValueType_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java
deleted file mode 100644
index f223463856a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.blocks.provider.BlockItemProvider;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintBlockItemProvider extends BlockItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintBlockItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns ConstraintBlock.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintBlock"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		ConstraintBlock constraintBlock = (ConstraintBlock) object;

-		return getString("_UI_ConstraintBlock_type") + " " + constraintBlock.isEncapsulated();

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-	/**

-	 * Compose the image with specific visibility logo

-	 * Copied from UML implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-

-		return composedImage;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java
deleted file mode 100644
index 69951efdac8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintPropertyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_PropertyPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Property feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConstraintProperty_base_Property_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ConstraintProperty_base_Property_feature", "_UI_ConstraintProperty_type"), ConstraintsPackage.Literals.CONSTRAINT_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns ConstraintProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_ConstraintProperty_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintsItemProviderAdapterFactory.java
deleted file mode 100644
index c0ea427cc0b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintsItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.constraints.util.ConstraintsAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc --> <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintBlockItemProvider constraintBlockItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createConstraintBlockAdapter() {

-		if (constraintBlockItemProvider == null) {

-			constraintBlockItemProvider = new ConstraintBlockItemProvider(this);

-		}

-

-		return constraintBlockItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintPropertyItemProvider constraintPropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createConstraintPropertyAdapter() {

-		if (constraintPropertyItemProvider == null) {

-			constraintPropertyItemProvider = new ConstraintPropertyItemProvider(this);

-		}

-

-		return constraintPropertyItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (constraintBlockItemProvider != null) {

-			constraintBlockItemProvider.dispose();

-		}

-		if (constraintPropertyItemProvider != null) {

-			constraintPropertyItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java
deleted file mode 100644
index da92247a3d1..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Conform} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConformItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConformItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_DependencyPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Dependency feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_DependencyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Conform_base_Dependency_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Conform_base_Dependency_feature", "_UI_Conform_type"), ModelelementsPackage.Literals.CONFORM__BASE_DEPENDENCY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Conform.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Conform"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Conform_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ModelelementsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ModelelementsItemProviderAdapterFactory.java
deleted file mode 100644
index 8df6b38cb93..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ModelelementsItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.modelelements.util.ModelelementsAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc --> <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ModelelementsItemProviderAdapterFactory extends ModelelementsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.Conform} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConformItemProvider conformItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Conform}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createConformAdapter() {

-		if (conformItemProvider == null) {

-			conformItemProvider = new ConformItemProvider(this);

-		}

-

-		return conformItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.View} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewItemProvider viewItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.View}.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createViewAdapter() {

-		if (viewItemProvider == null) {

-			viewItemProvider = new ViewItemProvider(this);

-		}

-

-		return viewItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewPointItemProvider viewPointItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createViewPointAdapter() {

-		if (viewPointItemProvider == null) {

-			viewPointItemProvider = new ViewPointItemProvider(this);

-		}

-

-		return viewPointItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.Rationale} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RationaleItemProvider rationaleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Rationale}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createRationaleAdapter() {

-		if (rationaleItemProvider == null) {

-			rationaleItemProvider = new RationaleItemProvider(this);

-		}

-

-		return rationaleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.modelelements.Problem} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ProblemItemProvider problemItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Problem}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createProblemAdapter() {

-		if (problemItemProvider == null) {

-			problemItemProvider = new ProblemItemProvider(this);

-		}

-

-		return problemItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (conformItemProvider != null) {

-			conformItemProvider.dispose();

-		}

-		if (viewItemProvider != null) {

-			viewItemProvider.dispose();

-		}

-		if (viewPointItemProvider != null) {

-			viewPointItemProvider.dispose();

-		}

-		if (rationaleItemProvider != null) {

-			rationaleItemProvider.dispose();

-		}

-		if (problemItemProvider != null) {

-			problemItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java
deleted file mode 100644
index bffebe971a1..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Problem} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ProblemItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ProblemItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_CommentPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Comment feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_CommentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Problem_base_Comment_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Problem_base_Comment_feature", "_UI_Problem_type"), ModelelementsPackage.Literals.PROBLEM__BASE_COMMENT, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Problem.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Problem"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Problem_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java
deleted file mode 100644
index 0589b27ff06..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Rationale} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class RationaleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RationaleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_CommentPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Comment feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_CommentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rationale_base_Comment_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Rationale_base_Comment_feature", "_UI_Rationale_type"), ModelelementsPackage.Literals.RATIONALE__BASE_COMMENT, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Rationale.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Rationale"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Rationale_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java
deleted file mode 100644
index 6951e30127c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.View} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ViewItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ViewItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addViewPointPropertyDescriptor(object);

-			addBase_PackagePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the View Point feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addViewPointPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_viewPoint_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_View_viewPoint_feature", "_UI_View_type"), ModelelementsPackage.Literals.VIEW__VIEW_POINT, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Package feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_PackagePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_base_Package_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_View_base_Package_feature", "_UI_View_type"), ModelelementsPackage.Literals.VIEW__BASE_PACKAGE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns View.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/View"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_View_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java
deleted file mode 100644
index 47775fd006d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ViewPointItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ViewPointItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_ClassPropertyDescriptor(object);

-			addStakeHoldersPropertyDescriptor(object);

-			addPurposePropertyDescriptor(object);

-			addConcernsPropertyDescriptor(object);

-			addLanguagesPropertyDescriptor(object);

-			addMethodsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Class feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_base_Class_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_base_Class_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__BASE_CLASS, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Stake Holders feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addStakeHoldersPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_stakeHolders_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_stakeHolders_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__STAKE_HOLDERS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Purpose feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addPurposePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_purpose_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_purpose_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__PURPOSE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Concerns feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addConcernsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_concerns_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_concerns_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__CONCERNS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Languages feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addLanguagesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_languages_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_languages_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__LANGUAGES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Methods feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addMethodsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_methods_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_methods_feature", "_UI_ViewPoint_type"), ModelelementsPackage.Literals.VIEW_POINT__METHODS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This returns ViewPoint.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ViewPoint"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ViewPoint) object).getPurpose();

-		return label == null || label.length() == 0 ? getString("_UI_ViewPoint_type") : getString("_UI_ViewPoint_type") + " " + label;

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ViewPoint.class)) {

-		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

-		case ModelelementsPackage.VIEW_POINT__PURPOSE:

-		case ModelelementsPackage.VIEW_POINT__CONCERNS:

-		case ModelelementsPackage.VIEW_POINT__LANGUAGES:

-		case ModelelementsPackage.VIEW_POINT__METHODS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java
deleted file mode 100644
index ee5e79d5277..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowPort} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FlowPortItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowPortItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_PortPropertyDescriptor(object);

-			addIsAtomicPropertyDescriptor(object);

-			addIsConjugatedPropertyDescriptor(object);

-			addDirectionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Port feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_PortPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_base_Port_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_base_Port_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__BASE_PORT, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Is Atomic feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIsAtomicPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isAtomic_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isAtomic_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__IS_ATOMIC, false, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Is Conjugated feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIsConjugatedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isConjugated_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isConjugated_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__IS_CONJUGATED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Direction feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDirectionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_direction_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_direction_feature", "_UI_FlowPort_type"), PortandflowsPackage.Literals.FLOW_PORT__DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This returns FlowPort.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowPort"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		FlowPort flowPort = (FlowPort) object;

-		return getString("_UI_FlowPort_type") + " " + flowPort.isAtomic();

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FlowPort.class)) {

-		case PortandflowsPackage.FLOW_PORT__IS_ATOMIC:

-		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

-		case PortandflowsPackage.FLOW_PORT__DIRECTION:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java
deleted file mode 100644
index 835b93721b7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FlowPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowPropertyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_PropertyPropertyDescriptor(object);

-			addDirectionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Property feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_PropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_base_Property_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_base_Property_feature", "_UI_FlowProperty_type"), PortandflowsPackage.Literals.FLOW_PROPERTY__BASE_PROPERTY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Direction feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDirectionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_direction_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_direction_feature", "_UI_FlowProperty_type"), PortandflowsPackage.Literals.FLOW_PROPERTY__DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This returns FlowProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		FlowDirection labelValue = ((FlowProperty) object).getDirection();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ? getString("_UI_FlowProperty_type") : getString("_UI_FlowProperty_type") + " " + label;

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FlowProperty.class)) {

-		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java
deleted file mode 100644
index 1bbd981ca2a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FlowSpecificationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowSpecificationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_InterfacePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Interface feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_InterfacePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowSpecification_base_Interface_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_FlowSpecification_base_Interface_feature", "_UI_FlowSpecification_type"), PortandflowsPackage.Literals.FLOW_SPECIFICATION__BASE_INTERFACE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns FlowSpecification.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowSpecification"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_FlowSpecification_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
deleted file mode 100644
index 26b30473213..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ItemFlowItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ItemFlowItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_InformationFlowPropertyDescriptor(object);

-			addItemPropertyPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Information Flow feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_InformationFlowPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_base_InformationFlow_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_base_InformationFlow_feature", "_UI_ItemFlow_type"), PortandflowsPackage.Literals.ITEM_FLOW__BASE_INFORMATION_FLOW, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Item Property feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addItemPropertyPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_itemProperty_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_itemProperty_feature", "_UI_ItemFlow_type"), PortandflowsPackage.Literals.ITEM_FLOW__ITEM_PROPERTY, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns ItemFlow.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ItemFlow"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_ItemFlow_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/PortandflowsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/PortandflowsItemProviderAdapterFactory.java
deleted file mode 100644
index 55faa3935f6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/PortandflowsItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.portandflows.util.PortandflowsAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc --> <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class PortandflowsItemProviderAdapterFactory extends PortandflowsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.FlowPort} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FlowPortItemProvider flowPortItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowPort}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createFlowPortAdapter() {

-		if (flowPortItemProvider == null) {

-			flowPortItemProvider = new FlowPortItemProvider(this);

-		}

-

-		return flowPortItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FlowPropertyItemProvider flowPropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createFlowPropertyAdapter() {

-		if (flowPropertyItemProvider == null) {

-			flowPropertyItemProvider = new FlowPropertyItemProvider(this);

-		}

-

-		return flowPropertyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FlowSpecificationItemProvider flowSpecificationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createFlowSpecificationAdapter() {

-		if (flowSpecificationItemProvider == null) {

-			flowSpecificationItemProvider = new FlowSpecificationItemProvider(this);

-		}

-

-		return flowSpecificationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ItemFlowItemProvider itemFlowItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createItemFlowAdapter() {

-		if (itemFlowItemProvider == null) {

-			itemFlowItemProvider = new ItemFlowItemProvider(this);

-		}

-

-		return itemFlowItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (flowPortItemProvider != null) {

-			flowPortItemProvider.dispose();

-		}

-		if (flowPropertyItemProvider != null) {

-			flowPropertyItemProvider.dispose();

-		}

-		if (flowSpecificationItemProvider != null) {

-			flowSpecificationItemProvider.dispose();

-		}

-		if (itemFlowItemProvider != null) {

-			itemFlowItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java
deleted file mode 100644
index d98d025649c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the central singleton for the SysML edit plugin.

- * <!-- begin-user-doc

- * --> <!-- end-user-doc -->

- *

- * @generated

- */

-public final class SysmlEditPlugin extends EMFPlugin {

-

-	/**

-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public static final SysmlEditPlugin INSTANCE = new SysmlEditPlugin();

-

-	/**

-	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SysmlEditPlugin() {

-		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
deleted file mode 100644
index 28655ca7abd..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Atos.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos - Initial API and implementation
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.registry;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.sysml.activities.provider.ActivitiesItemProviderAdapterFactory;
-import org.eclipse.papyrus.sysml.allocations.provider.AllocationsItemProviderAdapterFactory;
-import org.eclipse.papyrus.sysml.blocks.provider.BlocksItemProviderAdapterFactory;
-import org.eclipse.papyrus.sysml.constraints.provider.ConstraintsItemProviderAdapterFactory;
-import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
-import org.eclipse.papyrus.sysml.edit.provider.IRootAdapterFactory;
-import org.eclipse.papyrus.sysml.modelelements.provider.ModelelementsItemProviderAdapterFactory;
-import org.eclipse.papyrus.sysml.portandflows.provider.PortandflowsItemProviderAdapterFactory;
-import org.eclipse.papyrus.sysml.requirements.provider.RequirementsItemProviderAdapterFactory;
-import org.eclipse.papyrus.uml.internationalization.edit.providers.InternationalizationUMLItemProviderAdapterFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.edit.providers.AbstractionItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ActivityEdgeItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ActivityPartitionItemProvider;
-import org.eclipse.uml2.uml.edit.providers.BehaviorItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ClassItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ClassifierItemProvider;
-import org.eclipse.uml2.uml.edit.providers.CommentItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ConnectorEndItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ConnectorItemProvider;
-import org.eclipse.uml2.uml.edit.providers.DataTypeItemProvider;
-import org.eclipse.uml2.uml.edit.providers.DependencyItemProvider;
-import org.eclipse.uml2.uml.edit.providers.InformationFlowItemProvider;
-import org.eclipse.uml2.uml.edit.providers.InstanceSpecificationItemProvider;
-import org.eclipse.uml2.uml.edit.providers.InterfaceItemProvider;
-import org.eclipse.uml2.uml.edit.providers.NamedElementItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ObjectNodeItemProvider;
-import org.eclipse.uml2.uml.edit.providers.OperationItemProvider;
-import org.eclipse.uml2.uml.edit.providers.PackageItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ParameterItemProvider;
-import org.eclipse.uml2.uml.edit.providers.ParameterSetItemProvider;
-import org.eclipse.uml2.uml.edit.providers.PortItemProvider;
-import org.eclipse.uml2.uml.edit.providers.PropertyItemProvider;
-
-/**
- * Get a registry of all SysML Adapter Factory classified by the UML class their
- * correspond.
- *
- * Example:
- *
- * <Class.class> ->[ModelelementsItemProviderAdapterFactory,
- * BlocksAdapterItemProviderFactory, RequirementsAdapterItemProviderFactory]
- *
- * @generated
- */
-public class SysmlRegistryAdapterFactoryRegistry {
-
-	/**
-	 * Keep track of the item provider of type ModelelementsItemProviderAdapterFactory
-	 *
-	 * @generated
-	 */
-
-	protected ModelelementsItemProviderAdapterFactory modelelementsAdapterFactoryItemProvider;
-
-	/**
-	 * Keep track of the item provider of type BlocksItemProviderAdapterFactory
-	 *
-	 * @generated
-	 */
-
-	protected BlocksItemProviderAdapterFactory blocksAdapterFactoryItemProvider;
-
-	/**
-	 * Keep track of the item provider of type PortandflowsItemProviderAdapterFactory
-	 *
-	 * @generated
-	 */
-
-	protected PortandflowsItemProviderAdapterFactory portandflowsAdapterFactoryItemProvider;
-
-	/**
-	 * Keep track of the item provider of type ConstraintsItemProviderAdapterFactory
-	 *
-	 * @generated
-	 */
-
-	protected ConstraintsItemProviderAdapterFactory constraintsAdapterFactoryItemProvider;
-
-	/**
-	 * Keep track of the item provider of type ActivitiesItemProviderAdapterFactory
-	 *
-	 * @generated
-	 */
-
-	protected ActivitiesItemProviderAdapterFactory activitiesAdapterFactoryItemProvider;
-
-	/**
-	 * Keep track of the item provider of type AllocationsItemProviderAdapterFactory
-	 *
-	 * @generated
-	 */
-
-	protected AllocationsItemProviderAdapterFactory allocationsAdapterFactoryItemProvider;
-
-	/**
-	 * Keep track of the item provider of type RequirementsItemProviderAdapterFactory
-	 *
-	 * @generated
-	 */
-
-	protected RequirementsItemProviderAdapterFactory requirementsAdapterFactoryItemProvider;
-
-	/**
-	 * Registry for all SysML AdapterFactory
-	 *
-	 * @generated
-	 */
-	private List<AdapterFactory> adapterFactoryRegistry = new ArrayList<AdapterFactory>(7);
-
-	/**
-	 * Registry of all {@link AdapterFactory} classified by corresponding UML element
-	 *
-	 * @generated
-	 */
-	private HashMap<EClass, ArrayList<AdapterFactory>> adapterFactoryRegistryMap = new HashMap<EClass, ArrayList<AdapterFactory>>();
-
-	/**
-	 * Default adapterFactory
-	 *
-	 * @generated
-	 */
-	private InternationalizationUMLItemProviderAdapterFactory defaultAdapterFactory = new InternationalizationUMLItemProviderAdapterFactory();
-
-	/**
-	 * Constructor + initialize
-	 *
-	 * @generated
-	 */
-	private SysmlRegistryAdapterFactoryRegistry() {
-		/**
-		 * Initialize all AdapterFactories
-		 */
-
-		modelelementsAdapterFactoryItemProvider = new ModelelementsItemProviderAdapterFactory();
-		adapterFactoryRegistry.add(modelelementsAdapterFactoryItemProvider);
-
-		blocksAdapterFactoryItemProvider = new BlocksItemProviderAdapterFactory();
-		adapterFactoryRegistry.add(blocksAdapterFactoryItemProvider);
-
-		portandflowsAdapterFactoryItemProvider = new PortandflowsItemProviderAdapterFactory();
-		adapterFactoryRegistry.add(portandflowsAdapterFactoryItemProvider);
-
-		constraintsAdapterFactoryItemProvider = new ConstraintsItemProviderAdapterFactory();
-		adapterFactoryRegistry.add(constraintsAdapterFactoryItemProvider);
-
-		activitiesAdapterFactoryItemProvider = new ActivitiesItemProviderAdapterFactory();
-		adapterFactoryRegistry.add(activitiesAdapterFactoryItemProvider);
-
-		allocationsAdapterFactoryItemProvider = new AllocationsItemProviderAdapterFactory();
-		adapterFactoryRegistry.add(allocationsAdapterFactoryItemProvider);
-
-		requirementsAdapterFactoryItemProvider = new RequirementsItemProviderAdapterFactory();
-		adapterFactoryRegistry.add(requirementsAdapterFactoryItemProvider);
-
-		/**
-		 * AdapterFactories for the ABSTRACTION elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.ABSTRACTION, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.ABSTRACTION).add(allocationsAdapterFactoryItemProvider);
-
-		/**
-		 * AdapterFactories for the ACTIVITY_EDGE elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.ACTIVITY_EDGE, new ArrayList<AdapterFactory>(Collections.singletonList(activitiesAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the ACTIVITY_PARTITION elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.ACTIVITY_PARTITION, new ArrayList<AdapterFactory>(Collections.singletonList(allocationsAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the BEHAVIOR elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.BEHAVIOR, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.BEHAVIOR).add(activitiesAdapterFactoryItemProvider);
-
-		/**
-		 * AdapterFactories for the CLASS elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.CLASS, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(modelelementsAdapterFactoryItemProvider);
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(constraintsAdapterFactoryItemProvider);
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(blocksAdapterFactoryItemProvider);
-
-		/**
-		 * AdapterFactories for the CLASSIFIER elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.CLASSIFIER, new ArrayList<AdapterFactory>(Collections.singletonList(blocksAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the COMMENT elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.COMMENT, new ArrayList<AdapterFactory>(Collections.singletonList(modelelementsAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the CONNECTOR elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.CONNECTOR, new ArrayList<AdapterFactory>(Collections.singletonList(blocksAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the CONNECTOR_END elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.CONNECTOR_END, new ArrayList<AdapterFactory>(Collections.singletonList(blocksAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the DATA_TYPE elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.DATA_TYPE, new ArrayList<AdapterFactory>(Collections.singletonList(blocksAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the DEPENDENCY elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.DEPENDENCY, new ArrayList<AdapterFactory>(Collections.singletonList(modelelementsAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the INFORMATION_FLOW elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.INFORMATION_FLOW, new ArrayList<AdapterFactory>(Collections.singletonList(portandflowsAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the INSTANCE_SPECIFICATION elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.INSTANCE_SPECIFICATION, new ArrayList<AdapterFactory>(Collections.singletonList(blocksAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the INTERFACE elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.INTERFACE, new ArrayList<AdapterFactory>(Collections.singletonList(portandflowsAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the NAMED_ELEMENT elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.NAMED_ELEMENT, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.NAMED_ELEMENT).add(allocationsAdapterFactoryItemProvider);
-
-		/**
-		 * AdapterFactories for the OBJECT_NODE elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.OBJECT_NODE, new ArrayList<AdapterFactory>(Collections.singletonList(activitiesAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the OPERATION elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.OPERATION, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.OPERATION).add(activitiesAdapterFactoryItemProvider);
-
-		/**
-		 * AdapterFactories for the PACKAGE elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.PACKAGE, new ArrayList<AdapterFactory>(Collections.singletonList(modelelementsAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the PARAMETER elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.PARAMETER, new ArrayList<AdapterFactory>(Collections.singletonList(activitiesAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the PARAMETER_SET elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.PARAMETER_SET, new ArrayList<AdapterFactory>(Collections.singletonList(activitiesAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the PORT elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.PORT, new ArrayList<AdapterFactory>(Collections.singletonList(portandflowsAdapterFactoryItemProvider)));
-
-		/**
-		 * AdapterFactories for the PROPERTY elements
-		 */
-		adapterFactoryRegistryMap.put(UMLPackage.Literals.PROPERTY, new ArrayList<AdapterFactory>(Collections.singletonList(portandflowsAdapterFactoryItemProvider)));
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(constraintsAdapterFactoryItemProvider);
-
-		adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(blocksAdapterFactoryItemProvider);
-
-	}
-
-	/**
-	 * Singleton holder
-	 *
-	 * @generated
-	 */
-	private static class SingletonHolder {
-
-		protected static SysmlRegistryAdapterFactoryRegistry instance = null;
-		static {
-			instance = new SysmlRegistryAdapterFactoryRegistry();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static SysmlRegistryAdapterFactoryRegistry getSingleton() {
-		return SingletonHolder.instance;
-	}
-
-	/**
-	 * Get the default AdapterFactory
-	 *
-	 * @return List<AdapterFactory> return the default adapter factory (UML)
-	 * @generated
-	 */
-	public AdapterFactory getDefaultAdapterFactory() {
-		return defaultAdapterFactory;
-	}
-
-	/**
-	 * Get the list of all AdapterFactory for this type
-	 *
-	 * @param Object
-	 *            element
-	 * @return List<AdapterFactory> List of all the adapter factories which can handle the object element
-	 * @generated
-	 */
-	public List<AdapterFactory> getAdapterFactoriesForType(Object element) {
-		if (element instanceof EObject) {
-			EObject eObject = (EObject) element;
-			ArrayList<AdapterFactory> result = adapterFactoryRegistryMap.get(eObject.eClass());
-			if (result != null) {
-				return result;
-			} else {
-				return Collections.singletonList(getDefaultAdapterFactory());
-			}
-		} else {
-			throw new RuntimeException("org.eclipse.papyrus.sysml.edit.utils.SysmlRegistryAdapterFactoryRegistery : This factory only works with EOBjects");
-		}
-	}
-
-	/**
-	 * Set the the root AdapterFactory for all registered adapter factory
-	 *
-	 * @param AdapterFactory
-	 *            The adapter factory which will be the root
-	 * @generated
-	 */
-	public void setRootAdapterFactory(IRootAdapterFactory adapter) {
-		for (AdapterFactory adap : adapterFactoryRegistry) {
-			if (adap instanceof IComposableAdapterFactory) {
-				((IComposableAdapterFactory) adap).setRootAdapterFactory(adapter);
-			}
-		}
-	}
-
-	/**
-	 * Get a map of all UML ItemProvider needed
-	 *
-	 * @generated
-	 */
-	public HashMap<EClass, ItemProviderAdapter> getUMLItemProviderClassifedByUMLElement(AdapterFactory rootAdapterFactory) {
-		HashMap<EClass, ItemProviderAdapter> result = new HashMap<EClass, ItemProviderAdapter>();
-
-		result.put(UMLPackage.Literals.INSTANCE_SPECIFICATION, new InstanceSpecificationItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.CONNECTOR_END, new ConnectorEndItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.OPERATION, new OperationItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.DEPENDENCY, new DependencyItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.OBJECT_NODE, new ObjectNodeItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.DATA_TYPE, new DataTypeItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.PROPERTY, new PropertyItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.BEHAVIOR, new BehaviorItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.COMMENT, new CommentItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.INTERFACE, new InterfaceItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.ABSTRACTION, new AbstractionItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.ACTIVITY_PARTITION, new ActivityPartitionItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.CONNECTOR, new ConnectorItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.PARAMETER_SET, new ParameterSetItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.ACTIVITY_EDGE, new ActivityEdgeItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.CLASSIFIER, new ClassifierItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.NAMED_ELEMENT, new NamedElementItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.PARAMETER, new ParameterItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.PORT, new PortItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.INFORMATION_FLOW, new InformationFlowItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.CLASS, new ClassItemProvider(rootAdapterFactory));
-
-		result.put(UMLPackage.Literals.PACKAGE, new PackageItemProvider(rootAdapterFactory));
-
-		return result;
-	}
-
-} // org.eclipse.papyrus.sysml.registry;
-
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java
deleted file mode 100644
index e9561c83317..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Copy} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class CopyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public CopyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_AbstractionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Abstraction feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Copy.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Copy"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Copy_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-	/**

-	 * Compose the image with specific visibility logo

-	 * Copied from UML implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-

-		return composedImage;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java
deleted file mode 100644
index 0cedce5554e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.DeriveReqt} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class DeriveReqtItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DeriveReqtItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_AbstractionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Abstraction feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns DeriveReqt.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DeriveReqt"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_DeriveReqt_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-	/**

-	 * Compose the image with specific visibility logo

-	 * Copied from UML implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-

-		return composedImage;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java
deleted file mode 100644
index 03919194a7e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Requirement} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class RequirementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addTextPropertyDescriptor(object);

-			addIdPropertyDescriptor(object);

-			addDerivedPropertyDescriptor(object);

-			addDerivedFromPropertyDescriptor(object);

-			addSatisfiedByPropertyDescriptor(object);

-			addRefinedByPropertyDescriptor(object);

-			addTracedToPropertyDescriptor(object);

-			addVerifiedByPropertyDescriptor(object);

-			addMasterPropertyDescriptor(object);

-			addBase_ClassPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Text feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addTextPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_text_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_text_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Id feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIdPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_id_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_id_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Derived feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDerivedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derived_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derived_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__DERIVED, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Derived From feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDerivedFromPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derivedFrom_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derivedFrom_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__DERIVED_FROM, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Satisfied By feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addSatisfiedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_satisfiedBy_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_satisfiedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__SATISFIED_BY, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Refined By feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addRefinedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_refinedBy_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_refinedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__REFINED_BY, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Traced To feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addTracedToPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_tracedTo_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_tracedTo_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__TRACED_TO, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Verified By feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addVerifiedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_verifiedBy_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_verifiedBy_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__VERIFIED_BY, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Master feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addMasterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_master_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_master_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__MASTER, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Class feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_ClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_base_Class_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Requirement_base_Class_feature", "_UI_Requirement_type"), RequirementsPackage.Literals.REQUIREMENT__BASE_CLASS, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Requirement.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Requirement"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((Requirement) object).getId();

-		return label == null || label.length() == 0 ? getString("_UI_Requirement_type") : getString("_UI_Requirement_type") + " " + label;

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(Requirement.class)) {

-		case RequirementsPackage.REQUIREMENT__TEXT:

-		case RequirementsPackage.REQUIREMENT__ID:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
deleted file mode 100644
index 66984092063..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class RequirementRelatedItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementRelatedItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_NamedElementPropertyDescriptor(object);

-			addTracedFromPropertyDescriptor(object);

-			addSatisfiesPropertyDescriptor(object);

-			addRefinesPropertyDescriptor(object);

-			addVerifiesPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Named Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_NamedElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_base_NamedElement_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_base_NamedElement_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Traced From feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addTracedFromPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_tracedFrom_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_tracedFrom_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__TRACED_FROM, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Satisfies feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addSatisfiesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_satisfies_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_satisfies_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__SATISFIES, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Refines feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addRefinesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_refines_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_refines_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__REFINES, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Verifies feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addVerifiesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_verifies_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_verifies_feature", "_UI_RequirementRelated_type"), RequirementsPackage.Literals.REQUIREMENT_RELATED__VERIFIES, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This returns RequirementRelated.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RequirementRelated"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_RequirementRelated_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementsItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementsItemProviderAdapterFactory.java
deleted file mode 100644
index 3c0bd2ce479..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementsItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.sysml.requirements.util.RequirementsAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc --> <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class RequirementsItemProviderAdapterFactory extends RequirementsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	public RequirementsItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.DeriveReqt} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DeriveReqtItemProvider deriveReqtItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.DeriveReqt}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createDeriveReqtAdapter() {

-		if (deriveReqtItemProvider == null) {

-			deriveReqtItemProvider = new DeriveReqtItemProvider(this);

-		}

-

-		return deriveReqtItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Verify} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VerifyItemProvider verifyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Verify}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVerifyAdapter() {

-		if (verifyItemProvider == null) {

-			verifyItemProvider = new VerifyItemProvider(this);

-		}

-

-		return verifyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Copy} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CopyItemProvider copyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Copy}.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createCopyAdapter() {

-		if (copyItemProvider == null) {

-			copyItemProvider = new CopyItemProvider(this);

-		}

-

-		return copyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Satisfy} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SatisfyItemProvider satisfyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Satisfy}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createSatisfyAdapter() {

-		if (satisfyItemProvider == null) {

-			satisfyItemProvider = new SatisfyItemProvider(this);

-		}

-

-		return satisfyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.TestCase} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TestCaseItemProvider testCaseItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.TestCase}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createTestCaseAdapter() {

-		if (testCaseItemProvider == null) {

-			testCaseItemProvider = new TestCaseItemProvider(this);

-		}

-

-		return testCaseItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.Requirement} instances.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RequirementItemProvider requirementItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createRequirementAdapter() {

-		if (requirementItemProvider == null) {

-			requirementItemProvider = new RequirementItemProvider(this);

-		}

-

-		return requirementItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated} instances. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RequirementRelatedItemProvider requirementRelatedItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated}. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createRequirementRelatedAdapter() {

-		if (requirementRelatedItemProvider == null) {

-			requirementRelatedItemProvider = new RequirementRelatedItemProvider(this);

-		}

-

-		return requirementRelatedItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (deriveReqtItemProvider != null) {

-			deriveReqtItemProvider.dispose();

-		}

-		if (verifyItemProvider != null) {

-			verifyItemProvider.dispose();

-		}

-		if (copyItemProvider != null) {

-			copyItemProvider.dispose();

-		}

-		if (satisfyItemProvider != null) {

-			satisfyItemProvider.dispose();

-		}

-		if (testCaseItemProvider != null) {

-			testCaseItemProvider.dispose();

-		}

-		if (requirementItemProvider != null) {

-			requirementItemProvider.dispose();

-		}

-		if (requirementRelatedItemProvider != null) {

-			requirementRelatedItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java
deleted file mode 100644
index 94edf473dbe..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Satisfy} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SatisfyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SatisfyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_AbstractionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Abstraction feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Satisfy.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Satisfy"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Satisfy_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-	/**

-	 * Compose the image with specific visibility logo

-	 * Copied from UML implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-

-		return composedImage;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java
deleted file mode 100644
index 1d1f1eec165..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.TestCase} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class TestCaseItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public TestCaseItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_BehaviorPropertyDescriptor(object);

-			addBase_OperationPropertyDescriptor(object);

-			addVerifiesPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Behavior feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_BehaviorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Behavior_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Behavior_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__BASE_BEHAVIOR, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Operation feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_OperationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Operation_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Operation_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__BASE_OPERATION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Verifies feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addVerifiesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_verifies_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_TestCase_verifies_feature", "_UI_TestCase_type"), RequirementsPackage.Literals.TEST_CASE__VERIFIES, false, false, false, null, null, null));

-	}

-

-	/**

-	 * This returns TestCase.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestCase"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_TestCase_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java
deleted file mode 100644
index 4ced6956a8d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedImage;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Verify} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VerifyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource

-

-{

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VerifyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBase_AbstractionPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Abstraction feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBase_AbstractionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),

-				getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), StandardPackage.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This returns Verify.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Verify"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Verify_type");

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return SysmlEditPlugin.INSTANCE;

-	}

-

-	/**

-	 * Compose the image with specific visibility logo

-	 * Copied from UML implementation

-	 *

-	 * @param object

-	 * @param composedImage

-	 * @return {@link ComposedImage}

-	 */

-	public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {

-		NamedElement namedElement = (NamedElement) object;

-

-		if (namedElement.isSetVisibility()) {

-			composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$

-					+ namedElement.getVisibility().getName()));

-		}

-

-		return composedImage;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.classpath b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.classpath
deleted file mode 100644
index 59cf3977c7e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.gitignore b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.gitignore
deleted file mode 100644
index bca9b393fd9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/bin
-/bin
-/bin
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.project b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.project
deleted file mode 100644
index 99bce0a1d34..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.service.types</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 648568a0e75..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,304 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index afeb0065e87..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.service.types,
- org.eclipse.papyrus.sysml.service.types.command,
- org.eclipse.papyrus.sysml.service.types.element,
- org.eclipse.papyrus.sysml.service.types.handlers,
- org.eclipse.papyrus.sysml.service.types.helper,
- org.eclipse.papyrus.sysml.service.types.matcher,
- org.eclipse.papyrus.sysml.service.types.menu,
- org.eclipse.papyrus.sysml.service.types.utils
-Require-Bundle: org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.service.types.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.service.types;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/about.html b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/build.properties b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/build.properties
deleted file mode 100644
index 6f116beac1f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html,\
-               plugin.xml,\
-               about.html,\
-               model/
-output..=bin/
-src.includes = about.html
-source..=src/,src-gen/
-bin..=bin/
-bin.excludes = model/ElementTypeModelForSySML.domaincontextcodegen
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/ElementTypeModelForSySML.domaincontextcodegen b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/ElementTypeModelForSySML.domaincontextcodegen
deleted file mode 100644
index 4c249096291..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/ElementTypeModelForSySML.domaincontextcodegen
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<domaincontextcodegen:DomainContext xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:domaincontextcodegen="http://www.eclipse.org/papyrus/2010/domaincontextcodegen" typeProjectName="org.eclipse.papyrus.sysml.service.types" handlerProjectName="org.eclipse.papyrus.sysml.modelexplorer" IClientContextID="" elementTypeIDPrefix="org.eclipse.papyrus.sysml" elementTypeNamePrefix="SysML" defaultHelperPath="" generatedSourceFolder="src-gen">
-  <metamodel href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/>
-  <specializationOf href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#/"/>
-  <elementTypes>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Allocate" helper="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice" matcher="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Association" helper="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationEditHelperAdvice" matcher="org.eclipse.papyrus.sysml.service.types.matcher.AssociationMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.18"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="AssociationComposite" helper="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeEditHelperAdvice" ref="//@elementTypes/@types.1" matcher="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="AssociationCompositeDirected" helper="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice" ref="//@elementTypes/@types.1" matcher="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="AssociationNone" helper="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneEditHelperAdvice" ref="//@elementTypes/@types.1" matcher="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="AssociationNoneDirected" helper="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneDirectedEditHelperAdvice" ref="//@elementTypes/@types.1" matcher="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="AssociationShared" helper="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedEditHelperAdvice" ref="//@elementTypes/@types.1" matcher="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="AssociationSharedDirected" helper="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice" ref="//@elementTypes/@types.1" matcher="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Block" helper="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Conform" helper="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.62"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ConstraintBlock" helper="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ConstraintProperty" helper="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.171"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Copy" helper="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="DeriveReqt" helper="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Dimension" helper="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.110"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.167"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort_InOut" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif" ref="//@elementTypes/@types.15" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort_In" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif" ref="//@elementTypes/@types.15" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort_Out" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif" ref="//@elementTypes/@types.15" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort_NA" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortNAEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif" ref="//@elementTypes/@types.15" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher"/>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowProperty" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.171"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowSpecification" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.117"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ItemFlow" helper="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.106"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="PartProperty" helper="org.eclipse.papyrus.sysml.service.types.helper.PartPropertyEditHelperAdvice" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.171"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Problem" helper="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.41"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Rationale" helper="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.41"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ReferenceProperty" helper="org.eclipse.papyrus.sysml.service.types.helper.ReferencePropertyEditHelperAdvice" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.171"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Requirement" helper="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Satisfy" helper="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Unit" helper="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.110"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ValueProperty" helper="org.eclipse.papyrus.sysml.service.types.helper.ValuePropertyEditHelperAdvice" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.171"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ValueType" helper="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.60"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ValueType_Enumeration" helper="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.79"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ValueType_PrimitiveType" helper="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.168"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="Verify" helper="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="View" helper="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/View.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.158"/>
-    </types>
-    <types xsi:type="domaincontextcodegen:SpecializationType" name="ViewPoint" helper="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher">
-      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>
-    </types>
-  </elementTypes>
-  <advices adviceID="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice" advicePath="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockPropertyEditHelperAdvice" inheritance="all">
-    <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.171"/>
-  </advices>
-  <advices adviceID="org.eclipse.papyrus.sysml.advice.Classifier" advicePath="org.eclipse.papyrus.sysml.service.types.helper.advice.ClassifierEditHelperAdvice" inheritance="all">
-    <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.32"/>
-  </advices>
-  <advices adviceID="org.eclipse.papyrus.sysml.advice.Property" advicePath="org.eclipse.papyrus.sysml.service.types.helper.advice.PropertyEditHelperAdvice" inheritance="all">
-    <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.171"/>
-  </advices>
-  <bindings clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext">
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.0"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.1"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.2"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.3"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.4"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.5"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.6"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.7"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.8"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.9"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.10"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.11"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.12"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.13"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.14"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.15"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.16"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.17"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.18"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.19"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.20"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.21"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.22"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.23"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.24"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.25"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.26"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.27"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.28"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.29"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.30"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.31"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.32"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.33"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.34"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.35"/>
-    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.36"/>
-    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.0"/>
-    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.1"/>
-    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.2"/>
-  </bindings>
-  <genHandlers handlerPackage="org.eclipse.papyrus.sysml.modelexplorer.handler" superClass="CreateCommandHandler" superClassPackage="org.eclipse.papyrus.sysml.modelexplorer.handler" elementTypeEnumerator="SysMLElementTypes" elementTypeEnumeratorPackage="org.eclipse.papyrus.sysml.service.types.element" visibleCreateChildHandlers="//@elementTypes/@types.8 //@elementTypes/@types.10 //@elementTypes/@types.11 //@elementTypes/@types.14 //@elementTypes/@types.15 //@elementTypes/@types.17 //@elementTypes/@types.16 //@elementTypes/@types.18 //@elementTypes/@types.20 //@elementTypes/@types.21 //@elementTypes/@types.23 //@elementTypes/@types.24 //@elementTypes/@types.25 //@elementTypes/@types.26 //@elementTypes/@types.27 //@elementTypes/@types.29 //@elementTypes/@types.30 //@elementTypes/@types.31 //@elementTypes/@types.35 //@elementTypes/@types.36" createChildMenuLocationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.createsysmlchild"/>
-</domaincontextcodegen:DomainContext>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
deleted file mode 100644
index bbbce5d0f0c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rRIxgLOjEeWH6Y3Wi2YKxg" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetActivities" name="elementTypeSetActivities" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Optional" identifier="org.eclipse.papyrus.sysml.stereotype.Optional" name="SysML::Stereotype::Optional" hint="SysML::Stereotype::Optional" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Optional"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Rate" identifier="org.eclipse.papyrus.sysml.stereotype.Rate" name="SysML::Stereotype::Rate" hint="SysML::Stereotype::Rate" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Rate"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Probability" identifier="org.eclipse.papyrus.sysml.stereotype.Probability" name="SysML::Stereotype::Probability" hint="SysML::Stereotype::Probability" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Probability"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Continuous" identifier="org.eclipse.papyrus.sysml.stereotype.Continuous" name="SysML::Stereotype::Continuous" hint="SysML::Stereotype::Continuous" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Continuous"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Discrete" identifier="org.eclipse.papyrus.sysml.stereotype.Discrete" name="SysML::Stereotype::Discrete" hint="SysML::Stereotype::Discrete" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Discrete"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ControlOperator" identifier="org.eclipse.papyrus.sysml.stereotype.ControlOperator" name="SysML::Stereotype::ControlOperator" hint="SysML::Stereotype::ControlOperator" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/ControlOperator"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.NoBuffer" identifier="org.eclipse.papyrus.sysml.stereotype.NoBuffer" name="SysML::Stereotype::NoBuffer" hint="SysML::Stereotype::NoBuffer" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/NoBuffer"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Overwrite" identifier="org.eclipse.papyrus.sysml.stereotype.Overwrite" name="SysML::Stereotype::Overwrite" hint="SysML::Stereotype::Overwrite" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Overwrite"/>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
deleted file mode 100644
index eea18145a7e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_u9Zn4LOjEeWH6Y3Wi2YKxg" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetAllocations" name="elementTypeSetAllocations" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Allocate" identifier="org.eclipse.papyrus.sysml.stereotype.Allocate" name="SysML::Stereotype::Allocate" hint="SysML::Stereotype::Allocate" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocate"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Allocated" identifier="org.eclipse.papyrus.sysml.stereotype.Allocated" name="SysML::Stereotype::Allocated" hint="SysML::Stereotype::Allocated" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocated"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.AllocateActivityPartition" identifier="org.eclipse.papyrus.sysml.stereotype.AllocateActivityPartition" name="SysML::Stereotype::AllocateActivityPartition" hint="SysML::Stereotype::AllocateActivityPartition" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/AllocateActivityPartition"/>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
deleted file mode 100644
index 418145c96bb..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_3i038FYIEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetBlocks" name="elementTypeSetBlocks" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Block" identifier="org.eclipse.papyrus.sysml.stereotype.Block" name="SysML::Stereotype::Block" hint="SysML::Stereotype::Block" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.DistributedProperty" identifier="org.eclipse.papyrus.sysml.stereotype.DistributedProperty" name="SysML::Stereotype::DistributedProperty" hint="SysML::Stereotype::DistributedProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/DistributedProperty"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Dimension" identifier="org.eclipse.papyrus.sysml.stereotype.Dimension" name="SysML::Stereotype::Dimension" hint="SysML::Stereotype::Dimension" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Dimension"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Unit" identifier="org.eclipse.papyrus.sysml.stereotype.Unit" name="SysML::Stereotype::Unit" hint="SysML::Stereotype::Unit" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Unit"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ValueType" identifier="org.eclipse.papyrus.sysml.stereotype.ValueType" name="SysML::Stereotype::ValueType" hint="SysML::Stereotype::ValueType" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ValueType"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.NestedConnectorEnd" identifier="org.eclipse.papyrus.sysml.stereotype.NestedConnectorEnd" name="SysML::Stereotype::NestedConnectorEnd" hint="SysML::Stereotype::NestedConnectorEnd" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/NestedConnectorEnd"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ParticipantProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ParticipantProperty" name="SysML::Stereotype::ParticipantProperty" hint="SysML::Stereotype::ParticipantProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ParticipantProperty"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ConnectorProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConnectorProperty" name="SysML::Stereotype::ConnectorProperty" hint="SysML::Stereotype::ConnectorProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ConnectorProperty"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.BindingConnector" identifier="org.eclipse.papyrus.sysml.stereotype.BindingConnector" name="SysML::Stereotype::BindingConnector" hint="SysML::Stereotype::BindingConnector" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/BindingConnector"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.PropertySpecificType" identifier="org.eclipse.papyrus.sysml.stereotype.PropertySpecificType" name="SysML::Stereotype::PropertySpecificType" hint="SysML::Stereotype::PropertySpecificType" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/PropertySpecificType"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_4Jt40FYIEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.stereotype.advice.Block" target="org.eclipse.papyrus.sysml.stereotype.Block" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.stereotype.helper.advice.BlockEditHelperAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
deleted file mode 100644
index e00938e5e00..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_0h9coLOjEeWH6Y3Wi2YKxg" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetConstraints" name="elementTypeSetConstraints" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ConstraintBlock" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintBlock" name="SysML::Stereotype::ConstraintBlock" hint="SysML::Stereotype::ConstraintBlock" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintBlock"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ConstraintProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintProperty" name="SysML::Stereotype::ConstraintProperty" hint="SysML::Stereotype::ConstraintProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintProperty"/>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
deleted file mode 100644
index 899b2d7a46a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_2o9lYLOjEeWH6Y3Wi2YKxg" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetModelElements" name="elementTypeSetModelElements" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Conform" identifier="org.eclipse.papyrus.sysml.stereotype.Conform" name="SysML::Stereotype::Conform" hint="SysML::Stereotype::Conform" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Conform"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.View" identifier="org.eclipse.papyrus.sysml.stereotype.View" name="SysML::Stereotype::View" hint="SysML::Stereotype::View" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/View"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ViewPoint" identifier="org.eclipse.papyrus.sysml.stereotype.ViewPoint" name="SysML::Stereotype::ViewPoint" hint="SysML::Stereotype::ViewPoint" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/ViewPoint"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Rationale" identifier="org.eclipse.papyrus.sysml.stereotype.Rationale" name="SysML::Stereotype::Rationale" hint="SysML::Stereotype::Rationale" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Rationale"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Problem" identifier="org.eclipse.papyrus.sysml.stereotype.Problem" name="SysML::Stereotype::Problem" hint="SysML::Stereotype::Problem" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Problem"/>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
deleted file mode 100644
index 60b1a9c2ed6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_6wATQLOjEeWH6Y3Wi2YKxg" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetPortsAndFlows" name="elementTypeSetPortsAndFlows" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.FlowPort" identifier="org.eclipse.papyrus.sysml.stereotype.FlowPort" name="SysML::Stereotype::FlowPort" hint="SysML::Stereotype::FlowPort" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowPort"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.FlowProperty" identifier="org.eclipse.papyrus.sysml.stereotype.FlowProperty" name="SysML::Stereotype::FlowProperty" hint="SysML::Stereotype::FlowProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowProperty"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.FlowSpecification" identifier="org.eclipse.papyrus.sysml.stereotype.FlowSpecification" name="SysML::Stereotype::FlowSpecification" hint="SysML::Stereotype::FlowSpecification" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowSpecification"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.ItemFlow" identifier="org.eclipse.papyrus.sysml.stereotype.ItemFlow" name="SysML::Stereotype::ItemFlow" hint="SysML::Stereotype::ItemFlow" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/ItemFlow"/>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
deleted file mode 100644
index 01f6c358531..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_LYuC4LOtEeWH6Y3Wi2YKxg" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetRequirements" name="elementTypeSetRequirements" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.DeriveReqt" identifier="org.eclipse.papyrus.sysml.stereotype.DeriveReqt" name="SysML::Stereotype::DeriveReqt" hint="SysML::Stereotype::DeriveReqt" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/DeriveReqt"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Verify" identifier="org.eclipse.papyrus.sysml.stereotype.Verify" name="SysML::Stereotype::Verify" hint="SysML::Stereotype::Verify" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Verify"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Copy" identifier="org.eclipse.papyrus.sysml.stereotype.Copy" name="SysML::Stereotype::Copy" hint="SysML::Stereotype::Copy" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Copy"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Satisfy" identifier="org.eclipse.papyrus.sysml.stereotype.Satisfy" name="SysML::Stereotype::Satisfy" hint="SysML::Stereotype::Satisfy" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Satisfy"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.TestCase" identifier="org.eclipse.papyrus.sysml.stereotype.TestCase" name="SysML::Stereotype::TestCase" hint="SysML::Stereotype::TestCase" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/TestCase"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.Requirement" identifier="org.eclipse.papyrus.sysml.stereotype.Requirement" name="SysML::Stereotype::Requirement" hint="SysML::Stereotype::Requirement" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.stereotype.RequirementRelated" identifier="org.eclipse.papyrus.sysml.stereotype.RequirementRelated" name="SysML::Stereotype::RequirementRelated" hint="SysML::Stereotype::RequirementRelated" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/RequirementRelated"/>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
deleted file mode 100644
index 68222ecfcda..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_649xgFYBEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetSysML" name="elementTypeSetSysML" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ActorPartProperty" identifier="org.eclipse.papyrus.sysml.ActorPartProperty" name="SysML::ActorPartProperty" hint="SysML::ActorPartProperty">

-    <iconEntry xmi:id="_65ANwFYBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65Bb4FYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ActorPartPropertyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CC8FYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ActorPartPropertyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Allocate" identifier="org.eclipse.papyrus.sysml.Allocate" name="SysML::Allocate" hint="SysML::Allocate">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65CC8lYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CC81YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Association" identifier="org.eclipse.papyrus.sysml.Association" name="SysML::Association" hint="SysML::Association">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65CqAFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CqAVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AssociationMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationBase"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.AssociationComposite" identifier="org.eclipse.papyrus.sysml.AssociationComposite" name="SysML::AssociationComposite" hint="SysML::AssociationComposite">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65CqA1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CqBFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Association"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.AssociationCompositeDirected" identifier="org.eclipse.papyrus.sysml.AssociationCompositeDirected" name="SysML::AssociationCompositeDirected" hint="SysML::AssociationCompositeDirected">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65CqBlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CqB1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Association"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.AssociationNone" identifier="org.eclipse.papyrus.sysml.AssociationNone" name="SysML::AssociationNone" hint="SysML::AssociationNone">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65CqCVYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CqClYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Association"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.AssociationNoneDirected" identifier="org.eclipse.papyrus.sysml.AssociationNoneDirected" name="SysML::AssociationNoneDirected" hint="SysML::AssociationNoneDirected">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65CqDFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneDirectedEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CqDVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Association"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.AssociationShared" identifier="org.eclipse.papyrus.sysml.AssociationShared" name="SysML::AssociationShared" hint="SysML::AssociationShared">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65CqD1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65CqEFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Association"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.AssociationSharedDirected" identifier="org.eclipse.papyrus.sysml.AssociationSharedDirected" name="SysML::AssociationSharedDirected" hint="SysML::AssociationSharedDirected">

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65DREFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65DREVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.Association"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Block" identifier="org.eclipse.papyrus.sysml.Block" name="SysML::Block" hint="SysML::Block">

-    <iconEntry xmi:id="_65DRE1YBEeS0WsAAtVmToA" iconPath="/icons/blocks/Block.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65DRFFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65DRFVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Conform" identifier="org.eclipse.papyrus.sysml.Conform" name="SysML::Conform" hint="SysML::Conform">

-    <iconEntry xmi:id="_65DRF1YBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Conform.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65DRGFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65DRGVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ConstraintBlock" identifier="org.eclipse.papyrus.sysml.ConstraintBlock" name="SysML::ConstraintBlock" hint="SysML::ConstraintBlock">

-    <iconEntry xmi:id="_65DRG1YBEeS0WsAAtVmToA" iconPath="/icons/constraints/ConstraintBlock.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65DRHFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65DRHVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ConstraintProperty" identifier="org.eclipse.papyrus.sysml.ConstraintProperty" name="SysML::ConstraintProperty" hint="SysML::ConstraintProperty">

-    <iconEntry xmi:id="_65DRH1YBEeS0WsAAtVmToA" iconPath="/icons/constraints/ConstraintProperty.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65DRIFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65DRIVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Copy" identifier="org.eclipse.papyrus.sysml.Copy" name="SysML::Copy" hint="SysML::Copy">

-    <iconEntry xmi:id="_65DRI1YBEeS0WsAAtVmToA" iconPath="/icons/requirements/Copy.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65DRJFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65DRJVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.DeriveReqt" identifier="org.eclipse.papyrus.sysml.DeriveReqt" name="SysML::DeriveReqt" hint="SysML::DeriveReqt">

-    <iconEntry xmi:id="_65D4IVYBEeS0WsAAtVmToA" iconPath="/icons/requirements/DeriveReqt.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65D4IlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65D4I1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Dimension" identifier="org.eclipse.papyrus.sysml.Dimension" name="SysML::Dimension" hint="SysML::Dimension">

-    <iconEntry xmi:id="_65D4JVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/Dimension.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65D4JlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65D4J1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.FlowPort" identifier="org.eclipse.papyrus.sysml.FlowPort" name="SysML::FlowPort" hint="SysML::FlowPort">

-    <iconEntry xmi:id="_65D4KVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65D4KlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65D4K1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.FlowPort_InOut" identifier="org.eclipse.papyrus.sysml.FlowPort_InOut" name="SysML::FlowPort_InOut" hint="SysML::FlowPort_InOut">

-    <iconEntry xmi:id="_65D4LVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65D4LlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65D4L1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.FlowPort_In" identifier="org.eclipse.papyrus.sysml.FlowPort_In" name="SysML::FlowPort_In" hint="SysML::FlowPort_In">

-    <iconEntry xmi:id="_65D4MVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65D4MlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65D4M1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.FlowPort_Out" identifier="org.eclipse.papyrus.sysml.FlowPort_Out" name="SysML::FlowPort_Out" hint="SysML::FlowPort_Out">

-    <iconEntry xmi:id="_65D4NVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65D4NlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65EfMFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.FlowPort_NA" identifier="org.eclipse.papyrus.sysml.FlowPort_NA" name="SysML::FlowPort_NA" hint="SysML::FlowPort_NA">

-    <iconEntry xmi:id="_65EfMlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort_NA.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65EfM1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortNAEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65EfNFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#org.eclipse.papyrus.sysml.FlowPort"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.FlowProperty" identifier="org.eclipse.papyrus.sysml.FlowProperty" name="SysML::FlowProperty" hint="SysML::FlowProperty">

-    <iconEntry xmi:id="_65EfNlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowProperty.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65EfN1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65EfOFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.FlowSpecification" identifier="org.eclipse.papyrus.sysml.FlowSpecification" name="SysML::FlowSpecification" hint="SysML::FlowSpecification">

-    <iconEntry xmi:id="_65EfOlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowSpecification.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65EfO1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65EfPFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ItemFlow" identifier="org.eclipse.papyrus.sysml.ItemFlow" name="SysML::ItemFlow" hint="SysML::ItemFlow">

-    <iconEntry xmi:id="_65EfPlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/ItemFlow.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65EfP1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65EfQFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationFlow"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.PartProperty" identifier="org.eclipse.papyrus.sysml.PartProperty" name="SysML::PartProperty" hint="SysML::PartProperty">

-    <iconEntry xmi:id="_65EfQlYBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65EfQ1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.PartPropertyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65EfRFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Problem" identifier="org.eclipse.papyrus.sysml.Problem" name="SysML::Problem" hint="SysML::Problem">

-    <iconEntry xmi:id="_65EfRlYBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Problem.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FGQFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FGQVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Rationale" identifier="org.eclipse.papyrus.sysml.Rationale" name="SysML::Rationale" hint="SysML::Rationale">

-    <iconEntry xmi:id="_65FGQ1YBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Rationale.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FGRFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FGRVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ReferenceProperty" identifier="org.eclipse.papyrus.sysml.ReferenceProperty" name="SysML::ReferenceProperty" hint="SysML::ReferenceProperty">

-    <iconEntry xmi:id="_65FGR1YBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FGSFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ReferencePropertyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FGSVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Requirement" identifier="org.eclipse.papyrus.sysml.Requirement" name="SysML::Requirement" hint="SysML::Requirement">

-    <iconEntry xmi:id="_65FGS1YBEeS0WsAAtVmToA" iconPath="/icons/requirements/Requirement.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FGTFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FGTVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Satisfy" identifier="org.eclipse.papyrus.sysml.Satisfy" name="SysML::Satisfy" hint="SysML::Satisfy">

-    <iconEntry xmi:id="_65FGT1YBEeS0WsAAtVmToA" iconPath="/icons/requirements/Satisfy.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FGUFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FGUVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Unit" identifier="org.eclipse.papyrus.sysml.Unit" name="SysML::Unit" hint="SysML::Unit">

-    <iconEntry xmi:id="_65FtUVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/Unit.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FtUlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FtU1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ValueProperty" identifier="org.eclipse.papyrus.sysml.ValueProperty" name="SysML::ValueProperty" hint="SysML::ValueProperty">

-    <iconEntry xmi:id="_65FtVVYBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FtVlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValuePropertyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FtV1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ValueType" identifier="org.eclipse.papyrus.sysml.ValueType" name="SysML::ValueType" hint="SysML::ValueType">

-    <iconEntry xmi:id="_65FtWVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/ValueType.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FtWlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FtW1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataType"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ValueType_Enumeration" identifier="org.eclipse.papyrus.sysml.ValueType_Enumeration" name="SysML::ValueType_Enumeration" hint="SysML::ValueType_Enumeration">

-    <iconEntry xmi:id="_65FtXVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/ValueType.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FtXlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FtX1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Enumeration"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" identifier="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" name="SysML::ValueType_PrimitiveType" hint="SysML::ValueType_PrimitiveType">

-    <iconEntry xmi:id="_65FtYVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/ValueType.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65FtYlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65FtY1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PrimitiveType"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.Verify" identifier="org.eclipse.papyrus.sysml.Verify" name="SysML::Verify" hint="SysML::Verify">

-    <iconEntry xmi:id="_65GUYVYBEeS0WsAAtVmToA" iconPath="/icons/requirements/Verify.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65GUYlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65GUY1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.View" identifier="org.eclipse.papyrus.sysml.View" name="SysML::View" hint="SysML::View">

-    <iconEntry xmi:id="_65GUZVYBEeS0WsAAtVmToA" iconPath="/icons/modelelements/View.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65GUZlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65GUZ1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ViewPoint" identifier="org.eclipse.papyrus.sysml.ViewPoint" name="SysML::ViewPoint" hint="SysML::ViewPoint">

-    <iconEntry xmi:id="_65GUaVYBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Viewpoint.gif" bundleId="org.eclipse.papyrus.sysml"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_65GUalYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_65GUa1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysml.ConstraintBlockParameter" identifier="org.eclipse.papyrus.sysml.ConstraintBlockParameter" name="SysML::ConstraintBlockParameter" hint="SysML::ConstraintBlockParameter">

-    <iconEntry xmi:id="_2MWa8FYNEeSSidqjsigY_Q" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_pV9-YFYNEeSSidqjsigY_Q" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice"/>

-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_4QgrEFYNEeSSidqjsigY_Q" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_65IJkFYBEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockPropertyEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Kse4IFYDEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.advice.Classifier" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ClassifierEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Classifier"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_XFKsEFYDEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.advice.BlockConnector" target="org.eclipse.papyrus.sysml.Block" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.BlockConnectorEditHelperAdvice"/>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_iARuwFYDEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.advice.Connector" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ConnectorEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Connector"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_pCAFEFYDEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.advice.Property" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PropertyEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_vpsKwFYDEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.advice.Package" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PackageEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_2t_7AFYDEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.sysml.advice.Actor" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ActorEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>

-  </adviceBindingsConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.properties b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.properties
deleted file mode 100644
index 382f2f9e224..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.properties
+++ /dev/null
@@ -1,16 +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:
-#    Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
-#
-########################################################################################
-pluginName= Papyrus SysML ElementType Service
-providerName=Eclipse Modeling Project
-
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
deleted file mode 100644
index 6bc12593e69..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-
-<!-- SysML ElementType bindings to Papyrus shared IClientContext -->
-<extension point="org.eclipse.ui.commands">
-
-	<!-- Creation command for ActorPart -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ActorPart" id="org.eclipse.papyrus.sysml.service.types.ActorPartCreateCommand" name="Create a new ActorPart">
-	</command>
-	
-	<!-- Creation command for Allocate -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Allocate" id="org.eclipse.papyrus.sysml.service.types.AllocateCreateCommand" name="Create a new Allocate">
-	</command>
-	
-	<!-- Creation command for Association -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Association" id="org.eclipse.papyrus.sysml.service.types.AssociationCreateCommand" name="Create a new Association">
-	</command>
-	
-	<!-- Creation command for AssociationComposite -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new AssociationComposite" id="org.eclipse.papyrus.sysml.service.types.AssociationCompositeCreateCommand" name="Create a new AssociationComposite">
-	</command>
-	
-	<!-- Creation command for AssociationCompositeDirected -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new AssociationCompositeDirected" id="org.eclipse.papyrus.sysml.service.types.AssociationCompositeDirectedCreateCommand" name="Create a new AssociationCompositeDirected">
-	</command>
-	
-	<!-- Creation command for AssociationNone -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new AssociationNone" id="org.eclipse.papyrus.sysml.service.types.AssociationNoneCreateCommand" name="Create a new AssociationNone">
-	</command>
-	
-	<!-- Creation command for AssociationNoneDirected -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new AssociationNoneDirected" id="org.eclipse.papyrus.sysml.service.types.AssociationNoneDirectedCreateCommand" name="Create a new AssociationNoneDirected">
-	</command>
-	
-	<!-- Creation command for AssociationShared -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new AssociationShared" id="org.eclipse.papyrus.sysml.service.types.AssociationSharedCreateCommand" name="Create a new AssociationShared">
-	</command>
-	
-	<!-- Creation command for AssociationSharedDirected -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new AssociationSharedDirected" id="org.eclipse.papyrus.sysml.service.types.AssociationSharedDirectedCreateCommand" name="Create a new AssociationSharedDirected">
-	</command>
-	
-	<!-- Creation command for Block -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Block" id="org.eclipse.papyrus.sysml.service.types.BlockCreateCommand" name="Create a new Block">
-	</command>
-	
-	<!-- Creation command for Conform -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Conform" id="org.eclipse.papyrus.sysml.service.types.ConformCreateCommand" name="Create a new Conform">
-	</command>
-		
-	<!-- Creation command for ConstraintBlock -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ConstraintBlock" id="org.eclipse.papyrus.sysml.service.types.ConstraintBlockCreateCommand" name="Create a new ConstraintBlock">
-	</command>
-
-	<!-- Creation command for ConstraintBlockParameter -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Parameter" id="org.eclipse.papyrus.sysml.service.types.ConstraintBlockParameterCreateCommand" name="Create a new Parameter">
-	</command>
-
-	<!-- Creation command for ConstraintProperty -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ConstraintProperty" id="org.eclipse.papyrus.sysml.service.types.ConstraintPropertyCreateCommand" name="Create a new ConstraintProperty">
-	</command>
-	
-	<!-- Creation command for Copy -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Copy" id="org.eclipse.papyrus.sysml.service.types.CopyCreateCommand" name="Create a new Copy">
-	</command>
-	
-	<!-- Creation command for DeriveReqt -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new DeriveReqt" id="org.eclipse.papyrus.sysml.service.types.DeriveReqtCreateCommand" name="Create a new DeriveReqt">
-	</command>
-	
-	<!-- Creation command for Dimension -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Dimension" id="org.eclipse.papyrus.sysml.service.types.DimensionCreateCommand" name="Create a new Dimension">
-	</command>
-	
-	<!-- Creation command for FlowPort -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new FlowPort" id="org.eclipse.papyrus.sysml.service.types.FlowPortCreateCommand" name="Create a new FlowPort">
-	</command>
-	  
-	<!-- Creation command for FlowPort_InOut -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new FlowPort_InOut" id="org.eclipse.papyrus.sysml.service.types.FlowPort_InOutCreateCommand" name="Create a new FlowPort_InOut">
-	</command>
-	
-	<!-- Creation command for FlowPort_In -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new FlowPort_In" id="org.eclipse.papyrus.sysml.service.types.FlowPort_InCreateCommand" name="Create a new FlowPort_In">
-	</command>
-	
-	<!-- Creation command for FlowPort_Out -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new FlowPort_Out" id="org.eclipse.papyrus.sysml.service.types.FlowPort_OutCreateCommand" name="Create a new FlowPort_Out">
-	</command>
-
-	<!-- Creation command for FlowPort_NA -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new FlowPort (non atomic)" id="org.eclipse.papyrus.sysml.service.types.FlowPort_NACreateCommand" name="Create a new FlowPort (non atomic)">
-	</command>
-
-	<!-- Creation command for FlowProperty -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new FlowProperty" id="org.eclipse.papyrus.sysml.service.types.FlowPropertyCreateCommand" name="Create a new FlowProperty">
-	</command>
-	
-	<!-- Creation command for FlowSpecification -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new FlowSpecification" id="org.eclipse.papyrus.sysml.service.types.FlowSpecificationCreateCommand" name="Create a new FlowSpecification">
-	</command>
-	
-	<!-- Creation command for ItemFlow -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ItemFlow" id="org.eclipse.papyrus.sysml.service.types.ItemFlowCreateCommand" name="Create a new ItemFlow">
-	</command>
-
-	<!-- Creation command for PartProperty -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new PartProperty" id="org.eclipse.papyrus.sysml.service.types.PartPropertyCreateCommand" name="Create a new PartProperty">
-	</command>
-		
-	<!-- Creation command for Problem -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Problem" id="org.eclipse.papyrus.sysml.service.types.ProblemCreateCommand" name="Create a new Problem">
-	</command>
-	
-	<!-- Creation command for Rationale -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Rationale" id="org.eclipse.papyrus.sysml.service.types.RationaleCreateCommand" name="Create a new Rationale">
-	</command>
-	
-	<!-- Creation command for ReferenceProperty -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ReferenceProperty" id="org.eclipse.papyrus.sysml.service.types.ReferencePropertyCreateCommand" name="Create a new ReferenceProperty">
-	</command>
-	
-	<!-- Creation command for Requirement -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Requirement" id="org.eclipse.papyrus.sysml.service.types.RequirementCreateCommand" name="Create a new Requirement">
-	</command>
-	
-	<!-- Creation command for Satisfy -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Satisfy" id="org.eclipse.papyrus.sysml.service.types.SatisfyCreateCommand" name="Create a new Satisfy">
-	</command>
-	
-	<!-- Creation command for Unit -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Unit" id="org.eclipse.papyrus.sysml.service.types.UnitCreateCommand" name="Create a new Unit">
-	</command>
-	
-	<!-- Creation command for ValueProperty -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ValueProperty" id="org.eclipse.papyrus.sysml.service.types.ValuePropertyCreateCommand" name="Create a new ValueProperty">
-	</command>
-	
-	<!-- Creation command for ValueType -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ValueType" id="org.eclipse.papyrus.sysml.service.types.ValueTypeCreateCommand" name="Create a new ValueType">
-	</command>
-	
-	<!-- Creation command for ValueType_Enumeration -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ValueType_Enumeration" id="org.eclipse.papyrus.sysml.service.types.ValueType_EnumerationCreateCommand" name="Create a new ValueType_Enumeration">
-	</command>
-	
-	<!-- Creation command for ValueType_PrimitiveType -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ValueType_PrimitiveType" id="org.eclipse.papyrus.sysml.service.types.ValueType_PrimitiveTypeCreateCommand" name="Create a new ValueType_PrimitiveType">
-	</command>
-	
-	<!-- Creation command for Verify -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new Verify" id="org.eclipse.papyrus.sysml.service.types.VerifyCreateCommand" name="Create a new Verify">
-	</command>
-	
-	<!-- Creation command for View -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new View" id="org.eclipse.papyrus.sysml.service.types.ViewCreateCommand" name="Create a new View">
-	</command>
-	
-	<!-- Creation command for ViewPoint -->
-	<command categoryId="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands" description="Create a new ViewPoint" id="org.eclipse.papyrus.sysml.service.types.ViewPointCreateCommand" name="Create a new ViewPoint">
-	</command>
-	
-	<!-- Category for the creation of Sysml elements-->
-	
-</extension>
-<extension
-      point="org.eclipse.ui.commands">
-   <category
-         id="org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands"
-         name="Commands for the creation of Sysml elements">
-   </category>
-</extension>
-<extension
-      point="org.eclipse.ui.commandImages">
-   
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ActorPartCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-
-		</image>
-
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AllocateCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AssociationCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AssociationCompositeCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AssociationCompositeDirectedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AssociationNoneCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AssociationNoneDirectedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AssociationSharedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.AssociationSharedDirectedCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.BlockCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ConformCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ConstraintBlockCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif">
-
-		</image>
-
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ConstraintBlockParameterCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-
-		</image>
-
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ConstraintPropertyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.CopyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.DeriveReqtCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.DimensionCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.FlowPortCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif">
-
-		</image>
-		  
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_InOutCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_InCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_OutCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif">
-
-		</image>
-
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.FlowPort_NACreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif">
-
-		</image>
-
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.FlowPropertyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.FlowSpecificationCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ItemFlowCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.PartPropertyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-
-		</image>
-				
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ProblemCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.RationaleCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ReferencePropertyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-
-		</image>
-				
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.RequirementCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.SatisfyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.UnitCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ValuePropertyCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-
-		</image>
-				
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ValueTypeCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ValueType_EnumerationCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ValueType_PrimitiveTypeCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.VerifyCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ViewCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/View.gif">
-
-		</image>
-		
-		
-		<image commandId="org.eclipse.papyrus.sysml.service.types.ViewPointCreateCommand" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif">
-
-		</image>
-</extension>
-</plugin>
-
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/pom.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/pom.xml
deleted file mode 100644
index 9934a2b2f90..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.sysml</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.sysml.service.types</artifactId>

-	<version>2.0.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/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
deleted file mode 100644
index 0ebf92372d5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************
- * Copyright (c) CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.element;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-/** Convenient utility class listing IElementType declared in plugin.xml */
-public class SysMLElementTypes extends AbstractElementTypeEnumerator {
-
-	/** Constant for SysML nature */
-	public static final String SYSML_NATURE = "SysML_Nature";
-
-	/** IElementType for SysML ActorPartProperty */
-	public static final IHintedType ACTOR_PART_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ActorPartProperty"); //$NON-NLS-1$
-
-	/** IElementType for SysML Allocate */
-	public static final IHintedType ALLOCATE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Allocate"); //$NON-NLS-1$
-
-	/** IElementType for SysML Association (Association with SysML nature) */
-	public static final IHintedType ASSOCIATION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Association"); //$NON-NLS-1$
-
-	/** IElementType for SysML Association with "aggregation = composite" (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_COMPOSITE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationComposite"); //$NON-NLS-1$
-
-	/** IElementType for SysML Association with "aggregation = composite" and navigable in one-way (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_COMPOSITE_DIRECTED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationCompositeDirected"); //$NON-NLS-1$
-
-	/** IElementType for SysML Association with "aggregation = none" (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_NONE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationNone"); //$NON-NLS-1$
-
-	/** IElementType for SysML Association with "aggregation = none" and navigable in one-way (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_NONE_DIRECTED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationNoneDirected"); //$NON-NLS-1$
-
-	/** IElementType for SysML Association with "aggregation = shared" (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_SHARED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationShared"); //$NON-NLS-1$
-
-	/** IElementType for SysML Association with "aggregation = shared" and navigable in one-way (for creation purpose only) */
-	public static final IHintedType ASSOCIATION_SHARED_DIRECTED = (IHintedType) getElementType("org.eclipse.papyrus.sysml.AssociationSharedDirected"); //$NON-NLS-1$
-
-	/** IElementType for SysML Block */
-	public static final IHintedType BLOCK = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Block"); //$NON-NLS-1$
-
-	/** IElementType for SysML Conform */
-	public static final IHintedType CONFORM = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Conform"); //$NON-NLS-1$
-
-	/** IElementType for SysML ConstraintBlock */
-	public static final IHintedType CONSTRAINT_BLOCK = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ConstraintBlock"); //$NON-NLS-1$
-
-	/** IElementType for SysML ConstraintProperty */
-	public static final IHintedType CONSTRAINT_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ConstraintProperty"); //$NON-NLS-1$
-
-	/** IElementType for SysML Copy */
-	public static final IHintedType COPY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Copy"); //$NON-NLS-1$
-
-	/** IElementType for SysML DeriveReqt */
-	public static final IHintedType DERIVE_REQT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.DeriveReqt"); //$NON-NLS-1$
-
-	/** IElementType for SysML Dimension */
-	public static final IHintedType DIMENSION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Dimension"); //$NON-NLS-1$
-
-	/** IElementType for SysML FlowPort */
-	public static final IHintedType FLOW_PORT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort"); //$NON-NLS-1$
-
-	/** IElementType for SysML FlowPort_InOut */
-	public static final IHintedType FLOW_PORT_IN_OUT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_InOut"); //$NON-NLS-1$
-
-	/** IElementType for SysML FlowPort_In */
-	public static final IHintedType FLOW_PORT_IN = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_In"); //$NON-NLS-1$
-
-	/** IElementType for SysML FlowPort_Out */
-	public static final IHintedType FLOW_PORT_OUT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_Out"); //$NON-NLS-1$
-
-	/** IElementType for SysML FlowPort_NA */
-	public static final IHintedType FLOW_PORT_NA = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowPort_NA"); //$NON-NLS-1$
-
-	/** IElementType for SysML FlowProperty */
-	public static final IHintedType FLOW_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowProperty"); //$NON-NLS-1$
-
-	/** IElementType for SysML FlowSpecification */
-	public static final IHintedType FLOW_SPECIFICATION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.FlowSpecification"); //$NON-NLS-1$
-
-	/** IElementType for SysML ItemFlow */
-	public static final IHintedType ITEM_FLOW = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ItemFlow"); //$NON-NLS-1$
-
-	/** IElementType for SysML Part (Property) */
-	public static final IHintedType PART_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.PartProperty"); //$NON-NLS-1$
-
-	/** IElementType for SysML Problem */
-	public static final IHintedType PROBLEM = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Problem"); //$NON-NLS-1$
-
-	/** IElementType for SysML Rationale */
-	public static final IHintedType RATIONALE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Rationale"); //$NON-NLS-1$
-
-	/** IElementType for SysML Reference (Property) */
-	public static final IHintedType REFERENCE_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ReferenceProperty"); //$NON-NLS-1$
-
-	/** IElementType for SysML Requirement */
-	public static final IHintedType REQUIREMENT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Requirement"); //$NON-NLS-1$
-
-	/** IElementType for SysML Satisfy */
-	public static final IHintedType SATISFY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Satisfy"); //$NON-NLS-1$
-
-	/** IElementType for SysML Unit */
-	public static final IHintedType UNIT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Unit"); //$NON-NLS-1$
-
-	/** IElementType for SysML Value (Property) */
-	public static final IHintedType VALUE_PROPERTY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueProperty"); //$NON-NLS-1$
-
-	/** IElementType for SysML ValueType */
-	public static final IHintedType VALUE_TYPE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueType"); //$NON-NLS-1$
-
-	/** IElementType for SysML ValueType_Enumeration */
-	public static final IHintedType VALUE_TYPE_ENUMERATION = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueType_Enumeration"); //$NON-NLS-1$
-
-	/** IElementType for SysML ValueType_PrimitiveType */
-	public static final IHintedType VALUE_TYPE_PRIMITIVE_TYPE = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ValueType_PrimitiveType"); //$NON-NLS-1$
-
-	/** IElementType for SysML Verify */
-	public static final IHintedType VERIFY = (IHintedType) getElementType("org.eclipse.papyrus.sysml.Verify"); //$NON-NLS-1$
-
-	/** IElementType for SysML View */
-	public static final IHintedType VIEW = (IHintedType) getElementType("org.eclipse.papyrus.sysml.View"); //$NON-NLS-1$
-
-	/** IElementType for SysML ViewPoint */
-	public static final IHintedType VIEW_POINT = (IHintedType) getElementType("org.eclipse.papyrus.sysml.ViewPoint"); //$NON-NLS-1$
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/filter/SysmlCommandFilter.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/filter/SysmlCommandFilter.java
deleted file mode 100644
index 7fcaa6ee3d9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/filter/SysmlCommandFilter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011-2012 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.filter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.filter.ICommandFilter;
-
-/**
- * Filter for available Sysml commands. Moved from oep.sysml.modelexplorer
- *
- * @author JC236769
- *
- */
-public class SysmlCommandFilter implements ICommandFilter {
-
-	/**
-	 * Singleton instance
-	 */
-	public static final SysmlCommandFilter INSTANCE = new SysmlCommandFilter();
-
-	private SysmlCommandFilter() {
-		// to prevent instantiation
-	}
-
-	private List<IElementType> visibleCommands;
-
-	public List<IElementType> getVisibleCommands() {
-		if (visibleCommands == null) {
-			List<IElementType> localVisibleCommands = new ArrayList<IElementType>();
-
-			localVisibleCommands = new ArrayList<IElementType>();
-
-			localVisibleCommands.add(SysMLElementTypes.ACTOR_PART_PROPERTY);
-			// localVisibleCommands.add(SysMLElementTypes.ALLOCATE);
-			// localVisibleCommands.add(SysMLElementTypes.ASSOCIATION);
-			// localVisibleCommands.add(SysMLElementTypes.ASSOCIATION_COMPOSITE);
-			// localVisibleCommands.add(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED);
-			// localVisibleCommands.add(SysMLElementTypes.ASSOCIATION_NONE);
-			// localVisibleCommands.add(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED);
-			// localVisibleCommands.add(SysMLElementTypes.ASSOCIATION_SHARED);
-			// localVisibleCommands.add(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED);
-			localVisibleCommands.add(SysMLElementTypes.BLOCK);
-			// localVisibleCommands.add(SysMLElementTypes.CONFORM);
-			localVisibleCommands.add(SysMLElementTypes.CONSTRAINT_BLOCK);
-			localVisibleCommands.add(SysMLElementTypes.CONSTRAINT_PROPERTY);
-			// localVisibleCommands.add(SysMLElementTypes.COPY);
-			// localVisibleCommands.add(SysMLElementTypes.DERIVE_REQT);
-			localVisibleCommands.add(SysMLElementTypes.DIMENSION);
-			localVisibleCommands.add(SysMLElementTypes.FLOW_PORT);
-			localVisibleCommands.add(SysMLElementTypes.FLOW_PORT_IN_OUT);
-			localVisibleCommands.add(SysMLElementTypes.FLOW_PORT_IN);
-			localVisibleCommands.add(SysMLElementTypes.FLOW_PORT_OUT);
-			// localVisibleCommands.add(SysMLElementTypes.FLOW_PORT_NA);
-			localVisibleCommands.add(SysMLElementTypes.FLOW_PROPERTY);
-			localVisibleCommands.add(SysMLElementTypes.FLOW_SPECIFICATION);
-			// localVisibleCommands.add(SysMLElementTypes.ITEM_FLOW);
-			localVisibleCommands.add(SysMLElementTypes.PART_PROPERTY);
-			localVisibleCommands.add(SysMLElementTypes.PROBLEM);
-			localVisibleCommands.add(SysMLElementTypes.RATIONALE);
-			localVisibleCommands.add(SysMLElementTypes.REFERENCE_PROPERTY);
-			localVisibleCommands.add(SysMLElementTypes.REQUIREMENT);
-			// localVisibleCommands.add(SysMLElementTypes.SATISFY);
-			localVisibleCommands.add(SysMLElementTypes.UNIT);
-			localVisibleCommands.add(SysMLElementTypes.VALUE_PROPERTY);
-			localVisibleCommands.add(SysMLElementTypes.VALUE_TYPE);
-			// localVisibleCommands.add(SysMLElementTypes.VALUE_TYPE_ENUMERATION);
-			// localVisibleCommands.add(SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE);
-			// localVisibleCommands.add(SysMLElementTypes.VERIFY);
-			localVisibleCommands.add(SysMLElementTypes.VIEW);
-			localVisibleCommands.add(SysMLElementTypes.VIEW_POINT);
-
-			// UMLElementTypes.PROPERTY is required by ConstraintBlock Parameter
-			localVisibleCommands.add(UMLElementTypes.PROPERTY);
-
-			this.visibleCommands = Collections.unmodifiableList(localVisibleCommands);
-
-		}
-
-		return visibleCommands;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/Activator.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/Activator.java
deleted file mode 100644
index ed5cbbe8b8f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/Activator.java
+++ /dev/null
@@ -1,71 +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:
- *  Yann Tanguy (CEA LIST) Yann.Tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types;
-
-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.sysml.service.types"; //$NON-NLS-1$
-
-	/** The plug-in shared instance */
-	private static Activator plugin;
-
-	/** The log service */
-	public static LogHelper log;
-
-	/** Default constructor */
-	public Activator() {
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		log = new LogHelper(plugin);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/command/SetNestedPathCommand.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/command/SetNestedPathCommand.java
deleted file mode 100644
index e5839c25c11..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/command/SetNestedPathCommand.java
+++ /dev/null
@@ -1,170 +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.sysml.service.types.command;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
-import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/**
- * <pre>
- * Set SysML {@link NestedConnectorEnd} stereotype information for {@link ConnectorEnd}.
- * </pre>
- */
-public class SetNestedPathCommand extends EditElementCommand {
-
-	private ConnectorUtils utils = new ConnectorUtils();
-
-	/**
-	 * The ordered list of {@link Property} to follow in order to reach the nested {@link ConnectableElement}.
-	 */
-	private List<Property> nestedPath;
-
-	/**
-	 * Indicates that the source of the {@link Connector} is nested.
-	 */
-	public final static int NESTED_SOURCE = 1;
-
-	/**
-	 * Indicates that the target of the {@link Connector} is nested.
-	 */
-	public final static int NESTED_TARGET = 2;
-
-	/**
-	 * Indicates whether or not the source of the target of the {@link Connector} is nested.
-	 * One of {@link #NESTED_SOURCE} or {@link #NESTED_TARGET}.
-	 */
-	private final int nestedEndDirection;
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param label
-	 *            the command label.
-	 * @param elementToEdit
-	 *            the element to edit.
-	 * @param request
-	 *            the request this command contribute to ({@link CreateRelationshipRequest} or {@link ReorientRelationshipRequest})
-	 * @param nestedPath
-	 *            the property path to set (in {@link NestedConnectorEnd#getPropertyPath()} ).
-	 * @param nestedEndDirection
-	 *            the direction ({@link #NESTED_SOURCE} or {@link #NESTED_TARGET}) of the {@link ConnectorEnd} to modify.
-	 */
-	public SetNestedPathCommand(String label, EObject elementToEdit, IEditCommandRequest request, List<Property> nestedPath, int nestedEndDirection) {
-		super(label, elementToEdit, request);
-		this.nestedPath = nestedPath;
-		this.nestedEndDirection = nestedEndDirection;
-	}
-
-	/**
-	 * Test whether the command can be executed or not.
-	 */
-	@Override
-	public boolean canExecute() {
-
-		// Verify the kind of request
-		if (!(getRequest() instanceof CreateRelationshipRequest)
-				&& !(getRequest() instanceof ReorientRelationshipRequest)) {
-
-			return false;
-		}
-
-		// Verify (basic) that the related Connector well-formed.
-		// In case of Connector creation, the connector is most probably not created yet
-		if ((getConnector() != null)
-				&& (getConnector().getEnds().size() != 2)) {
-
-			return false; // binary connector expected.
-		}
-
-		return true;
-	}
-
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Unexecutable command."); //$NON-NLS-1$
-		}
-
-		ConnectorEnd modifiedEnd = getModifiedConnectorEnd();
-		NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(modifiedEnd, NestedConnectorEnd.class);
-
-		if (nestedPath.isEmpty()) {
-			// Remove stereotype if applied
-			if (nestedConnectorEnd != null) {
-				EcoreUtil.delete(nestedConnectorEnd, true);
-			}
-
-		} else {
-			// Add stereotype if not applied and set new path if different from existing
-			if (nestedConnectorEnd == null) {
-				// apply stereotype
-				nestedConnectorEnd = (NestedConnectorEnd) StereotypeApplicationHelper.INSTANCE.applyStereotype(modifiedEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
-			}
-
-			// Set path
-			if (!nestedConnectorEnd.getPropertyPath().equals(nestedPath)) {
-				nestedConnectorEnd.getPropertyPath().clear();
-				nestedConnectorEnd.getPropertyPath().addAll(nestedPath);
-			}
-		}
-
-		return CommandResult.newOKCommandResult(getConnector());
-	}
-
-	/**
-	 * Get the {@link ConnectorEnd} currently modified by the command.
-	 *
-	 * @return the modified {@link ConnectorEnd}.
-	 */
-	private ConnectorEnd getModifiedConnectorEnd() {
-		return (nestedEndDirection == NESTED_SOURCE) ? utils.getSourceConnectorEnd(getConnector()) : utils.getTargetConnectorEnd(getConnector());
-	}
-
-	/**
-	 * Get the {@link Connector} currently under creation or re-orient that hold {@link ConnectorEnd} to update.
-	 *
-	 * @return the related {@link Connector}.
-	 */
-	private Connector getConnector() {
-		Connector connector = null;
-		if (getRequest() instanceof CreateRelationshipRequest) {
-			connector = (Connector) ((CreateRelationshipRequest) getRequest()).getNewElement();
-		}
-
-		if (getRequest() instanceof ReorientRelationshipRequest) {
-			connector = (Connector) ((ReorientRelationshipRequest) getRequest()).getRelationship();
-		}
-		return connector;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateCommandHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateCommandHandler.java
deleted file mode 100644
index 66e03c11c10..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateCommandHandler.java
+++ /dev/null
@@ -1,35 +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:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.handlers;
-
-import org.eclipse.papyrus.sysml.service.types.filter.SysmlCommandFilter;
-import org.eclipse.papyrus.uml.service.types.filter.ICommandFilter;
-import org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler;
-
-/**
- *
- * Abstract handler for every creation command for Sysml elements
- * used in the ModelExplorer contextual ("Create new child") menu
- * 
- * @Deprecated since Eclipse Mars Use AbstractSysmlCreateElementCommandHandler
- */
-@Deprecated
-public abstract class AbstractSysmlCreateCommandHandler extends AbstractCreateCommandHandler {
-
-	private static final ICommandFilter filter = SysmlCommandFilter.INSTANCE;
-
-	@Override
-	public ICommandFilter getCommandFilter() {
-		return filter;
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateElementCommandHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateElementCommandHandler.java
deleted file mode 100644
index dbe3a746335..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/handlers/AbstractSysmlCreateElementCommandHandler.java
+++ /dev/null
@@ -1,36 +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.sysml.service.types.handlers;
-
-import org.eclipse.papyrus.sysml.service.types.filter.SysmlCommandFilter;
-import org.eclipse.papyrus.uml.service.types.filter.ICommandFilter;
-import org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateElementCommandHandler;
-
-/**
- *
- * Abstract handler for every creation command for Sysml elements
- * used in the ModelExplorer contextual ("Create new child") menu
- *
- */
-public abstract class AbstractSysmlCreateElementCommandHandler extends AbstractCreateElementCommandHandler {
-
-	private static final ICommandFilter filter = SysmlCommandFilter.INSTANCE;
-
-	@Override
-	public ICommandFilter getCommandFilter() {
-		return filter;
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AbstractPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AbstractPropertyEditHelperAdvice.java
deleted file mode 100644
index cdde4a3b9ca..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AbstractPropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- *
- */
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.papyrus.sysml.service.types.Activator;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-
-
-/**
- * Abstract edit helper advice for SysML specific Properties: part and reference
- */
-public abstract class AbstractPropertyEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeDuplicateCommand(DuplicateElementsRequest request) {
-		Object targetContainer = request.getParameter("Target_Owner");
-		// additional element should be a set of elements that will be duplicated. If this is null, the request will be ignored.
-		if (!(targetContainer instanceof EObject)) {
-			return super.getBeforeDuplicateCommand(request);
-		}
-		Property propertyToBeDuplicated = getDuplicatedProperty(request);
-		if (propertyToBeDuplicated == null) {
-			return super.getBeforeDuplicateCommand(request);
-		}
-
-		Property newPart = (Property) request.getAllDuplicatedElementsMap().get(propertyToBeDuplicated);
-		if (newPart == null) {
-			Activator.log.debug("Trying to create a command for a new sysml property which has not been created yet");
-			return super.getBeforeDuplicateCommand(request);
-		}
-
-		// check association has not be duplicated yet
-		Association originalAssociation = propertyToBeDuplicated.getAssociation();
-		Association newAssociation = (Association) request.getAllDuplicatedElementsMap().get(originalAssociation);
-		if (newAssociation != null && newAssociation.equals(newPart.getAssociation())) {
-			return super.getBeforeDuplicateCommand(request);
-		}
-
-		TransactionalEditingDomain editingDomain = getEditingDomain(propertyToBeDuplicated);
-		if (editingDomain == null) {
-			return super.getBeforeDuplicateCommand(request);
-		}
-
-		Package targetPackage = getTargetContainer((EObject) targetContainer, propertyToBeDuplicated, newPart, request.getAllDuplicatedElementsMap());
-		return new DuplicatePapyrusAssociationCommand(editingDomain, "Duplicate Association", originalAssociation, request.getAllDuplicatedElementsMap(), targetPackage);
-	}
-
-	/**
-	 * Returns the duplicate Part or Reference.
-	 *
-	 * @param request
-	 *            the duplicate request for which we try to find the property
-	 * @return the found Property
-	 */
-	protected abstract Property getDuplicatedProperty(DuplicateElementsRequest request);
-
-	/**
-	 * Computes the target container for the new association
-	 *
-	 * @param targetContainer
-	 *            the target container of the association creation request
-	 * @param partToBeDuplicated
-	 *            the part which was duplicated
-	 * @param newPart
-	 *            the new part linked to the association
-	 * @param allDuplicatedElementsMap
-	 *            the map of all duplicated elements
-	 * @return the target {@link Package} for the new association or <code>null</code> if no package was found
-	 */
-	protected Package getTargetContainer(EObject targetContainer, Property partToBeDuplicated, Property newPart, Map allDuplicatedElementsMap) {
-
-		// 1. look if the new part has a nearest package
-		// 2. look if the part to be duplicated has a package which has a copy
-		// 3. if target container == package => this can be the place where the association could be placed
-		// 4. look for the nearest package of the target container
-
-		Package result = newPart.getNearestPackage();
-		if (result != null) {
-			return result;
-		}
-
-		Package originalPackage = partToBeDuplicated.getNearestPackage();
-		// look for its equivalent in the list of duplicated objects
-		Object o = allDuplicatedElementsMap.get(originalPackage);
-		if (o instanceof Package) {
-			return (Package) o;
-		}
-
-		if (targetContainer instanceof Package) {
-			return ((Package) targetContainer);
-		}
-
-		if (targetContainer instanceof Element) {
-			return ((Element) targetContainer).getNearestPackage();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the editing domain from an {@link EObject}
-	 *
-	 * @param eObject
-	 * @return
-	 */
-	protected TransactionalEditingDomain getEditingDomain(EObject eObject) {
-		EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(eObject);
-		if (editingDomain instanceof TransactionalEditingDomain) {
-			return (TransactionalEditingDomain) editingDomain;
-		}
-		return null;
-	}
-
-	/**
-	 * Command to duplicate an association and place it in a new container.
-	 */
-	public class DuplicatePapyrusAssociationCommand extends DuplicateEObjectsCommand {
-
-		/** association to be duplicated */
-		private final Association associationToDuplicate;
-
-		/** target container */
-		private final Package targetContainer;
-
-
-		/**
-		 * Constructs a new duplicate EObjects command with the specified label and
-		 * list of EObjects. Also sets the list of affected files to be the files,
-		 * where the targetContainer is stored. Target container specifies the
-		 * eObject into which the duplicated eObjects will be added.
-		 *
-		 * @param editingDomain
-		 *            the editing domain through which model changes are made
-		 * @param label
-		 *            The label for the new command.
-		 * @param originalAssociation
-		 *            <code>Association</code> to be duplicated.
-		 * @param allDuplicatedObjectsMap
-		 *            An empty map to be populated with the duplicated objects.
-		 * @param targetContainer
-		 *            target package
-		 */
-		public DuplicatePapyrusAssociationCommand(TransactionalEditingDomain editingDomain, String label, Association originalAssociation, Map allDuplicatedObjectsMap, Package targetContainer) {
-			super(editingDomain, label, Collections.singletonList(originalAssociation), allDuplicatedObjectsMap, targetContainer);
-			this.associationToDuplicate = originalAssociation;
-			this.targetContainer = targetContainer;
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-			// Remove elements whose container is getting copied.
-			// ClipboardSupportUtil.getCopyElements(getObjectsToBeDuplicated());
-
-			// Perform the copy and update the references.
-			EcoreUtil.Copier copier = new EcoreUtil.Copier();
-			copier.putAll(getAllDuplicatedObjectsMap());
-			copier.copy(associationToDuplicate);
-			copier.copyReferences();
-
-			Association newAssociation = (Association) copier.get(associationToDuplicate);
-			if (newAssociation == null) {
-				return CommandResult.newErrorCommandResult("Impossible to find the copied association");
-			}
-
-			// note: can be executed only if targetcontainer is instanceof package, this means that there is no need to tests for null targetContainer
-			newAssociation.setPackage(targetContainer);
-			String associationName = NamedElementHelper.getDefaultNameWithIncrementFromBase("Association", targetContainer.eContents()); //$NON-NLS-1$
-			newAssociation.setName(associationName);
-			return CommandResult.newOKCommandResult(getAllDuplicatedObjectsMap());
-		}
-
-		@Override
-		public boolean canExecute() {
-			// should add some tests here? no need to test containement feature like previous, Table has no owner...
-			return targetContainer instanceof Package;
-		}
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ActorPartPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ActorPartPropertyEditHelperAdvice.java
deleted file mode 100644
index 9aa9604a62b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ActorPartPropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,89 +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.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-
-/** SysML Property ActorPart edit helper advice */
-public class ActorPartPropertyEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * Check if the creation context is a {@link Block}.
-	 *
-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return true if the request is approved
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		boolean isApproved = super.approveRequest(request);
-
-		if ((request != null) && (request instanceof GetEditContextRequest)) {
-
-			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
-
-			// Test if the edit context is a Block
-			if (editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element) editContextRequest.getEditContext();
-
-				IElementMatcher matcher = new BlockMatcher();
-				if (!matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-			}
-		}
-
-		return isApproved;
-	}
-
-	/** Complete creation process by setting name and default aggregation */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property) request.getElementToConfigure();
-				if (element != null) {
-
-					// Set default name
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("actorPart", element.eContainer().eContents()); //$NON-NLS-1$
-					element.setName(initializedName);
-					// Initialize the aggregation to composite.
-					element.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java
deleted file mode 100644
index 32da3bb44dd..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.allocations.Allocate;
-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link Allocate} edit helper advice */
-public class AllocateEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public AllocateEditHelperAdvice() {
-		requiredProfiles.add(AllocationsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, AllocationsPackage.eINSTANCE.getAllocate());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(AllocationsPackage.eINSTANCE.getAllocate().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java
deleted file mode 100644
index a6008b5b1b8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java
+++ /dev/null
@@ -1,147 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import java.util.Arrays;
-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.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher;
-import org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.EMFUtil;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML Block edit helper advice */
-public class BlockEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public BlockEditHelperAdvice() {
-		requiredProfiles.add(BlocksPackage.eINSTANCE);
-	}
-
-	/**
-	 * Check if the creation context is allowed.
-	 *
-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return true if the request is approved
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		boolean isApproved = super.approveRequest(request);
-
-		if ((request != null) && (request instanceof GetEditContextRequest)) {
-
-			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
-
-			// Test context type
-			if (editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element) editContextRequest.getEditContext();
-
-				IElementMatcher matcher;
-
-				// Cannot create a nested Block in FlowSpecification
-				matcher = new FlowSpecificationMatcher();
-				if (matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-
-				// Cannot create a nested Block in Requirement
-				matcher = new RequirementMatcher();
-				if (matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-			}
-		}
-
-		return isApproved;
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getBlock());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(BlocksPackage.eINSTANCE.getBlock().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-
-	@Override
-	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {
-		// test if the creation is for a SysML association
-
-		IElementType type = request.getElementType();
-		if (hasSuperType(type, SysMLElementTypes.ASSOCIATION)) {
-			// test source and target...
-			EObject source = request.getSource();
-			// The source of an association cannot be read-only.
-			if (EMFUtil.isReadOnly(source)) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-
-		return super.getBeforeCreateRelationshipCommand(request);
-	}
-
-	protected boolean hasSuperType(IElementType elementType, IElementType typeToTest) {
-		if (elementType == null || typeToTest == null) {
-			return false;
-		}
-
-		if (elementType.equals(typeToTest)) {
-			return true;
-		}
-
-		List<IElementType> superTypes = Arrays.asList(elementType.getAllSuperTypes());
-		if (superTypes.contains(typeToTest)) {
-			return true;
-		}
-
-		return false;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java
deleted file mode 100644
index 40d5847d74a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.modelelements.Conform;
-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link Conform} edit helper advice */
-public class ConformEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public ConformEditHelperAdvice() {
-		requiredProfiles.add(ModelelementsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getConform());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(ModelelementsPackage.eINSTANCE.getConform().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java
deleted file mode 100644
index 784ac347e8d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java
+++ /dev/null
@@ -1,83 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link ConstraintBlock} edit helper advice */
-public class ConstraintBlockEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public ConstraintBlockEditHelperAdvice() {
-		requiredProfiles.add(ConstraintsPackage.eINSTANCE);
-	}
-
-	/**
-	 * Restriction on ConstraintBlock owned Structural and Behavioral features.
-	 *
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-
-		IElementType elementToCreate = request.getElementType();
-
-		if (UMLElementTypes.STRUCTURAL_FEATURE.getEClass().isSuperTypeOf(elementToCreate.getEClass())) {
-			if (elementToCreate != SysMLElementTypes.CONSTRAINT_PROPERTY && elementToCreate != UMLElementTypes.PROPERTY) {
-				return null;
-			}
-		}
-
-		return super.getBeforeCreateCommand(request);
-	}
-
-	/**
-	 * Complete creation process by applying the expected stereotype
-	 *
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ConstraintsPackage.eINSTANCE.getConstraintBlock());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(ConstraintsPackage.eINSTANCE.getConstraintBlock().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockPropertyEditHelperAdvice.java
deleted file mode 100644
index 02ae207ba55..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockPropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,106 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.sysml.blocks.ValueType;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/** Specific advice for Property creation owned by a {@link ConstraintBlock} */
-public class ConstraintBlockPropertyEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * Every {@link Property} created in the context of a {@link ConstraintBlock} is Composite.
-	 *
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property) request.getElementToConfigure();
-				if (element != null) {
-
-					Element owner = element.getOwner();
-					if (((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches(owner)) {
-						element.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-					}
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-
-
-	@Override
-	protected ICommand getBeforeSetCommand(SetRequest request) {
-		ICommand gmfCommand = super.getBeforeSetCommand(request);
-		EObject elementToEdit = request.getElementToEdit();
-		if (false == elementToEdit instanceof Property || request.getFeature() != UMLPackage.eINSTANCE.getTypedElement_Type()) {
-			return gmfCommand;
-		}
-		Property propertyToEdit = (Property) elementToEdit;
-		if (!isBlockOrValueTypeProperty(propertyToEdit)) {
-			return gmfCommand;
-		}
-		AggregationKind expectedAggregation = getExpectedAggregationKind(propertyToEdit.getType(), (Type) request.getValue(), propertyToEdit.getAggregation());
-		if (expectedAggregation == null) {
-			return gmfCommand;
-		}
-		EStructuralFeature feature = UMLPackage.eINSTANCE.getProperty_Aggregation();
-		SetRequest setRequest = new SetRequest(propertyToEdit, feature, expectedAggregation);
-		ICommand changeAggregationCommand = new SetValueCommand(setRequest);
-		return CompositeCommand.compose(gmfCommand, changeAggregationCommand);
-	}
-
-	private boolean isBlockOrValueTypeProperty(Property property) {
-		Element owner = property.getOwner();
-		return ((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(owner) || ((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(owner);
-	}
-
-	private boolean isValueType(Type value) {
-		return value instanceof DataType && UMLUtil.getStereotypeApplication(value, ValueType.class) != null;
-	}
-
-	private AggregationKind getExpectedAggregationKind(Type currentType, Type newType, AggregationKind currentAggregationKind) {
-		if (isValueType(currentType) && !isValueType(newType) && AggregationKind.COMPOSITE_LITERAL == currentAggregationKind) {
-			return AggregationKind.NONE_LITERAL;
-		}
-		if (!isValueType(currentType) && isValueType(newType)) {
-			return AggregationKind.COMPOSITE_LITERAL;
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintParameterEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintParameterEditHelperAdvice.java
deleted file mode 100644
index 54fc3b1d89a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintParameterEditHelperAdvice.java
+++ /dev/null
@@ -1,94 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-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.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Specific advice for Property creation owned by a {@link ConstraintBlock} ConstraintParameter are defined in ConstraintProperty but really owned by ConstraintBlock
- */
-public class ConstraintParameterEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	/** root name */
-	private static final String PARAMETER = "parameter";
-
-	@Override
-	public ICommand getBeforeEditCommand(IEditCommandRequest request) {
-		if (request instanceof ConfigureRequest) {
-			EObject elementToConfigure = ((ConfigureRequest) request).getElementToConfigure();
-			if (elementToConfigure != null && elementToConfigure instanceof Property) {
-				EObject container = elementToConfigure.eContainer();
-				if (container != null && container instanceof Property) {
-					Property constraintProperty = (Property) container;
-					if (UMLUtil.getStereotypeApplication(constraintProperty, ConstraintProperty.class) != null) {
-						Type type = constraintProperty.getType();
-						if (type != null && type instanceof Class && UMLUtil.getStereotypeApplication(type, ConstraintBlock.class) != null) {
-							((Class) type).getOwnedAttributes().add((Property) elementToConfigure);
-							((Property) elementToConfigure).setAggregation(AggregationKind.COMPOSITE_LITERAL);
-						}
-					}
-				}
-			}
-		}
-		return super.getBeforeEditCommand(request);
-	}
-
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-		// check this advice has to propose something. If element is not a constraint parameter, do not change the name
-		EObject p = request.getElementToConfigure();
-		if (p instanceof Property) {
-			// check this is a constraint parameter, not another kind of property
-			EObject container = ((Property) p).eContainer();
-			if (container != null && container instanceof Property) {
-				Property constraintProperty = (Property) container;
-				if (UMLUtil.getStereotypeApplication(constraintProperty, ConstraintProperty.class) != null) {
-					Type type = constraintProperty.getType();
-					if (type != null && type instanceof Class && UMLUtil.getStereotypeApplication(type, ConstraintBlock.class) != null) {
-						return new ConfigureElementCommand(request) {
-
-							@Override
-							protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-								NamedElement element = (NamedElement) request.getElementToConfigure();
-								if (element != null) {
-									// Set default name
-									// Initialize the element name based on the created IElementType
-									String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(PARAMETER, element.eContainer().eContents());
-									element.setName(initializedName);
-								}
-								return CommandResult.newOKCommandResult(element);
-							}
-						};
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java
deleted file mode 100644
index 2c58e048294..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,153 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-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.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link ConstraintProperty} edit helper advice */
-public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public ConstraintPropertyEditHelperAdvice() {
-		requiredProfiles.add(ConstraintsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ConstraintsPackage.eINSTANCE.getConstraintProperty());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(ConstraintsPackage.eINSTANCE.getConstraintProperty().getName().toLowerCase(), element.eContainer().eContents());
-					element.setName(initializedName);
-					// SysML constraint : self.ownedAttribute->forAll(p | p.type.oclIsKindOf(ConstraintBlock) implies p.aggregation = #composite)
-					if (element instanceof Property) {
-						((Property) element).setAggregation(AggregationKind.COMPOSITE_LITERAL);
-					}
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-
-	/**
-	 * Restrict allowed types to {@link ConstraintBlock}
-	 */
-	@Override
-	protected ICommand getBeforeSetCommand(SetRequest request) {
-
-		// Only allow ConstraintBlock or null as new type
-		if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
-			if (request.getValue() != null) {
-
-				if (!(request.getValue() instanceof Element)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-
-				ConstraintBlock constraint = UMLUtil.getStereotypeApplication((Element) request.getValue(), ConstraintBlock.class);
-				if (constraint == null) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Complete creation process by adding the related association.
-	 * This assumes the constraintProperty type has been set at this point.
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property sourcePart = (Property) request.getElementToConfigure();
-				if ((sourcePart != null) && (sourcePart.eContainer() != null)) {
-
-					sourcePart.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-
-					// Create association between element owner and element type
-					Type sourceType = resolveTypeContainer(sourcePart);
-					Package associationContainer = sourceType.getNearestPackage();
-
-					// Create targetProperty
-					Property targetProperty = UMLFactory.eINSTANCE.createProperty();
-					targetProperty.setType(sourceType);
-					targetProperty.setName(sourceType.getName() != null ? sourceType.getName().toLowerCase() : "null");
-
-					Association association = UMLFactory.eINSTANCE.createAssociation();
-					association.getMemberEnds().add(sourcePart);
-					association.getOwnedEnds().add(targetProperty);
-					association.getMemberEnds().add(targetProperty);
-
-					String associationName = NamedElementHelper.getDefaultNameWithIncrementFromBase("Association", associationContainer.eContents()); //$NON-NLS-1$
-					association.setName(associationName);
-
-					// Add SysML Nature on the new Association
-					ElementUtil.addNature(association, SysMLElementTypes.SYSML_NATURE);
-
-					association.setPackage(associationContainer);
-				}
-				return CommandResult.newOKCommandResult(sourcePart);
-			}
-
-			private Type resolveTypeContainer(Property property) {
-				EObject eContainer = property.eContainer();
-				if (eContainer instanceof Property) {
-					eContainer = ((Property) eContainer).getType();
-				}
-				if (eContainer instanceof Type) {
-					return (Type) eContainer;
-				}
-				return null;
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java.rej b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java.rej
deleted file mode 100644
index 3a19c611dae..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-@@ -116,7 +116,7 @@
- 					// Create targetProperty
- 					Property targetProperty = UMLFactory.eINSTANCE.createProperty();
- 					targetProperty.setType(sourceType);
--					targetProperty.setName(sourceType.getName().toLowerCase()); // all elements in UML must have a qualified name
-+					targetProperty.setName(sourceType.getName() != null ? sourceType.getName().toLowerCase() : "null");
- 
- 					Association association = UMLFactory.eINSTANCE.createAssociation();
- 					association.getMemberEnds().add(sourcePart);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java
deleted file mode 100644
index 04c26310b9b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.requirements.Copy;
-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link Copy} edit helper advice */
-public class CopyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public CopyEditHelperAdvice() {
-		requiredProfiles.add(RequirementsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getCopy());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(RequirementsPackage.eINSTANCE.getCopy().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java
deleted file mode 100644
index 71874152bf7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java
+++ /dev/null
@@ -1,58 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML DeriveReqt edit helper advice */
-public class DeriveReqtEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public DeriveReqtEditHelperAdvice() {
-		requiredProfiles.add(RequirementsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getDeriveReqt());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(RequirementsPackage.eINSTANCE.getDeriveReqt().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java
deleted file mode 100644
index 45e730f1f94..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java
+++ /dev/null
@@ -1,57 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import java.awt.Dimension;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link Dimension} edit helper advice */
-public class DimensionEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public DimensionEditHelperAdvice() {
-		requiredProfiles.add(BlocksPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getDimension());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(BlocksPackage.eINSTANCE.getDimension().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java
deleted file mode 100644
index 8decfb9c53d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java
+++ /dev/null
@@ -1,141 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.blocks.ValueType;
-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML FlowPort#InOut edit helper advice */
-public class FlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public FlowPortEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/**
-	 * Check if the creation context is a Block.
-	 *
-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return true if the request is approved
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		boolean isApproved = super.approveRequest(request);
-
-		if ((request != null) && (request instanceof GetEditContextRequest)) {
-
-			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
-
-			// Test if the edit context is a Block
-			if (editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element) editContextRequest.getEditContext();
-
-				IElementMatcher matcher = new BlockMatcher();
-				if (!matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-			}
-		}
-
-		return isApproved;
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-				Port port = (Port) request.getElementToConfigure();
-				if (port != null) {
-
-					// Apply FlowPort stereotype
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(port, PortandflowsPackage.eINSTANCE.getFlowPort());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(PortandflowsPackage.eINSTANCE.getFlowPort().getName().toLowerCase(), port.eContainer().eContents());
-					port.setName(initializedName);
-				}
-
-				return CommandResult.newOKCommandResult(port);
-			}
-		};
-	}
-
-	/**
-	 * Restrict allowed types to {@link Block}, {@link Signal}, {@link DataType}, {@link ValueType}, {@link FlowSpecification}
-	 */
-	@Override
-	protected ICommand getBeforeSetCommand(SetRequest request) {
-
-		// Only allow null, Block, Signal, DataType or ValueType as the new type
-		if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
-			if (request.getValue() != null) {
-
-				if (!(request.getValue() instanceof Element)) {
-					return UnexecutableCommand.INSTANCE; // Should not happen
-				}
-
-				Element value = (Element) request.getValue();
-				if ((value instanceof DataType) || (value instanceof Signal)) {
-					return null; // accept these types
-				}
-
-				ValueType valueType = UMLUtil.getStereotypeApplication(value, ValueType.class);
-				Block block = UMLUtil.getStereotypeApplication(value, Block.class);
-				FlowSpecification flowspecification = UMLUtil.getStereotypeApplication(value, FlowSpecification.class);
-
-				if ((block != null) || (valueType != null) || (flowspecification != null)) {
-					return null; // accept these types
-				}
-
-				return UnexecutableCommand.INSTANCE; // forbid other types
-			}
-		}
-
-		return null;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java
deleted file mode 100644
index 6450c43b05f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java
+++ /dev/null
@@ -1,58 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/** SysML FlowPort#In edit helper advice */
-public class FlowPortInEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public FlowPortInEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-				Port port = (Port) request.getElementToConfigure();
-				FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);
-				if (flowPort != null) {
-					flowPort.setDirection(FlowDirection.IN);
-				}
-
-				return CommandResult.newOKCommandResult(port);
-			}
-		};
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java
deleted file mode 100644
index 78bc0dd262c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java
+++ /dev/null
@@ -1,57 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/** SysML FlowPort#InOut edit helper advice */
-public class FlowPortInOutEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public FlowPortInOutEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-				Port port = (Port) request.getElementToConfigure();
-				FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);
-				if (flowPort != null) {
-					flowPort.setDirection(FlowDirection.INOUT);
-				}
-
-				return CommandResult.newOKCommandResult(port);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java
deleted file mode 100644
index 72db9e0b489..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java
+++ /dev/null
@@ -1,60 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/** SysML FlowPort#In edit helper advice */
-public class FlowPortNAEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public FlowPortNAEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/** Verify that the new FlowPort is typed by a FlowSpecification */
-	@Override
-	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-				Port port = (Port) request.getElementToConfigure();
-
-				// Ensure the type is a FlowSpecification
-				if ((port != null) && (port.getType() != null)) {
-					if (UMLUtil.getStereotypeApplication(port.getType(), FlowSpecification.class) != null) {
-						return CommandResult.newOKCommandResult(port);
-					}
-				}
-
-				return CommandResult.newCancelledCommandResult();
-			}
-		};
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java
deleted file mode 100644
index 8efd45f3903..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java
+++ /dev/null
@@ -1,57 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/** SysML FlowPort#Out edit helper advice */
-public class FlowPortOutEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public FlowPortOutEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-
-				Port port = (Port) request.getElementToConfigure();
-				FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);
-				if (flowPort != null) {
-					flowPort.setDirection(FlowDirection.OUT);
-				}
-
-				return CommandResult.newOKCommandResult(port);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java
deleted file mode 100644
index 8b3b54faafd..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,137 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.blocks.ValueType;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;
-import org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML FlowProperty edit helper advice */
-public class FlowPropertyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public FlowPropertyEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/**
-	 * Check if the creation context is a FlowSpecification.
-	 *
-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return true if the request is approved
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		boolean isApproved = super.approveRequest(request);
-
-		if ((request != null) && (request instanceof GetEditContextRequest)) {
-
-			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
-
-			// Test if the edit context is a FlowSpecification
-			if (editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element) editContextRequest.getEditContext();
-
-				IElementMatcher matcher = new FlowSpecificationMatcher();
-				IElementMatcher blockMatcher = new BlockMatcher();
-				if (!matcher.matches(contextElement) && !blockMatcher.matches(contextElement)) {
-					isApproved = false;
-				}
-			}
-		}
-
-		return isApproved;
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, PortandflowsPackage.eINSTANCE.getFlowProperty());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(PortandflowsPackage.eINSTANCE.getFlowProperty().getName().toLowerCase(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-
-	/**
-	 * Restrict allowed types to {@link Block}, {@link Signal}, {@link DataType}, {@link ValueType}
-	 */
-	@Override
-	protected ICommand getBeforeSetCommand(SetRequest request) {
-
-		// Only allow null, FlowSpecification, Block, Signal, DataType or ValueType as new type.
-		if (UMLPackage.eINSTANCE.getTypedElement_Type().equals(request.getFeature())) {
-			if (request.getValue() != null) {
-
-				if (!(request.getValue() instanceof Element)) {
-					return UnexecutableCommand.INSTANCE; // Should not happen
-				}
-
-				Element value = (Element) request.getValue();
-				if ((value instanceof DataType) || (value instanceof Signal)) {
-					return null; // accept these types
-				}
-
-				ValueType valueType = UMLUtil.getStereotypeApplication(value, ValueType.class);
-				Block block = UMLUtil.getStereotypeApplication(value, Block.class);
-
-				if ((block != null) || (valueType != null)) {
-					return null; // accept these types
-				}
-
-				return UnexecutableCommand.INSTANCE; // forbid other types
-			}
-		}
-
-		return null;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java
deleted file mode 100644
index 155146bb616..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java
+++ /dev/null
@@ -1,139 +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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import java.util.Arrays;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher;
-import org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML FlowSpecification edit helper advice */
-public class FlowSpecificationEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public FlowSpecificationEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/**
-	 * FlowSpecification owned feature restrictions :
-	 * [1] Flow specifications cannot own operations or receptions (they can only own FlowProperties).
-	 * [2] Every “ownedAttribute” of a FlowSpecification must be a FlowProperty.
-	 */
-	@Override
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-
-		IElementType elementToCreate = request.getElementType();
-
-		// [1] Flow specifications cannot own operations or receptions (they can only own FlowProperties).
-		if (elementToCreate == UMLElementTypes.OPERATION) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		if (elementToCreate == UMLElementTypes.RECEPTION) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-		// [2] Every “ownedAttribute” of a FlowSpecification must be a FlowProperty.
-		if (UMLElementTypes.PROPERTY.getEClass().isSuperTypeOf(elementToCreate.getEClass())) {
-			if ((elementToCreate != SysMLElementTypes.FLOW_PROPERTY) && !(Arrays.asList(elementToCreate.getAllSuperTypes()).contains(SysMLElementTypes.FLOW_PROPERTY))) {
-				return UnexecutableCommand.INSTANCE;
-			}
-		}
-
-		return super.getBeforeCreateCommand(request);
-	}
-
-	/**
-	 * Check if the creation context is allowed.
-	 *
-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return true if the request is approved
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		boolean isApproved = super.approveRequest(request);
-
-		if ((request != null) && (request instanceof GetEditContextRequest)) {
-
-			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
-
-			// Test context type
-			if (editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element) editContextRequest.getEditContext();
-
-				IElementMatcher matcher;
-
-				// Cannot create a nested FlowSpecification in FlowSpecification
-				matcher = new FlowSpecificationMatcher();
-				if (matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-
-				// Cannot create a nested FlowSpecification in Requirement
-				matcher = new RequirementMatcher();
-				if (matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-			}
-		}
-
-		return isApproved;
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, PortandflowsPackage.eINSTANCE.getFlowSpecification());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(PortandflowsPackage.eINSTANCE.getFlowSpecification().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java
deleted file mode 100644
index f4ebfdf4168..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.portandflows.ItemFlow;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link ItemFlow} edit helper advice */
-public class ItemFlowEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public ItemFlowEditHelperAdvice() {
-		requiredProfiles.add(PortandflowsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				NamedElement element = (NamedElement) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, PortandflowsPackage.eINSTANCE.getItemFlow());
-
-					// Set default name
-					// Initialize the element name based on the created IElementType
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(PortandflowsPackage.eINSTANCE.getItemFlow().getName(), element.eContainer().eContents());
-					element.setName(initializedName);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
deleted file mode 100644
index eb1b474d965..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,162 +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:
- *
- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-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.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;
-import org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher;
-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/** SysML Property Part edit helper advice */
-public class PartPropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvice {
-
-	/**
-	 * Check if the creation context is a {@link Block}.
-	 *
-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return true if the request is approved
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		boolean isApproved = super.approveRequest(request);
-
-		if ((request != null) && (request instanceof GetEditContextRequest)) {
-
-			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
-
-			// Test if the edit context is a Block
-			if (editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element) editContextRequest.getEditContext();
-
-				IElementMatcher matcher = new BlockMatcher();
-				if (!matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-			}
-		}
-
-		return isApproved;
-	}
-
-	/** Complete creation process by setting name and default aggregation */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property) request.getElementToConfigure();
-				if (element != null) {
-
-					// Set default name
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("part", element.eContainer().eContents()); //$NON-NLS-1$
-					element.setName(initializedName);
-					// Initialize the aggregation to composite.
-					element.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-
-	/**
-	 * Complete creation process by adding the related association.
-	 * This assumes the part type has been set at this point.
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property sourcePart = (Property) request.getElementToConfigure();
-				if ((sourcePart != null) && (sourcePart.getType() != null)) {
-
-					// Create association between element owner and element type
-					Type sourceType = sourcePart.getClass_();
-					// Type targetType = sourcePart.getType();
-					Package associationContainer = sourceType.getNearestPackage();
-
-					// Create targetProperty
-					Property targetProperty = UMLFactory.eINSTANCE.createProperty();
-					targetProperty.setType(sourceType);
-					targetProperty.setName(sourceType.getName() != null ? sourceType.getName().toLowerCase() : "null");
-
-					Association association = UMLFactory.eINSTANCE.createAssociation();
-					association.getMemberEnds().add(sourcePart);
-					association.getOwnedEnds().add(targetProperty);
-					association.getMemberEnds().add(targetProperty);
-
-					String associationName = NamedElementHelper.getDefaultNameWithIncrementFromBase("Association", associationContainer.eContents()); //$NON-NLS-1$
-					association.setName(associationName);
-
-					// Add SysML Nature on the new Association
-					ElementUtil.addNature(association, SysMLElementTypes.SYSML_NATURE);
-
-					association.setPackage(associationContainer);
-				}
-				return CommandResult.newOKCommandResult(sourcePart);
-			}
-		};
-	}
-
-	/**
-	 * Returns the Part to be duplicated
-	 *
-	 * @return the Part to be duplicated or <code>null</code> if this is not a part
-	 */
-	@Override
-	protected Property getDuplicatedProperty(DuplicateElementsRequest request) {
-		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();
-		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
-			return null;
-		}
-		Object firstElement = elementsToBeDuplicated.get(0); // there should be only one element here
-		if (!(firstElement instanceof Property)) {
-			return null;
-		}
-		PartPropertyMatcher matcher = new PartPropertyMatcher();
-		return matcher.matches((Property) firstElement) ? (Property) firstElement : null;
-	}
-
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java
deleted file mode 100644
index f926187349f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java
+++ /dev/null
@@ -1,50 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
-import org.eclipse.papyrus.sysml.modelelements.Problem;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link Problem} edit helper advice */
-public class ProblemEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public ProblemEditHelperAdvice() {
-		requiredProfiles.add(ModelelementsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Element element = (Element) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getProblem());
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java
deleted file mode 100644
index b616439bead..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java
+++ /dev/null
@@ -1,50 +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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
-import org.eclipse.papyrus.sysml.modelelements.Rationale;
-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-
-/** SysML {@link Rationale} edit helper advice */
-public class RationaleEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {
-
-	/** Default constructor */
-	public RationaleEditHelperAdvice() {
-		requiredProfiles.add(ModelelementsPackage.eINSTANCE);
-	}
-
-	/** Complete creation process by applying the expected stereotype */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Element element = (Element) request.getElementToConfigure();
-				if (element != null) {
-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getRationale());
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
deleted file mode 100644
index 70bf740d259..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,158 +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:
- *
- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.helper;
-
-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.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;
-import org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher;
-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;
-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/** SysML Property Reference edit helper advice */
-public class ReferencePropertyEditHelperAdvice extends AbstractPropertyEditHelperAdvice {
-
-	/**
-	 * Check if the creation context is a {@link Block}.
-	 *
-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return true if the request is approved
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		boolean isApproved = super.approveRequest(request);
-
-		if ((request != null) && (request instanceof GetEditContextRequest)) {
-
-			// Retrieve the edit context from request
-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;
-
-			// Test if the edit context is a Block
-			if (editContextRequest.getEditContext() instanceof Element) {
-				Element contextElement = (Element) editContextRequest.getEditContext();
-
-				IElementMatcher matcher = new BlockMatcher();
-				if (!matcher.matches(contextElement)) {
-					isApproved = false;
-				}
-			}
-		}
-
-		return isApproved;
-	}
-
-	/** Complete creation process by setting name and default aggregation */
-	@Override
-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property element = (Property) request.getElementToConfigure();
-				if (element != null) {
-
-					// Set default name
-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("reference", element.eContainer().eContents());
-					element.setName(initializedName);
-					// Force the aggregation to NONE.
-					element.setAggregation(AggregationKind.NONE_LITERAL);
-				}
-				return CommandResult.newOKCommandResult(element);
-			}
-		};
-	}
-
-	/**
-	 * Complete creation process by adding the related association.
-	 * This assumes the part type has been set at this point.
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
-
-		return new ConfigureElementCommand(request) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				Property sourcePart = (Property) request.getElementToConfigure();
-				if ((sourcePart != null) && (sourcePart.getType() != null)) {
-
-					// Create association between element owner and element type
-					Type sourceType = sourcePart.getClass_();
-					// Type targetType = sourcePart.getType();
-					Package associationContainer = sourceType.getNearestPackage();
-
-					// Create targetProperty
-					Property targetProperty = UMLFactory.eINSTANCE.createProperty();
-					targetProperty.setType(sourceType);
-					targetProperty.setName(sourceType.getName() != null ? sourceType.getName().toLowerCase() : "null");
-
-					Association association = UMLFactory.eINSTANCE.createAssociation();
-					association.getMemberEnds().add(sourcePart);
-					association.getOwnedEnds().add(targetProperty);
-					association.getMemberEnds().add(targetProperty);
-
-					String associationName = NamedElementHelper.getDefaultNameWithIncrementFromBase("Association", associationContainer.eContents());
-					association.setName(associationName);
-
-					// Add SysML Nature on the new Association
-					ElementUtil.addNature(association, SysMLElementTypes.SYSML_NATURE);
-
-					association.setPackage(associationContainer);
-				}
-				return CommandResult.newOKCommandResult(sourcePart);
-			}
-		};
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Property getDuplicatedProperty(DuplicateElementsRequest request) {
-		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();
-		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
-			return null;
-		}
-		Object firstElement = elementsToBeDuplicated.get(0); // there should be only one element here
-		if (!(firstElement instanceof Property)) {
-			return null;
-		}
-		ReferencePropertyMatcher matcher = new ReferencePropertyMatcher();
-		return matcher.matches((Property) firstElement) ? (Property) firstElement : null;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java
deleted file mode 100644
index 27d9ce83dfa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java
+++ /dev/null
@@ -1,97 +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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher;

-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/** SysML Requirement edit helper advice */

-public class RequirementEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public RequirementEditHelperAdvice() {

-		requiredProfiles.add(RequirementsPackage.eINSTANCE);

-	}

-

-	/**

-	 * Check if the creation context is allowed.

-	 *

-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param request

-	 * @return true if the request is approved

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		boolean isApproved = super.approveRequest(request);

-

-		if ((request != null) && (request instanceof GetEditContextRequest)) {

-

-			// Retrieve the edit context from request

-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;

-

-			// Test context type

-			if (editContextRequest.getEditContext() instanceof Element) {

-				Element contextElement = (Element) editContextRequest.getEditContext();

-

-				IElementMatcher matcher;

-

-				// Cannot create a nested requirement in FlowSpecification

-				matcher = new FlowSpecificationMatcher();

-				if (matcher.matches(contextElement)) {

-					isApproved = false;

-				}

-			}

-		}

-

-		return isApproved;

-	}

-

-	/** Complete creation process by applying the expected stereotype */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement) request.getElementToConfigure();

-				if (element != null) {

-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getRequirement());

-

-					// Set default name

-					// Initialize the element name based on the created IElementType

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(RequirementsPackage.eINSTANCE.getRequirement().getName(), element.eContainer().eContents());

-					element.setName(initializedName);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java
deleted file mode 100644
index ff0ffb82ed6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java
+++ /dev/null
@@ -1,59 +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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/** SysML {@link Satisfy} edit helper advice */

-public class SatisfyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public SatisfyEditHelperAdvice() {

-		requiredProfiles.add(RequirementsPackage.eINSTANCE);

-	}

-

-	/** Complete creation process by applying the expected stereotype */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement) request.getElementToConfigure();

-				if (element != null) {

-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getSatisfy());

-

-					// Set default name

-					// Initialize the element name based on the created IElementType

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(RequirementsPackage.eINSTANCE.getSatisfy().getName(), element.eContainer().eContents());

-					element.setName(initializedName);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java
deleted file mode 100644
index 0042fa06b2d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/** SysML {@link Unit} edit helper advice */

-public class UnitEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public UnitEditHelperAdvice() {

-		requiredProfiles.add(BlocksPackage.eINSTANCE);

-	}

-

-	/** Complete creation process by applying the expected stereotype */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement) request.getElementToConfigure();

-				if (element != null) {

-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getUnit());

-

-					// Set default name

-					// Initialize the element name based on the created IElementType

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(BlocksPackage.eINSTANCE.getUnit().getName(), element.eContainer().eContents());

-					element.setName(initializedName);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
deleted file mode 100644
index 257af7fdc6c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,90 +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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.AggregationKind;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-

-/** SysML Property Value edit helper advice */

-public class ValuePropertyEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * Check if the creation context is a {@link Block}.

-	 *

-	 * @see org.eclipse.papyrus.sysml.service.types.helper.AbstractStereotypedElementEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param request

-	 * @return true if the request is approved

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		boolean isApproved = super.approveRequest(request);

-

-		if ((request != null) && (request instanceof GetEditContextRequest)) {

-

-			// Retrieve the edit context from request

-			GetEditContextRequest editContextRequest = (GetEditContextRequest) request;

-

-			// Test if the edit context is a Block

-			if (editContextRequest.getEditContext() instanceof Element) {

-				Element contextElement = (Element) editContextRequest.getEditContext();

-

-				IElementMatcher matcher = new BlockMatcher();

-				if (!matcher.matches(contextElement)) {

-					isApproved = false;

-				}

-			}

-		}

-

-		return isApproved;

-	}

-

-	/** Complete creation process by setting name and default aggregation */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				Property element = (Property) request.getElementToConfigure();

-				if (element != null) {

-

-					// Set default name

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase("value", element.eContainer().eContents());

-					element.setName(initializedName);

-

-					// Initialize the aggregation to composite.

-					element.setAggregation(AggregationKind.COMPOSITE_LITERAL);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java
deleted file mode 100644
index 2105d0ded29..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/** SysML {@link ValueType} edit helper advice */

-public class ValueTypeEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public ValueTypeEditHelperAdvice() {

-		requiredProfiles.add(BlocksPackage.eINSTANCE);

-	}

-

-	/** Complete creation process by applying the expected stereotype */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement) request.getElementToConfigure();

-				if (element != null) {

-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, BlocksPackage.eINSTANCE.getValueType());

-

-					// Set default name

-					// Initialize the element name based on the created IElementType

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(BlocksPackage.eINSTANCE.getValueType().getName(), element.eContainer().eContents());

-					element.setName(initializedName);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java
deleted file mode 100644
index ea146ac64d8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java
+++ /dev/null
@@ -1,59 +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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/** SysML {@link Verify} edit helper advice */

-public class VerifyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public VerifyEditHelperAdvice() {

-		requiredProfiles.add(RequirementsPackage.eINSTANCE);

-	}

-

-	/** Complete creation process by applying the expected stereotype */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement) request.getElementToConfigure();

-				if (element != null) {

-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, RequirementsPackage.eINSTANCE.getVerify());

-

-					// Set default name

-					// Initialize the element name based on the created IElementType

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(RequirementsPackage.eINSTANCE.getVerify().getName(), element.eContainer().eContents());

-					element.setName(initializedName);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java
deleted file mode 100644
index 1bfeb9fa5bf..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java
+++ /dev/null
@@ -1,57 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import javax.swing.text.View;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/** SysML {@link View} edit helper advice */

-public class ViewEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public ViewEditHelperAdvice() {

-		requiredProfiles.add(ModelelementsPackage.eINSTANCE);

-	}

-

-	/** Complete creation process by applying the expected stereotype */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement) request.getElementToConfigure();

-				if (element != null) {

-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getView());

-

-					// Set default name

-					// Initialize the element name based on the created IElementType

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(ModelelementsPackage.eINSTANCE.getView().getName(), element.eContainer().eContents());

-					element.setName(initializedName);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java
deleted file mode 100644
index 19bf9f213fa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/** SysML {@link ViewPoint} edit helper advice */

-public class ViewPointEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public ViewPointEditHelperAdvice() {

-		requiredProfiles.add(ModelelementsPackage.eINSTANCE);

-	}

-

-	/** Complete creation process by applying the expected stereotype */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				NamedElement element = (NamedElement) request.getElementToConfigure();

-				if (element != null) {

-					StereotypeApplicationHelper.INSTANCE.applyStereotype(element, ModelelementsPackage.eINSTANCE.getViewPoint());

-

-					// Set default name

-					// Initialize the element name based on the created IElementType

-					String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(ModelelementsPackage.eINSTANCE.getViewPoint().getName(), element.eContainer().eContents());

-					element.setName(initializedName);

-				}

-				return CommandResult.newOKCommandResult(element);

-			}

-		};

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ActorEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ActorEditHelperAdvice.java
deleted file mode 100644
index 8e8733a3543..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ActorEditHelperAdvice.java
+++ /dev/null
@@ -1,70 +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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.uml2.uml.Actor;

-import org.eclipse.uml2.uml.Association;

-

-

-/**

- * Advice to restrict {@link Association} creation in SysML

- */

-public class ActorEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * In case of {@link Association} creation, it should not be possible to have an {@link Actor} as source.

-	 */

-	@Override

-	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

-		IElementType type = request.getElementType();

-		if (SysMLElementTypes.ASSOCIATION.equals(type)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		if (type != null) {

-			List<IElementType> superTypes = Arrays.asList(type.getAllSuperTypes());

-			if (superTypes.contains(SysMLElementTypes.ASSOCIATION)) {

-				return UnexecutableCommand.INSTANCE;

-			}

-

-		}

-		return super.getBeforeCreateRelationshipCommand(request);

-	}

-

-	protected boolean hasSuperType(IElementType elementType, IElementType typeToTest) {

-		if (elementType == null || typeToTest == null) {

-			return false;

-		}

-

-		if (elementType.equals(typeToTest)) {

-			return true;

-		}

-

-		List<IElementType> superTypes = Arrays.asList(elementType.getAllSuperTypes());

-		if (superTypes.contains(typeToTest)) {

-			return true;

-		}

-

-		return false;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
deleted file mode 100644
index 44ac7888989..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * Edit helper advice for {@link Association} with "aggregation = composition" (used for creation purpose only).

- */

-public class AssociationCompositeDirectedEditHelperAdvice extends AssociationCompositeEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * The currently created {@link Association} is Composite (manage by super class), and directed

-	 * (meaning navigable in one direction only) which in SysML means the target end is owned by the association itself.

-	 *

-	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected void addTargetInModel(Property targetEnd, Classifier owner, Type sourceType, Association association) {

-		association.getOwnedEnds().add(targetEnd);

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
deleted file mode 100644
index 0dcd6e65d72..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * Edit helper advice for {@link Association} with "aggregation = composition" and navigable in one way (used for creation purpose only).

- */

-public class AssociationCompositeEditHelperAdvice extends AssociationNoneEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * The currently created {@link Association} is Composite (manage by super class):

-	 * 		it source {@link Property} aggregation is set to Composite kind.

-	 *

-	 * The currently created {@link Association} is bidirectional (navigable in both directions):

-	 * 		it source and target {@link Property} are owned by the {@link Classifier} (target and source end types),

-	 * 		this is handled by the super class.

-	 * </pre>

-	 */

-	@Override

-	protected void configureSourceProperty(Property sourceProperty) {

-		sourceProperty.setIsComposite(true);

-	}

-}
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
deleted file mode 100644
index 0ece0a73eef..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationEditHelperAdvice.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011-2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;

-import org.eclipse.papyrus.uml.service.types.utils.RequestParameterUtils;

-import org.eclipse.papyrus.uml.tools.databinding.OwnedAttributeHelper;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/** Association edit helper advice */

-public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * avoid creation of association on another association

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

-		IElementType type = request.getElementType();

-		if (SysMLElementTypes.ASSOCIATION.equals(type)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		if (type != null) {

-			List<IElementType> superTypes = Arrays.asList(type.getAllSuperTypes());

-			if (superTypes.contains(SysMLElementTypes.ASSOCIATION)) {

-				return UnexecutableCommand.INSTANCE;

-			}

-

-		}

-

-		return super.getBeforeCreateRelationshipCommand(request);

-	}

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * Add a command to destroy {@link Association} when only 1 end remains.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected ICommand getBeforeDestroyReferenceCommand(DestroyReferenceRequest request) {

-		ICommand gmfCommand = super.getBeforeDestroyReferenceCommand(request);

-

-		Association association = (Association) request.getContainer();

-		if ((request.getContainingFeature() == UMLPackage.eINSTANCE.getAssociation_MemberEnd()) && (association.getMemberEnds().contains(request.getReferencedObject()))) {

-			Set<Property> ends = new HashSet<Property>();

-			ends.addAll(association.getMemberEnds());

-			ends.remove(request.getReferencedObject());

-

-			if (ends.size() <= 2) {

-

-				DestroyElementRequest destroyRequest = new DestroyElementRequest(association, false);

-				IElementEditService provider = ElementEditServiceUtils.getCommandProvider(association);

-				if (provider != null) {

-					ICommand destroyCommand = provider.getEditCommand(destroyRequest);

-					gmfCommand = CompositeCommand.compose(gmfCommand, destroyCommand);

-				}

-

-			}

-		}

-

-		return gmfCommand;

-	}

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * Add SysML Nature on the {@link Association}.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-

-		final Association association = (Association) request.getElementToConfigure();

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-				// Add SysML Nature on the new Association

-				ElementUtil.addNature(association, SysMLElementTypes.SYSML_NATURE);

-

-				return CommandResult.newOKCommandResult(association);

-			}

-		};

-	}

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * Add a command to destroy {@link Association} ends referenced by the {@link Association}

-	 * to delete.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest req) {

-		List<EObject> dependentsToDestroy = new ArrayList<EObject>();

-

-		List<EObject> dependentsToKeep = (RequestParameterUtils.getDependentsToKeep(req) != null) ? RequestParameterUtils.getDependentsToKeep(req) : new ArrayList<EObject>();

-

-		Association association = (Association) req.getElementToDestroy();

-		for (Property end : association.getMemberEnds()) {

-			if (!dependentsToKeep.contains(end)) {

-				dependentsToDestroy.add(end);

-			}

-		}

-

-		// Return command to destroy dependents ends

-		if (!dependentsToDestroy.isEmpty()) {

-			return req.getDestroyDependentsCommand(dependentsToDestroy);

-		}

-

-		return super.getBeforeDestroyDependentsCommand(req);

-	}

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * Add a command to related association end during re-orient.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected ICommand getBeforeReorientRelationshipCommand(ReorientRelationshipRequest request) {

-

-		ICommand gmfCommand = super.getBeforeReorientRelationshipCommand(request);

-

-		MoveRequest moveRequest = null;

-		SetRequest setTypeRequest = null;

-

-		// Retrieve re-oriented association and add it to the list of re-factored elements

-		Association association = (Association) request.getRelationship();

-		List<EObject> currentlyRefactoredElements = (RequestParameterUtils.getAssociationRefactoredElements(request) != null) ? RequestParameterUtils.getAssociationRefactoredElements(request) : new ArrayList<EObject>();

-

-		if (currentlyRefactoredElements.contains(association)) {

-			// Abort - already treated

-			return null;

-

-		} else {

-			RequestParameterUtils.addAssociationRefactoredElement(request, association);

-		}

-

-		// not possible to have an association on another association, so reorient is forbidden here

-		if (request.getNewRelationshipEnd() instanceof Association) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Retrieve property ends of the Association (assumed to be binary)

-		Property semanticSource = association.getMemberEnds().get(0);

-		Property semanticTarget = association.getMemberEnds().get(1);

-

-		EObject modifiedPropertyType = null;

-

-

-		if (request.getDirection() == ReorientRequest.REORIENT_SOURCE) {

-			if (!association.getOwnedEnds().contains(semanticSource)) {

-				moveRequest = new MoveRequest(request.getNewRelationshipEnd(), semanticSource);

-			}

-

-			modifiedPropertyType = semanticTarget;

-			setTypeRequest = new SetRequest(modifiedPropertyType, UMLPackage.eINSTANCE.getTypedElement_Type(), request.getNewRelationshipEnd());

-		}

-

-		if (request.getDirection() == ReorientRequest.REORIENT_TARGET) {

-			if (!association.getOwnedEnds().contains(semanticTarget)) {

-				moveRequest = new MoveRequest(request.getNewRelationshipEnd(), semanticTarget);

-			}

-

-			modifiedPropertyType = semanticSource;

-			setTypeRequest = new SetRequest(modifiedPropertyType, UMLPackage.eINSTANCE.getTypedElement_Type(), request.getNewRelationshipEnd());

-		}

-

-		if (moveRequest != null) {

-			// Propagate parameters to the move request

-			moveRequest.addParameters(request.getParameters());

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getNewRelationshipEnd());

-			if (provider != null) {

-				ICommand moveCommand = provider.getEditCommand(moveRequest);

-				gmfCommand = CompositeCommand.compose(gmfCommand, moveCommand);

-			}

-		}

-

-		if (setTypeRequest != null) {

-			// Propagate parameters to the set request

-			setTypeRequest.addParameters(request.getParameters());

-

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(modifiedPropertyType);

-			if (provider != null) {

-				ICommand setTypeCommand = provider.getEditCommand(setTypeRequest);

-				gmfCommand = CompositeCommand.compose(gmfCommand, setTypeCommand);

-			}

-		}

-

-		// Destroy inconsistent views of the association

-		Set<View> viewsToDestroy = new HashSet<View>();

-		viewsToDestroy.addAll(getViewsToDestroy(association, request));

-

-		// return the command to destroy all these views

-		if (!viewsToDestroy.isEmpty()) {

-			DestroyDependentsRequest ddr = new DestroyDependentsRequest(request.getEditingDomain(), request.getRelationship(), false);

-			ddr.setClientContext(request.getClientContext());

-			ddr.addParameters(request.getParameters());

-			ICommand destroyViewsCommand = ddr.getDestroyDependentsCommand(viewsToDestroy);

-			gmfCommand = CompositeCommand.compose(gmfCommand, destroyViewsCommand);

-		}

-

-		if (gmfCommand != null) {

-			gmfCommand.reduce();

-		}

-		return gmfCommand;

-	}

-

-	/**

-	 * Returns all views referencing Association except the view currently re-oriented.

-	 *

-	 * @param association

-	 *            the association referenced by views

-	 * @param request

-	 *            the re-orient relationship request

-	 * @return the list of views to be destroy

-	 */

-	private Set<View> getViewsToDestroy(Association association, ReorientRelationshipRequest request) {

-		Set<View> viewsToDestroy = new HashSet<View>();

-

-		// Find all views representing the Associations

-		EReference[] refs = new EReference[] { NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> associationViews = EMFCoreUtil.getReferencers(association, refs);

-

-		View currentlyReorientedView = RequestParameterUtils.getReconnectedEdge(request);

-		viewsToDestroy.addAll(associationViews);

-		viewsToDestroy.remove(currentlyReorientedView);

-

-		return viewsToDestroy;

-	}

-

-	/**

-	 * Change owners for navigable OwnedEnd in association. For SysML diagrams only.

-	 * Bug 364066

-	 */

-	@Override

-	protected ICommand getAfterSetCommand(SetRequest request) {

-		if (request.getElementToEdit() instanceof Association) {

-			Association association = (Association) request.getElementToEdit();

-			if (request.getFeature() == UMLPackage.eINSTANCE.getAssociation_NavigableOwnedEnd()) {

-				return changeAllNavigableElementsOwners((List<?>) request.getValue(), association);

-			}

-		}

-		return super.getAfterSetCommand(request);

-	}

-

-	private ICommand changeAllNavigableElementsOwners(List<?> members, Association association) {

-		if (members.isEmpty()) {

-			return null;

-		}

-

-		CompositeCommand cc = new CompositeCommand("Change association's properties owners"); //$NON-NLS-1$

-		for (Object member : members) {

-			if (member instanceof Property) {

-				cc.add(OwnedAttributeHelper.getSetTypeOwnerForAssociationAttributeCommand(association, (Property)member));

-			}

-		}

-		return cc.isEmpty() ? null : cc.reduce();

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneDirectedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneDirectedEditHelperAdvice.java
deleted file mode 100644
index 24105859531..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneDirectedEditHelperAdvice.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * Edit helper advice for {@link Association} with "aggregation = none" and navigable in one way (used for creation purpose only).

- */

-public class AssociationNoneDirectedEditHelperAdvice extends AssociationNoneEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * The currently created {@link Association} in the default case (aggregation = none), and directed

-	 * (meaning navigable in one direction only) which in SysML means the target end is owned by the association itself.

-	 *

-	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected void addTargetInModel(Property targetEnd, Classifier owner, Type sourceType, Association association) {

-		association.getOwnedEnds().add(targetEnd);

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneEditHelperAdvice.java
deleted file mode 100644
index 8ec34742041..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationNoneEditHelperAdvice.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011-2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.Activator;

-import org.eclipse.papyrus.uml.service.types.utils.ClassifierUtils;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * Edit helper advice for {@link Association} with "aggregation = none" (used for creation purpose only).

- */

-public class AssociationNoneEditHelperAdvice extends AssociationEditHelperAdvice {

-

-	/**

-	 * This method provides the source type provided as {@link ConfigureRequest} parameter.

-	 *

-	 * @return the target role

-	 */

-	protected Classifier getSourceOwnerType(ConfigureRequest req) {

-		Classifier result = null;

-		Object paramObject = req.getParameter(CreateRelationshipRequest.SOURCE);

-		if (paramObject instanceof Classifier) {

-			result = (Classifier) paramObject;

-		}

-

-		return result;

-	}

-

-	/**

-	 * This method provides the target type provided as {@link ConfigureRequest} parameter.

-	 *

-	 * @return the target role

-	 */

-	protected Classifier getTargetOwnerType(ConfigureRequest req) {

-		Classifier result = null;

-		Object paramObject = req.getParameter(CreateRelationshipRequest.TARGET);

-		if (paramObject instanceof Classifier) {

-			result = (Classifier) paramObject;

-		}

-

-		return result;

-	}

-

-	/**

-	 * Creates a new {@link Property} from the propertyType in the propertyContainer

-	 *

-	 * @param propertyContainer

-	 *            the container of the {@link Property}

-	 * @param propertyType

-	 *            the type of the {@link Property}

-	 * @return the new {@link Property}

-	 * @throws ExecutionException

-	 */

-	protected Property createTargetProperty(Property targetProperty, Classifier propertyContainer, Type propertyType, Association association, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info)

-			throws ExecutionException {

-		setPropertyType(targetProperty, propertyType, editingDomain, progressMonitor, info);

-		setPropertyName(targetProperty);

-		return targetProperty;

-	}

-

-	protected Property createSourceProperty(Property sourceProperty, Classifier propertyContainer, Type propertyType, Association association, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info)

-			throws ExecutionException {

-		setPropertyType(sourceProperty, propertyType, editingDomain, progressMonitor, info);

-		setPropertyName(sourceProperty);

-		return sourceProperty;

-	}

-

-	protected void setPropertyType(Property property, Type propertyType, TransactionalEditingDomain editingDomain, IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-		// Set type using all AdviceHelper (use ServiceEdit instead of manually set)

-		SetRequest request = new SetRequest(property, UMLPackage.eINSTANCE.getTypedElement_Type(), propertyType);

-		request.setEditingDomain(editingDomain);

-		IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(property);

-		ICommand editCommand = commandProvider.getEditCommand(request);

-		editCommand.execute(progressMonitor, info);

-	}

-

-	private void setPropertyName(Property property) {

-		String baseName = property.getType().getName().toLowerCase();

-		Element owner = property.getOwner();

-		if (owner instanceof Classifier) {

-			List<Property> ownedAttributes = ClassifierUtils.getOwnedAttributes((Classifier) owner);

-			String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(

-					property.getType().getName().toLowerCase(), ownedAttributes, "_");

-			property.setName(defaultNameWithIncrementFromBase);

-		}

-		else {

-			// default

-			property.setName(baseName);

-		}

-	}

-

-	/**

-	 * This method has to be specialized by subclasses (AggregationKind)

-	 *

-	 * @param sourceProperty

-	 *            The property to configure

-	 */

-	protected void configureSourceProperty(Property sourceProperty) {

-		// do nothing

-	}

-

-	/**

-	 * This method has to be specialized by subclasses (AggregationKind)

-	 *

-	 * @param sourceProperty

-	 *            The property to configure

-	 */

-	protected void configureTargetProperty(Property targetProperty) {

-		// do nothing

-	}

-

-	/**

-	 * This method has to be specialized by subclasses (owner)

-	 *

-	 * @param sourceEnd

-	 *            the semantic end

-	 * @param owner

-	 *            the end container

-	 * @param targetType

-	 *            the target type

-	 * @param association

-	 *            the association

-	 * @throws UnsupportedOperationException

-	 */

-	protected void addSourceInModel(final Property sourceEnd, Classifier owner, Type targetType, Association association) throws UnsupportedOperationException {

-		// set the container in order to allow Stereotype appliance

-		boolean added = ClassifierUtils.addOwnedAttribute(owner, sourceEnd);

-		if (!added) {

-			throw new UnsupportedOperationException("Cannot add a Property on Classifier " + owner.getQualifiedName());

-		}

-	}

-

-	/**

-	 * This method has to be specialized by subclasses (owner)

-	 *

-	 * @param targetEnd

-	 *            the semantic end

-	 * @param owner

-	 *            the end container

-	 * @param sourceType

-	 *            the source type

-	 * @param association

-	 *            the association

-	 * @throws UnsupportedOperationException

-	 */

-	protected void addTargetInModel(Property targetEnd, Classifier owner, Type sourceType, Association association) {

-		// set the container in order to allow Stereotype appliance

-		boolean added = ClassifierUtils.addOwnedAttribute(owner, targetEnd);

-		if (!added) {

-			throw new UnsupportedOperationException("Cannot add a Property on Classifier " + owner.getQualifiedName());

-		}

-	}

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * Complete the {@link Association} creation by setting its ends.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(final ConfigureRequest request) {

-

-		final Association association = (Association) request.getElementToConfigure();

-		final Classifier sourceType = getSourceOwnerType(request);

-		final Classifier targetType = getTargetOwnerType(request);

-

-		if ((sourceType == null) || (targetType == null)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-				try {

-					Property targetProperty = UMLFactory.eINSTANCE.createProperty();

-					Property sourceProperty = UMLFactory.eINSTANCE.createProperty();

-

-					// TODO: problem with SysML. Link are inversed. A -> B => memberEnd={a, b} instead of {b, a}.

-					// Problem seems to come from cached derivedFeature /endTypes

-					// So we force to set memberEnd in this order before doing anything with the created properties

-					association.getMemberEnds().add(targetProperty);

-					association.getMemberEnds().add(sourceProperty);

-

-					// Create source and target ends

-					addSourceInModel(targetProperty, sourceType, targetType, association);

-					addTargetInModel(sourceProperty, targetType, sourceType, association);

-					createTargetProperty(targetProperty, sourceType, targetType, association, request.getEditingDomain(), progressMonitor, info);

-					configureSourceProperty(targetProperty);

-					createSourceProperty(sourceProperty, targetType, sourceType, association, request.getEditingDomain(), progressMonitor, info);

-					configureTargetProperty(sourceProperty);

-

-				} catch (Exception e) {

-					Activator.log.error(e);

-					return CommandResult.newCancelledCommandResult();

-				}

-

-				return CommandResult.newOKCommandResult(association);

-			}

-		};

-	}

-}
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
deleted file mode 100644
index ccb28a55aad..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * Edit helper advice for {@link Association} with "aggregation = shared" and navigable in one way (used for creation purpose only).

- */

-public class AssociationSharedDirectedEditHelperAdvice extends AssociationSharedEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * The currently created {@link Association} is Shared (manage by super class), and directed

-	 * (meaning navigable in one direction only) which in SysML means the target end is owned by the association itself.

-	 *

-	 * Moreover this end name should not be set in that case, this latter rule is not followed here for now.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected void addTargetInModel(Property targetEnd, Classifier owner, Type sourceType, Association association) {

-		association.getOwnedEnds().add(targetEnd);

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
deleted file mode 100644
index 51340cc8fb3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import org.eclipse.uml2.uml.AggregationKind;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * Edit helper advice for {@link Association} with "aggregation = shared" (used for creation purpose only).

- */

-public class AssociationSharedEditHelperAdvice extends AssociationNoneEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * The currently created {@link Association} is Shared (manage by super class):

-	 * 		it source {@link Property} aggregation is set to Shared kind.

-	 *

-	 * The currently created {@link Association} is bidirectional (navigable in both directions):

-	 * 		it source and target {@link Property} are owned by the {@link Classifier} (target and source end types),

-	 * 		this is handled by the super class.

-	 * </pre>

-	 */

-	@Override

-	protected void configureSourceProperty(Property sourceProperty) {

-		sourceProperty.setAggregation(AggregationKind.SHARED_LITERAL);

-	}

-}
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/BlockConnectorEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/BlockConnectorEditHelperAdvice.java
deleted file mode 100644
index 75017f0163a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/BlockConnectorEditHelperAdvice.java
+++ /dev/null
@@ -1,109 +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.sysml.service.types.helper.advice;
-
-import java.util.List;
-
-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.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.service.types.command.SetNestedPathCommand;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.utils.RequestParameterUtils;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * <pre>
- * This HelperAdvice completes {@link Block} edit commands with SysML
- * specific {@link Connector} related actions:
- * - Block::isEncapsulated management
- * - NestedPropertyEnd management
- * </pre>
- */
-public class BlockConnectorEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	private ConnectorUtils utils = new ConnectorUtils();
-
-	@Override
-	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {
-
-		EObject source = request.getSource();
-		EObject target = request.getTarget();
-		View sourceView = RequestParameterUtils.getSourceView(request);
-		View targetView = RequestParameterUtils.getTargetView(request);
-
-		// Restrict this advice action to the end of Connector creation gesture (before clicking on target)
-		// in order to add SysML specific constraint
-		if ((request.getElementType() == UMLElementTypes.CONNECTOR)
-				&& (request.getSource() != null) && (request.getTarget() != null) && (request.getContainer() != null)) {
-
-			// Restrict action to SysML Connector (meaning owned by Block)
-			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(request.getContainer())) {
-
-				// If the source or target view is enclosed in a structure encapsulated view, forbid creation.
-				if (utils.isCrossingEncapsulation(sourceView, targetView)
-						|| utils.isCrossingEncapsulation(targetView, sourceView)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-				if (ConnectorUtils.canCreate(source, target, sourceView, targetView)) {
-					request.setParameter(org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants.UML_STRICT, false);
-				}
-			}
-		}
-
-		return super.getBeforeCreateRelationshipCommand(request);
-	}
-
-	@Override
-	protected ICommand getAfterCreateRelationshipCommand(CreateRelationshipRequest request) {
-
-		ICommand defaultCommand = super.getAfterCreateRelationshipCommand(request);
-
-		View sourceView = RequestParameterUtils.getSourceView(request);
-		View targetView = RequestParameterUtils.getTargetView(request);
-
-		// Restrict this advice action to the end of Connector creation gesture (before clicking on target)
-		// in order to add SysML specific constraint
-		if ((request.getElementType() == UMLElementTypes.CONNECTOR)
-				&& (request.getSource() != null) && (request.getTarget() != null) && (request.getContainer() != null)) {
-
-			// Restrict action to SysML Connector (meaning owned by Block)
-			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(request.getContainer())) {
-
-				// Check if source view is nested
-				if (utils.isNestedConnectableElement(sourceView, targetView)) {
-					List<Property> nestedPath = utils.getNestedPropertyPath(sourceView, targetView);
-					defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getNewElement(), request, nestedPath, SetNestedPathCommand.NESTED_SOURCE));
-				}
-
-				// Check if target view is nested
-				if (utils.isNestedConnectableElement(targetView, sourceView)) {
-					List<Property> nestedPath = utils.getNestedPropertyPath(targetView, sourceView);
-					defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getNewElement(), request, nestedPath, SetNestedPathCommand.NESTED_TARGET));
-				}
-			}
-		}
-
-		return defaultCommand;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ClassifierEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ClassifierEditHelperAdvice.java
deleted file mode 100644
index e2cc764059f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ClassifierEditHelperAdvice.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * <pre>

- * This HelperAdvice completes {@link Classifier} edit commands with :

- * 		- possibly required (sysML) association re-factor command.

- * </pre>

- */

-public class ClassifierEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * While moving a {@link Property} to a Classifier:

-	 * - add possibly required (sysML) association re-factor command when needed.

-	 *

-	 * </pre>

-	 */

-	@Override

-	protected ICommand getBeforeMoveCommand(MoveRequest request) {

-

-		ICommand gmfCommand = super.getBeforeMoveCommand(request);

-

-		// Treat related associations that required a re-factor action

-		// Retrieve elements already under re-factor.

-		List<EObject> currentlyRefactoredElements = (request.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) != null) ? (List<EObject>) request

-				.getParameter(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) : new ArrayList<EObject>();

-

-		// Find Associations related to any moved Property

-		for (Object movedObject : request.getElementsToMove().keySet()) {

-

-			// Select Property (excluding Port) in the list of moved elements

-			if (!(movedObject instanceof Property) || (movedObject instanceof Port)) {

-				continue;

-			}

-

-			Property movedProperty = (Property) movedObject;

-			Association relatedAssociation = movedProperty.getAssociation();

-

-			// The moved property has to be related to a SysML association

-			if ((relatedAssociation == null) || !(ElementUtil.hasNature(relatedAssociation, SysMLElementTypes.SYSML_NATURE))) {

-				continue;

-			}

-

-			// Make sure the target differs from current container

-			if ((movedProperty.eContainer() == request.getTargetContainer()) && (movedProperty.eContainingFeature() == request.getTargetFeature(movedProperty))) {

-				continue;

-			}

-

-			// Make sure the target differs from related association (this move does not imply a re-factor, but simply an ownership change of an association end)

-			if ((relatedAssociation == request.getTargetContainer()) && ((request.getTargetFeature(movedProperty) == null) || (UMLPackage.eINSTANCE.getAssociation_OwnedEnd() == request.getTargetFeature(movedProperty)))) {

-				continue; // This is a SysML Property#isNavigable update which does not require an Association refactoring action

-			}

-			if ((getOppositeAssociationEnd(movedProperty).getType() == request.getTargetContainer())) {

-				continue; // This is a SysML Property#isNavigable update which does not require an Association refactoring action

-			}

-

-			// Moved element already under re-factor ?

-			if (currentlyRefactoredElements.contains(movedObject) || currentlyRefactoredElements.contains(relatedAssociation)) {

-				continue;

-

-			} else {

-				currentlyRefactoredElements.add((EObject) movedObject);

-				request.getParameters().put(org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS, currentlyRefactoredElements);

-			}

-

-			ICommand refactorCommand = getAssociationRefactoringCommand(movedProperty, relatedAssociation, request);

-			gmfCommand = CompositeCommand.compose(gmfCommand, refactorCommand);

-		}

-

-		if (gmfCommand != null) {

-			gmfCommand = gmfCommand.reduce();

-		}

-

-		return gmfCommand;

-	}

-

-	/**

-	 * Create a re-factoring command related to a Property move.

-	 *

-	 * @param movedProperty

-	 *            the moved property

-	 * @param associationToRefactor

-	 *            the association to re-factor (re-orient action)

-	 * @param request

-	 *            the original move request

-	 * @return the re-factoring command

-	 */

-	private ICommand getAssociationRefactoringCommand(Property movedProperty, Association associationToRefactor, MoveRequest request) {

-

-		Association relatedAssociation = movedProperty.getAssociation(); // Should not be null, test before calling method.

-

-		// Re-orient the related association (do not use edit service to avoid infinite loop here)

-		int direction = ReorientRequest.REORIENT_TARGET;

-		if (movedProperty == associationToRefactor.getMemberEnds().get(0)) {

-			direction = ReorientRequest.REORIENT_SOURCE;

-		}

-

-		ReorientRelationshipRequest reorientRequest = new ReorientRelationshipRequest(relatedAssociation, request.getTargetContainer(), movedProperty.eContainer(), direction);

-		reorientRequest.addParameters(request.getParameters());

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(relatedAssociation);

-		if (provider != null) {

-			return provider.getEditCommand(reorientRequest);

-		}

-

-		return null;

-	}

-

-	/**

-	 * Get the opposite end of an AssociationEnd (binary association assumed).

-	 *

-	 * @param associationEnd

-	 *            the association end

-	 * @return the opposite association end or null

-	 */

-	private Property getOppositeAssociationEnd(Property associationEnd) {

-		Property oppositeEnd = null;

-

-		if (associationEnd.getAssociation() != null) {

-			Association association = associationEnd.getAssociation();

-			Set<Property> ends = new HashSet<Property>();

-			ends.addAll(association.getMemberEnds());

-			ends.remove(associationEnd);

-

-			oppositeEnd = (ends.size() > 0) ? ends.iterator().next() : null;

-		}

-		return oppositeEnd;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ConnectorEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ConnectorEditHelperAdvice.java
deleted file mode 100644
index d9c5e1be936..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/ConnectorEditHelperAdvice.java
+++ /dev/null
@@ -1,271 +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.sysml.service.types.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.papyrus.sysml.service.types.command.SetNestedPathCommand;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.sysml.service.types.utils.ConnectorUtils;

-import org.eclipse.papyrus.uml.service.types.utils.RequestParameterUtils;

-import org.eclipse.papyrus.uml.tools.commands.UnapplyStereotypeCommand;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <pre>

- * This HelperAdvice completes {@link Connector} edit commands with SysML specific actions:

- * - Re-orient with structure encapsulation respect.

- * </pre>

- */

-public class ConnectorEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	private ConnectorUtils utils = new ConnectorUtils();

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected ICommand getBeforeReorientRelationshipCommand(final ReorientRelationshipRequest request) {

-		final CompositeCommand compositeCommand = new CompositeCommand("Destroy Connector View Command");

-

-		// the UML Connector Edit Helper Advice destroys connector views when roles changes

-		// Here, we destroys connectors views, when the path changes

-		final EObject editedElement = request.getRelationship();

-		if (editedElement instanceof Connector) {

-

-			if (applySysMLRules(((Connector) editedElement).getOwner())) {

-				final Connector connector = (Connector) editedElement;

-				// verify the path now

-				int reorientDirection = request.getDirection();

-				Edge reorientedEdgeView = RequestParameterUtils.getReconnectedEdge(request);

-				View newEndView = RequestParameterUtils.getReconnectedEndView(request);

-				View oppositeEndView = null;

-				if (reorientedEdgeView != null) {

-					oppositeEndView = (reorientDirection == ReorientRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();

-				}

-				List<Property> newNestedPath = null;

-				if (reorientedEdgeView != null && newEndView != null) {

-					// we are working with a 'graphical' reconnect request

-					newNestedPath = utils.getNestedPropertyPath(newEndView, oppositeEndView);

-				} else {

-					newNestedPath = (List<Property>) request.getParameter(ConnectorUtils.NESTED_CONNECTOR_END_PATH);

-				}

-

-				final Set<View> viewsToDestroy = utils.getViewsRepresentingConnector(connector);

-				final Iterator<View> iter = viewsToDestroy.iterator();

-

-				while (iter.hasNext()) {

-					final Edge current = (Edge) iter.next();

-					if (current != reorientedEdgeView) {

-						View oldEndView = null;

-						if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-							oldEndView = current.getSource();

-						} else if (reorientDirection == ReorientRequest.REORIENT_TARGET) {

-							oldEndView = current.getTarget();

-						}

-						if (oppositeEndView != null) {

-							final List<Property> oldNestedPath = utils.getNestedPropertyPath(oldEndView, oppositeEndView);

-							if (!newNestedPath.equals(oldNestedPath)) {

-								final DestroyElementRequest destroyRequest = new DestroyElementRequest(request.getEditingDomain(), current, false);

-								final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(current);

-								compositeCommand.add(commandProvider.getEditCommand(destroyRequest));

-							}

-						}

-					}

-				}

-				if (!compositeCommand.isEmpty()) {

-					return compositeCommand;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param connectorOwner

-	 *            the owner of the connector

-	 * @return

-	 */

-	protected boolean applySysMLRules(final Element connectorOwner) {

-		return connectorOwner.getApplicableStereotype("SysML::Blocks::Block") != null;

-	}

-

-	@Override

-	protected ICommand getAfterReorientRelationshipCommand(final ReorientRelationshipRequest request) {

-		// we set the new value for the nested path

-		ICommand defaultCommand = super.getAfterReorientRelationshipCommand(request);

-

-		int reorientDirection = request.getDirection();

-

-

-		// Restrict this advice action to the end of Connector creation gesture (before clicking on target)

-		// in order to add SysML specific constraint

-		Connector connector = (Connector) request.getRelationship();

-		// get the direction

-

-		// Restrict action to SysML Connector (meaning owned by Block)

-		if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(connector.eContainer())) {

-			List<Property> tmpNestedPath = null;

-			Edge reorientedEdgeView = RequestParameterUtils.getReconnectedEdge(request);

-			View newEndView = RequestParameterUtils.getReconnectedEndView(request);

-			View oppositeEndView = null;

-

-			// graphical case : verify encapsulation and get the new path

-			if (reorientedEdgeView != null) {

-

-				oppositeEndView = (reorientDirection == ReorientRequest.REORIENT_SOURCE) ? reorientedEdgeView.getTarget() : reorientedEdgeView.getSource();

-				Assert.isNotNull(oppositeEndView);

-				Assert.isNotNull(newEndView);

-				if (newEndView != null && oppositeEndView != null) {

-					// If the source or target view is enclosed in a structure encapsulated view, forbid creation.

-					if (utils.isCrossingEncapsulation(newEndView, oppositeEndView) || utils.isCrossingEncapsulation(oppositeEndView, newEndView)) {

-						return UnexecutableCommand.INSTANCE;

-					}

-					tmpNestedPath = utils.getNestedPropertyPath(newEndView, oppositeEndView);

-				}

-			} else {

-				// we are in the semantic case

-				tmpNestedPath = ((List<Property>) request.getParameter(ConnectorUtils.NESTED_CONNECTOR_END_PATH));

-

-				// we need to verify encapsulation

-				if (ConnectorUtils.isCrossingEncapuslation(tmpNestedPath)) {

-					return UnexecutableCommand.INSTANCE;

-				}

-			}

-

-			final List<ConnectableElement> oppositeFullNestedPath = new ArrayList<ConnectableElement>();

-			final List<ConnectableElement> newFullNestedPath = new ArrayList<ConnectableElement>(tmpNestedPath);

-			ConnectableElement newRole = (Property) request.getNewRelationshipEnd();

-			final ConnectorEnd oppositeEnd;

-			if (reorientDirection == ReorientRequest.REORIENT_SOURCE) {

-				oppositeEnd = ((Connector) request.getRelationship()).getEnds().get(1);

-			} else {

-				oppositeEnd = ((Connector) request.getRelationship()).getEnds().get(0);

-			}

-			final NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(oppositeEnd, NestedConnectorEnd.class);

-			if (nestedConnectorEnd != null) {

-				oppositeFullNestedPath.addAll(nestedConnectorEnd.getPropertyPath());

-			}

-			oppositeFullNestedPath.add(oppositeEnd.getRole());

-			newFullNestedPath.add(newRole);

-

-			int tmpNestedPathDirection = (reorientDirection == ReorientRequest.REORIENT_SOURCE) ? SetNestedPathCommand.NESTED_SOURCE : SetNestedPathCommand.NESTED_TARGET;

-			if (tmpNestedPath == null || tmpNestedPath.isEmpty()) { // in case of no NestedConnectorEnd property path remove existing NestedConnectorEnd

-				ConnectorEnd connectorEnd0 = ((Connector) request.getRelationship()).getEnds().get(0);

-				Stereotype stereotype0 = connectorEnd0.getAppliedStereotype("SysML::Blocks::NestedConnectorEnd");//$NON-NLS-1$

-				if (stereotype0 != null) {

-					UnapplyStereotypeCommand unapplyStereotypeCommand0 = new UnapplyStereotypeCommand(connectorEnd0, stereotype0, request.getEditingDomain());

-					defaultCommand = CompositeCommand.compose(defaultCommand, EMFtoGMFCommandWrapper.wrap(unapplyStereotypeCommand0));

-				}					

-				ConnectorEnd connectorEnd1 = ((Connector) request.getRelationship()).getEnds().get(1);

-				Stereotype stereotype1 = connectorEnd1.getAppliedStereotype("SysML::Blocks::NestedConnectorEnd");//$NON-NLS-1$

-				if (stereotype1 != null) {

-					UnapplyStereotypeCommand unapplyStereotypeCommand1 = new UnapplyStereotypeCommand(connectorEnd1, stereotype1, request.getEditingDomain());

-					defaultCommand = CompositeCommand.compose(defaultCommand, EMFtoGMFCommandWrapper.wrap(unapplyStereotypeCommand1));

-				}

-

-			} else {

-				defaultCommand = CompositeCommand.compose(defaultCommand, new SetNestedPathCommand("Set connector nested source path", request.getRelationship(), request, tmpNestedPath, tmpNestedPathDirection));

-			}

-		}

-

-		return defaultCommand;

-	}

-

-

-	// TODO : we should recalculate a new owner according to the new nested path, then update these nested path according to the new owner

-	// we don't do it now, because we have some troubles with connector

-	// final EncapsulatedClassifier newOwner = deduceNewConnectorOwner(oppositeFullNestedPath, newFullNestedPath);

-	// /**

-	// * @param fullNestedPathWithrole1

-	// * @param fullNestedPathWithRole2

-	// * @return

-	// * the new owner for the connector

-	// */

-	// doesnt work currently

-	// public static final EncapsulatedClassifier deduceNewConnectorOwner(final List<ConnectableElement> fullNestedPathWithrole1, final List<ConnectableElement> fullNestedPathWithRole2) {

-	// final ConnectableElement firstElementPath = fullNestedPathWithrole1.get(0);

-	// //case of encapsulation of the part

-	// if(fullNestedPathWithRole2.get(0) == firstElementPath) {

-	// if(fullNestedPathWithRole2.size() > 1) {

-	// fullNestedPathWithrole1.remove(0);

-	// fullNestedPathWithRole2.remove(0);

-	// return deduceNewConnectorOwner(fullNestedPathWithrole1, fullNestedPathWithRole2);

-	// } else {

-	// return (EncapsulatedClassifier)firstElementPath.getOwner();

-	// }

-	// } else {

-	// final ConnectableElement firstElementPath2 = fullNestedPathWithRole2.get(0);

-	// if(firstElementPath.getOwner() == firstElementPath2.getOwner()) {

-	// return (EncapsulatedClassifier)firstElementPath.getOwner();

-	// } else {

-	// final List<ConnectableElement> biggestList;

-	// final List<ConnectableElement> smallestList;

-	// if(fullNestedPathWithrole1.size() > fullNestedPathWithRole2.size()) {

-	// biggestList = fullNestedPathWithrole1;

-	// smallestList = fullNestedPathWithRole2;

-	// } else {

-	// biggestList = fullNestedPathWithRole2;

-	// smallestList = fullNestedPathWithrole1;

-	// }

-	// for(int i = 0; i < biggestList.size(); i++) {

-	// final ConnectableElement current = biggestList.get(i);

-	// if(smallestList.contains(current) && i > 0) {

-	// return (EncapsulatedClassifier)biggestList.get(i - 1).getOwner();

-	// }

-	// }

-	// }

-	// }

-	// return null;

-	// // throw new RuntimeException("error");

-	//

-	//

-	//

-	//

-	//

-	// }

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PackageEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PackageEditHelperAdvice.java
deleted file mode 100644
index aafb47c5d69..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PackageEditHelperAdvice.java
+++ /dev/null
@@ -1,85 +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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.service.types.utils.EMFUtil;

-import org.eclipse.uml2.uml.Actor;

-import org.eclipse.uml2.uml.Association;

-

-/**

- * Advice to restrict {@link Association} creation in SysML

- */

-public class PackageEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * In case of {@link Association} creation, it should not be possible to target an association as target end.

-	 */

-	@Override

-	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

-		// test if the creation is for a SysML association

-

-		IElementType type = request.getElementType();

-		if (hasSuperType(type, SysMLElementTypes.ASSOCIATION)) {

-			// test source and target...

-			EObject target = request.getTarget();

-			if (target instanceof Association || target == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-

-			if (!(hasSuperType(type, SysMLElementTypes.ASSOCIATION_NONE_DIRECTED) || hasSuperType(type, SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED) || hasSuperType(type, SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED))) {

-				// The association is bidirectional. Check if that is possible.

-

-				// The target can be read-only only if the association is directed.

-				if (EMFUtil.isReadOnly(target)) {

-					return UnexecutableCommand.INSTANCE;

-				}

-				// association should be directed to the actor. In this case, the property is owned by the association, not by the actor

-				if (target instanceof Actor) {

-					return UnexecutableCommand.INSTANCE;

-				}

-			}

-

-		}

-

-		return super.getBeforeCreateRelationshipCommand(request);

-	}

-

-	protected boolean hasSuperType(IElementType elementType, IElementType typeToTest) {

-		if (elementType == null || typeToTest == null) {

-			return false;

-		}

-

-		if (elementType.equals(typeToTest)) {

-			return true;

-		}

-

-		List<IElementType> superTypes = Arrays.asList(elementType.getAllSuperTypes());

-		if (superTypes.contains(typeToTest)) {

-			return true;

-		}

-

-		return false;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PropertyEditHelperAdvice.java
deleted file mode 100644
index ac321ad702a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/advice/PropertyEditHelperAdvice.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011-2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *      Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.dialogs.MessageDialogWithToggle;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.service.types.Activator;

-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.util.CrossReferencerUtil;

-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;

-import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.common.util.CacheAdapter;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.util.UMLUtil;

-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;

-

-/**

- * <pre>

- * This HelperAdvice completes {@link Property} edit commands with:

- * 		- possibly required (sysML) association re-factor command.

- * </pre>

- */

-public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 *

-	 * While setting {@link Property} (excluding {@link Port} and {@link ConstraintParameter} type:

-	 * - add possibly required (sysML) association re-factor command when needed.

-	 * - add/remove possibly required ConstraintProperty stereotype when needed.

-	 * </pre>

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	protected ICommand getBeforeSetCommand(SetRequest request) {

-		ICommand gmfCommand = super.getBeforeSetCommand(request);

-

-		EObject elementToEdit = request.getElementToEdit();

-		if ((elementToEdit instanceof Property) && !(elementToEdit instanceof Port) && (request.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (request.getValue() instanceof Type)) {

-

-			Property propertyToEdit = (Property) elementToEdit;

-

-			// SysML specification : all property typed by a ConstraintBlock must have a ContraintProperty stereotype applied

-			if (request.getValue() instanceof org.eclipse.uml2.uml.Class) {

-				ICommand stereotypeApplicationCommand = getConstraintPropertyStereotypeApplicationCommand(propertyToEdit, (org.eclipse.uml2.uml.Class) request.getValue(), request);

-				gmfCommand = CompositeCommand.compose(gmfCommand, stereotypeApplicationCommand);

-			}

-

-			// Exclude ConstraintParameter (simple property without ConstraintProperty stereotype owned by a ConstraintBlock)

-			if (propertyToEdit.eContainer() instanceof org.eclipse.uml2.uml.Class && UMLUtil.getStereotypeApplication((Element) propertyToEdit.eContainer(), ConstraintBlock.class) != null) {

-				if (UMLUtil.getStereotypeApplication(propertyToEdit, ConstraintProperty.class) == null) {

-					return gmfCommand;

-				}

-			}

-

-			Association relatedAssociation = propertyToEdit.getAssociation();

-

-			// The edited property has to be related to a SysML association

-			if ((relatedAssociation == null) || !(ElementUtil.hasNature(relatedAssociation, SysMLElementTypes.SYSML_NATURE))) {

-

-				// If no association exist and the new type is a Block

-				// (not a ConstraintBlock => a property typed by a ConstraintBlock is a ConstraintProperty, not a Part neither a Reference),

-				// add the association

-				if ((relatedAssociation == null) && ((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue()) && !((ISpecializationType) SysMLElementTypes.CONSTRAINT_BLOCK).getMatcher().matches((Type) request.getValue())

-						&& ((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(propertyToEdit.eContainer())) {

-

-					ICommand addAssociationCommand = getCreatePartAssociationCommand((org.eclipse.uml2.uml.Class) propertyToEdit.eContainer(), propertyToEdit, (org.eclipse.uml2.uml.Class) request.getValue());

-					gmfCommand = CompositeCommand.compose(gmfCommand, addAssociationCommand);

-				}

-

-				return gmfCommand;

-			}

-

-			// Setting new type can be related to an association re-orient (or trigger the association re-orient)

-			// Retrieve elements already under re-factor.

-			List<EObject> currentlyRefactoredElements = (request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS) != null) ? (List<EObject>) request.getParameter(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS)

-					: new ArrayList<EObject>();

-			if (!currentlyRefactoredElements.contains(propertyToEdit)) {

-				currentlyRefactoredElements.add(propertyToEdit);

-				request.getParameters().put(RequestParameterConstants.ASSOCIATION_REFACTORED_ELEMENTS, currentlyRefactoredElements);

-

-				// Current association already under re-factor ?

-				if (currentlyRefactoredElements.contains(relatedAssociation)) {

-					return gmfCommand;

-				}

-			}

-

-			// If the new type is not a block, destroy related association

-			// This must be done only if the setting of the property type is not part of an association re-orient (hence after the previous code-block),

-			// otherwise there is no legitimate reason to destroy the existing association while re-orienting it.

-			if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches((Type) request.getValue()) && propertyToEdit.getType() != null) {

-				ICommand destroyCommand = getDestroyPartAssociationCommand(relatedAssociation, propertyToEdit);

-				gmfCommand = CompositeCommand.compose(gmfCommand, destroyCommand);

-

-				return gmfCommand;

-			}

-

-			ICommand refactorCommand = getAssociationRefactoringCommand(propertyToEdit, relatedAssociation, request);

-			gmfCommand = CompositeCommand.compose(gmfCommand, refactorCommand);

-		}

-

-		if (gmfCommand != null) {

-			gmfCommand = gmfCommand.reduce();

-		}

-

-		return gmfCommand;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterSetCommand(org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)

-	 *

-	 * @param setRequest

-	 * @return

-	 */

-	@Override

-	protected ICommand getAfterSetCommand(SetRequest setRequest) {

-		ICommand afterSetCommand = super.getAfterSetCommand(setRequest);

-		EObject elementToEdit = setRequest.getElementToEdit();

-		if ((elementToEdit instanceof Property) && !(elementToEdit instanceof Port) && (setRequest.getFeature() == UMLPackage.eINSTANCE.getTypedElement_Type()) && (setRequest.getValue() instanceof Type)) {

-			afterSetCommand = getDestroyAssociatedNestedConnectorCommand((Property) elementToEdit, afterSetCommand);

-		}

-		return afterSetCommand;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)

-	 *

-	 * @param destroyDependentsRequest

-	 * @return

-	 */

-	@Override

-	protected ICommand getAfterDestroyDependentsCommand(DestroyDependentsRequest destroyDependentsRequest) {

-		ICommand afterDestroyDependentsCommand = super.getAfterDestroyDependentsCommand(destroyDependentsRequest);

-		EObject elementToDestroy = destroyDependentsRequest.getElementToDestroy();

-		if (elementToDestroy instanceof Property) {

-			afterDestroyDependentsCommand = getDestroyAssociatedNestedConnectorCommand((Property) elementToDestroy, afterDestroyDependentsCommand);

-		}

-		return afterDestroyDependentsCommand;

-	}

-

-	/**

-	 * Create a destroy command for all connectors that have this property in their <NestedConnectorEnd> property path.

-	 *

-	 * @param property

-	 *            the part to be destroyed

-	 * @param command

-	 * @return

-	 */

-	private ICommand getDestroyAssociatedNestedConnectorCommand(Property property, ICommand command) {

-		// When creating a property in a new-element dialog, it is not attached to the model, yet. So, there will be no need to worry about connectors

-		Collection<Setting> allReferences = CacheAdapter.getCacheAdapter(property).getInverseReferences(property);

-		List<Connector> connectorsToDestroy = ConnectorUtils.filterConnectorByPropertyInNestedConnectorEnd(allReferences, property);

-		for (Connector connector : connectorsToDestroy) {

-			ICommand destroyConnectorCommand = getDestroyConnectorCommand(connector);

-			command = CompositeCommand.compose(command, destroyConnectorCommand);

-		}

-		return command;

-	}

-

-	/**

-	 * Create a connector destroy command.

-	 *

-	 * @param connector

-	 * @return the connector destroy command

-	 */

-	private ICommand getDestroyConnectorCommand(Connector connector) {

-		DestroyElementRequest request = new DestroyElementRequest(connector, false);

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(connector.eContainer());

-		if (provider == null) {

-			return null;

-		}

-		return provider.getEditCommand(request);

-	}

-

-	/**

-	 * Create a re-factoring command related to a Property move.

-	 *

-	 * @param setProperty

-	 *            the property which type is set

-	 * @param associationToRefactor

-	 *            the association to re-factor (re-orient action)

-	 * @param request

-	 *            the original set request

-	 * @return the re-factoring command

-	 */

-	private ICommand getAssociationRefactoringCommand(Property setProperty, Association associationToRefactor, SetRequest request) {

-

-		Association relatedAssociation = setProperty.getAssociation(); // Should not be null, test before calling method.

-

-		if (associationToRefactor.getMemberEnds().size() >= 2) {

-			// Re-orient the related association (do not use edit service to avoid infinite loop here)

-			int direction = ReorientRequest.REORIENT_TARGET;

-			if (setProperty == associationToRefactor.getMemberEnds().get(1)) {

-				direction = ReorientRequest.REORIENT_SOURCE;

-			}

-

-			ReorientRelationshipRequest reorientRequest = new ReorientRelationshipRequest(relatedAssociation, (Type) request.getValue(), setProperty.eContainer(), direction);

-			reorientRequest.addParameters(request.getParameters());

-

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(relatedAssociation);

-			if (provider != null) {

-				return provider.getEditCommand(reorientRequest);

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Create a part association creation command.

-	 *

-	 * @return the part association creation command

-	 */

-	private ICommand getCreatePartAssociationCommand(final org.eclipse.uml2.uml.Class sourceBlock, final Property sourceProperty, final org.eclipse.uml2.uml.Class targetBlock) {

-

-		return new AbstractCommand("Create part association") {

-

-			@Override

-			protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				// TODO Auto-generated method stub

-				return null;

-			}

-

-			@Override

-			protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				// TODO Auto-generated method stub

-				return null;

-			}

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				Association association = UMLFactory.eINSTANCE.createAssociation();

-

-				// Add the association in the model

-				org.eclipse.uml2.uml.Package container = (org.eclipse.uml2.uml.Package) EMFCoreUtil.getLeastCommonContainer(Arrays.asList(new EObject[] { sourceBlock, targetBlock }), UMLPackage.eINSTANCE.getPackage());

-				container.getPackagedElements().add(association);

-

-				// Use existing Property as source...

-				association.getMemberEnds().add(sourceProperty);

-				// ... and create the opposite (unnamed) Property

-				Property targetProperty = UMLFactory.eINSTANCE.createProperty();

-				association.getOwnedEnds().add(targetProperty);

-

-				// Set Association name

-				// Initialize the element name based on the created IElementType

-				String initializedName = NamedElementHelper.getDefaultNameWithIncrementFromBase(UMLPackage.eINSTANCE.getAssociation().getName(), association.eContainer().eContents());

-				association.setName(initializedName);

-

-				// Add SysML Nature on the new Association

-				ElementUtil.addNature(association, SysMLElementTypes.SYSML_NATURE);

-

-				return CommandResult.newOKCommandResult(association);

-			}

-		};

-

-	}

-

-	/**

-	 * Apply/remove the ConstraintProperty stereotype application

-	 *

-	 * @return the ConstraintProperty stereotype application command

-	 */

-	private ICommand getConstraintPropertyStereotypeApplicationCommand(final Property sourceProperty, final org.eclipse.uml2.uml.Class targetBlock, final SetRequest request) {

-

-		return new AbstractTransactionalCommand(request.getEditingDomain(), "Apply/Remove ConstraintProperty Stereotype", null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-				// SysML specification : all property typed by a ConstraintBlock must have a ContraintProperty stereotype applied

-				ConstraintProperty constraintPropertyApplication = UMLUtil.getStereotypeApplication(sourceProperty, ConstraintProperty.class);

-				if (UMLUtil.getStereotypeApplication(targetBlock, ConstraintBlock.class) != null) {

-					if (constraintPropertyApplication == null) {

-						StereotypeApplicationHelper.INSTANCE.applyStereotype(sourceProperty, ConstraintsPackage.eINSTANCE.getConstraintProperty());

-						// Remove representations

-						Set<View> memberViewsToDestroy = CrossReferencerUtil.getCrossReferencingViews(sourceProperty, null);

-						if (memberViewsToDestroy.size() != 0) {

-							final IPreferenceStore store = Activator.getDefault().getPreferenceStore();

-							final String DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY = "displayMessageForTypingActionPreferenceKey";

-							boolean contains = store.contains(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY);

-							if (!contains) {

-								store.setValue(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY, MessageDialogWithToggle.NEVER);

-								store.setDefault(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY, MessageDialogWithToggle.NEVER);

-							}

-							final String hideValue = store.getString(DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY);

-							if (!hideValue.equals(MessageDialogWithToggle.ALWAYS)) {

-								int size = memberViewsToDestroy.size();

-								MessageDialogWithToggle.openInformation(Display.getDefault().getActiveShell(), "Change Type Action",

-										"WARNING! Typing a Property by a ConstraintBlock make this property become a ConstraintProperty. ConstraintProperty have a specific representation. "

-												+ "\nSo all representations of this property will be removed from the model  (" + size + " occurence" + ((size > 1) ? "s" : "") + ").",

-										"Don't show this dialog the next time", false, store,

-										DISPLAY_MESSAGE_FOR_TYPING_ACTION_PREFERENCE_KEY);

-							}

-

-						}

-						for (View view : memberViewsToDestroy) {

-							final DestroyElementRequest destroyRequest = new DestroyElementRequest(request.getEditingDomain(), view, false);

-							final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(view);

-							ICommand editCommand = commandProvider.getEditCommand(destroyRequest);

-							editCommand.execute(progressMonitor, info);

-						}

-					}

-				} else {

-					if (constraintPropertyApplication != null) {

-						StereotypeApplicationHelper.INSTANCE.removeFromContainmentList(sourceProperty, constraintPropertyApplication);

-					}

-				}

-				return CommandResult.newOKCommandResult(sourceProperty);

-			}

-		};

-	}

-

-	/**

-	 * Create a part association destroy command.

-	 *

-	 * @return the part association destroy command

-	 */

-	@SuppressWarnings("unchecked")

-	private ICommand getDestroyPartAssociationCommand(Association partAssociation, Property propertyToEdit) {

-

-		DestroyElementRequest request = new DestroyElementRequest(partAssociation, false);

-		List<EObject> dependentsToKeep = Arrays.asList(new EObject[] { propertyToEdit });

-		request.getParameters().put(RequestParameterConstants.DEPENDENTS_TO_KEEP, dependentsToKeep);

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(partAssociation.eContainer());

-		if (provider == null) {

-			return null;

-		}

-		ICommand destroyCommand = provider.getEditCommand(request);

-

-		return destroyCommand;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ActorPartPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ActorPartPropertyMatcher.java
deleted file mode 100644
index 19d5f2a25a8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ActorPartPropertyMatcher.java
+++ /dev/null
@@ -1,50 +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.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.uml2.uml.Actor;

-import org.eclipse.uml2.uml.AggregationKind;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * Test if current {@link Property} is a {@link Actor} Part

- */

-public class ActorPartPropertyMatcher implements IElementMatcher {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if ((eObject instanceof Property) && !(eObject instanceof Port)) {

-

-			Property element = (Property) eObject;

-

-			// The property is necessary a composition and has a type

-			if ((element.getType() != null) && (element.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {

-

-				// Moreover its type has to be a Actor

-				if (element.getType() instanceof Actor) {

-					isMatch = true;

-				}

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java
deleted file mode 100644
index 44d4b8e29a2..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.allocations.Allocate;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Abstraction} is a {@link Allocate}

- */

-public class AllocateMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Abstraction) {

-

-			Abstraction element = (Abstraction) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Allocate.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AssociationMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AssociationMatcher.java
deleted file mode 100644
index 31063869b6d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AssociationMatcher.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * <pre>

- * Test if current {@link Association} has the UML nature.

- * This nature is used to:

- * - distinguish between UML and SysML expected behavior for {@link Association}

- * - decide whether and {@link Association} can be dropped and used in a specific diagram

- * - select the property view to use

- * </pre>

- */

-public class AssociationMatcher implements IElementMatcher {

-

-	/** Test is the eObject is a SysML Association */

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-

-		if (eObject instanceof Association) {

-

-			Association association = (Association) eObject;

-			if (hasValidNature(association)) {

-				isMatch = true;

-			}

-		}

-

-		return isMatch;

-	}

-

-	/** Valid nature is SysML Nature */

-	private boolean hasValidNature(Element element) {

-		return ElementUtil.hasNature(element, SysMLElementTypes.SYSML_NATURE);

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/BlockMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/BlockMatcher.java
deleted file mode 100644
index 7dfc419fd8e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/BlockMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Class} is a {@link Block}

- */

-public class BlockMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Class) {

-

-			Class element = (Class) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Block.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java
deleted file mode 100644
index 4da31863355..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.modelelements.Conform;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Dependency} is a {@link Conform}

- */

-public class ConformMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Dependency) {

-

-			Dependency element = (Dependency) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Conform.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java
deleted file mode 100644
index f294cca846c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Class} is a {@link ConstraintBlock}

- */

-public class ConstraintBlockMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Class) {

-

-			Class element = (Class) eObject;

-			if (UMLUtil.getStereotypeApplication(element, ConstraintBlock.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java
deleted file mode 100644
index cbfe3973476..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Esterel technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Alain Le Guennec (Esterel technologies SAS) - Bug 497455
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.matcher;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Test if current {@link Property} is a {@link ConstraintProperty}
- */
-public class ConstraintPropertyMatcher implements IElementMatcher {
-
-	public boolean matches(EObject eObject) {
-
-		boolean isMatch = false;
-		if (eObject instanceof Property) {
-
-			Property element = (Property) eObject;
-			Type type = element.getType();
-			// A ConstraintProperty is necessarily typed by a ConstraintBlock which must be a Class.
-			if ((type==null || type instanceof Class) && UMLUtil.getStereotypeApplication(element, ConstraintProperty.class) != null) {
-				isMatch = true;
-			}
-		}
-		return isMatch;
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java
deleted file mode 100644
index 74c51ab3f8a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.requirements.Copy;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Abstraction} is a {@link Copy}

- */

-public class CopyMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Abstraction) {

-

-			Abstraction element = (Abstraction) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Copy.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java
deleted file mode 100644
index b88f0de6593..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Abstraction} is a {@link DeriveReqt}

- */

-public class DeriveReqtMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Abstraction) {

-

-			Abstraction element = (Abstraction) eObject;

-			if (UMLUtil.getStereotypeApplication(element, DeriveReqt.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java
deleted file mode 100644
index 479f2fcc8a0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link InstanceSpecification} is a {@link Dimension}

- */

-public class DimensionMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof InstanceSpecification) {

-

-			InstanceSpecification element = (InstanceSpecification) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Dimension.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInMatcher.java
deleted file mode 100644
index 2aaa65be6ed..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInMatcher.java
+++ /dev/null
@@ -1,40 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Port} is a {@link FlowPort} with IN direction

- */

-public class FlowPortInMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isFlowPort_IN = false;

-

-		if (eObject instanceof Port) {

-

-			Port port = (Port) eObject;

-			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

-

-			if ((flowPort != null) && (flowPort.getDirection() == FlowDirection.IN)) {

-				isFlowPort_IN = true;

-			}

-		}

-

-		return isFlowPort_IN;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInOutMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInOutMatcher.java
deleted file mode 100644
index 3ae4e13f393..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortInOutMatcher.java
+++ /dev/null
@@ -1,40 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Port} is a {@link FlowPort} with INOUT direction

- */

-public class FlowPortInOutMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isFlowPort_INOUT = false;

-

-		if (eObject instanceof Port) {

-

-			Port port = (Port) eObject;

-			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

-

-			if ((flowPort != null) && (flowPort.getDirection() == FlowDirection.INOUT)) {

-				isFlowPort_INOUT = true;

-			}

-		}

-

-		return isFlowPort_INOUT;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortMatcher.java
deleted file mode 100644
index e5411ac7f52..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Port} is a {@link FlowPort}

- */

-public class FlowPortMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isFlowPort = false;

-		if (eObject instanceof Port) {

-

-			Port port = (Port) eObject;

-			if (UMLUtil.getStereotypeApplication(port, FlowPort.class) != null) {

-				isFlowPort = true;

-			}

-		}

-		return isFlowPort;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortNAMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortNAMatcher.java
deleted file mode 100644
index 100b21b739f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortNAMatcher.java
+++ /dev/null
@@ -1,39 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Port} is a non atomic {@link FlowPort}.

- */

-public class FlowPortNAMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isFlowPort_NA = false;

-

-		if (eObject instanceof Port) {

-

-			Port port = (Port) eObject;

-			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

-

-			if ((flowPort != null) && (!flowPort.isAtomic())) {

-				isFlowPort_NA = true;

-			}

-		}

-

-		return isFlowPort_NA;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortOutMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortOutMatcher.java
deleted file mode 100644
index 9de3c167516..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPortOutMatcher.java
+++ /dev/null
@@ -1,40 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Port} is a {@link FlowPort} with OUT direction

- */

-public class FlowPortOutMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isFlowPort_OUT = false;

-

-		if (eObject instanceof Port) {

-

-			Port port = (Port) eObject;

-			FlowPort flowPort = UMLUtil.getStereotypeApplication(port, FlowPort.class);

-

-			if ((flowPort != null) && (flowPort.getDirection() == FlowDirection.OUT)) {

-				isFlowPort_OUT = true;

-			}

-		}

-

-		return isFlowPort_OUT;

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPropertyMatcher.java
deleted file mode 100644
index d275b7603f3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowPropertyMatcher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Esterel technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Alain Le Guennec (Esterel technologies SAS) - Bug 497455
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.matcher;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Test if current {@link Property} is a {@link FlowProperty}
- */
-public class FlowPropertyMatcher implements IElementMatcher {
-
-	public boolean matches(EObject eObject) {
-
-		boolean isFlowProperty = false;
-		if (eObject instanceof Property) {
-
-			Property element = (Property) eObject;
-			Element owner = (Element) element.eContainer();
-			if ((owner == null || owner instanceof Interface || owner instanceof Class) && UMLUtil.getStereotypeApplication(element, FlowProperty.class) != null) {
-				isFlowProperty = true;
-			}
-		}
-		return isFlowProperty;
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowSpecificationMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowSpecificationMatcher.java
deleted file mode 100644
index 8268b4e4e7f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/FlowSpecificationMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Interface} is a {@link FlowSpecification}

- */

-public class FlowSpecificationMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isFlowSpec = false;

-		if (eObject instanceof Interface) {

-

-			Interface element = (Interface) eObject;

-			if (UMLUtil.getStereotypeApplication(element, FlowSpecification.class) != null) {

-				isFlowSpec = true;

-			}

-		}

-		return isFlowSpec;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java
deleted file mode 100644
index 1e7466038e0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.portandflows.ItemFlow;

-import org.eclipse.uml2.uml.InformationFlow;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link InformationFlow} is a {@link ItemFlow}

- */

-public class ItemFlowMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof InformationFlow) {

-

-			InformationFlow element = (InformationFlow) eObject;

-			if (UMLUtil.getStereotypeApplication(element, ItemFlow.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/NoMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/NoMatcher.java
deleted file mode 100644
index 1f5c4f2c1e5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/NoMatcher.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-

-/**

- * This matcher can be used to avoid {@link IElementType} to interfere in commands.

- */

-public class NoMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-		return false;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/PartPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/PartPropertyMatcher.java
deleted file mode 100644
index b5c8fcd79ea..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/PartPropertyMatcher.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Esterel technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Alain Le Guennec (Esterel technologies SAS) - Bug 497455
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.matcher;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Test if current {@link Property} is a {@link Block} Part
- */
-public class PartPropertyMatcher implements IElementMatcher {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-
-		boolean isMatch = false;
-		if ((eObject instanceof Property) && !(eObject instanceof Port)) {
-
-			Property element = (Property) eObject;
-
-			// The property is necessary a composition and has a type
-			Type type = element.getType();
-			if ((type != null) && (element.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {
-	
-				// Moreover its type has to be a Block
-				if (type instanceof Class && UMLUtil.getStereotypeApplication(type, Block.class) != null) {
-					isMatch = true;
-				}
-			}
-		}
-		return isMatch;
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java
deleted file mode 100644
index e106e83044b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.modelelements.Problem;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Comment} is a {@link Problem}

- */

-public class ProblemMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Comment) {

-

-			Comment element = (Comment) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Problem.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java
deleted file mode 100644
index ba129dd61a8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.modelelements.Rationale;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Comment} is a {@link Rationale}

- */

-public class RationaleMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Comment) {

-

-			Comment element = (Comment) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Rationale.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ReferencePropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ReferencePropertyMatcher.java
deleted file mode 100644
index bddd9226b79..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ReferencePropertyMatcher.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Esterel technologies SAS and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   Alain Le Guennec (Esterel technologies SAS) - Bug 497455
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.matcher;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Test if current {@link Property} is a {@link Block} Reference
- */
-public class ReferencePropertyMatcher implements IElementMatcher {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-
-		boolean isMatch = false;
-		if ((eObject instanceof Property) && !(eObject instanceof Port)) {
-
-			Property element = (Property) eObject;
-
-			// The property is not a composition and has a type
-			Type type = element.getType();
-			if ((type != null) && (element.getAggregation() != AggregationKind.COMPOSITE_LITERAL)) {
-
-				// Moreover its type has to be a Block
-				if (type instanceof Class && UMLUtil.getStereotypeApplication(type, Block.class) != null) {
-					isMatch = true;
-				}
-			}
-		}
-		return isMatch;
-	}
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RequirementMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RequirementMatcher.java
deleted file mode 100644
index d30d2745113..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RequirementMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Class} is a {@link Requirement}

- */

-public class RequirementMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Class) {

-

-			Class element = (Class) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Requirement.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java
deleted file mode 100644
index 1e11e82ccf4..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Abstraction} is a {@link Satisfy}

- */

-public class SatisfyMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Abstraction) {

-

-			Abstraction element = (Abstraction) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Satisfy.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java
deleted file mode 100644
index a7afda41799..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link InstanceSpecification} is a {@link Unit}

- */

-public class UnitMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof InstanceSpecification) {

-

-			InstanceSpecification element = (InstanceSpecification) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Unit.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValuePropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValuePropertyMatcher.java
deleted file mode 100644
index 5ebf3f74c1d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValuePropertyMatcher.java
+++ /dev/null
@@ -1,51 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-import org.eclipse.uml2.uml.AggregationKind;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Property} is a value.

- */

-public class ValuePropertyMatcher implements IElementMatcher {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if ((eObject instanceof Property) && !(eObject instanceof Port)) {

-

-			Property element = (Property) eObject;

-

-			// The property is necessary a composition and has a type

-			if ((element.getType() != null) && (element.getAggregation() == AggregationKind.COMPOSITE_LITERAL)) {

-

-				// Moreover its type has either to be a DataType or a ValueType

-				if (UMLUtil.getStereotypeApplication(element.getType(), ValueType.class) != null) {

-					isMatch = true;

-				}

-				if (element.getType() instanceof DataType) {

-					isMatch = true;

-				}

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java
deleted file mode 100644
index 5b98c8073ba..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Enumeration} is a {@link ValueType}

- */

-public class ValueTypeEnumerationMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Enumeration) {

-

-			Enumeration element = (Enumeration) eObject;

-			if (UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java
deleted file mode 100644
index 48aae2bc7d7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link DataType} is a {@link ValueType}

- */

-public class ValueTypeMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof DataType) {

-

-			DataType element = (DataType) eObject;

-			if (UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java
deleted file mode 100644
index b61e4cfd6b3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link PrimitiveType} is a {@link ValueType}

- */

-public class ValueTypePrimitiveTypeMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof PrimitiveType) {

-

-			PrimitiveType element = (PrimitiveType) eObject;

-			if (UMLUtil.getStereotypeApplication(element, ValueType.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java
deleted file mode 100644
index e3f67bf23a4..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-import org.eclipse.uml2.uml.Abstraction;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Abstraction} is a {@link Verify}

- */

-public class VerifyMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Abstraction) {

-

-			Abstraction element = (Abstraction) eObject;

-			if (UMLUtil.getStereotypeApplication(element, Verify.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java
deleted file mode 100644
index 0a732ebd188..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.modelelements.View;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link Package} is a {@link View}

- */

-public class ViewMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Package) {

-

-			Package element = (Package) eObject;

-			if (UMLUtil.getStereotypeApplication(element, View.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java
deleted file mode 100644
index b917cce651a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java
+++ /dev/null
@@ -1,36 +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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * Test if current {@link org.eclipse.uml2.uml.Class} is a {@link ViewPoint}

- */

-public class ViewPointMatcher implements IElementMatcher {

-

-	public boolean matches(EObject eObject) {

-

-		boolean isMatch = false;

-		if (eObject instanceof Class) {

-

-			Class element = (Class) eObject;

-			if (UMLUtil.getStereotypeApplication(element, ViewPoint.class) != null) {

-				isMatch = true;

-			}

-		}

-		return isMatch;

-	}

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java
deleted file mode 100644
index 474529c8aa7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/menu/AbstractCreateSysmlChildMenu.java
+++ /dev/null
@@ -1,32 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.service.types.menu;

-

-import org.eclipse.papyrus.infra.ui.util.AbstractCreateMenuFromCommandCategory;

-

-

-/**

- * Abstract menu for the creation of Sysml elements

- */

-public abstract class AbstractCreateSysmlChildMenu extends AbstractCreateMenuFromCommandCategory {

-

-	/** the cateogory of the command used to create SysML elements */

-	public static final String SYSML_CREATION_COMMAND_CATEGORY = "org.eclipse.papyrus.sysml.service.types.sysmlElementCreationCommands"; //$NON-NLS-1$

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public AbstractCreateSysmlChildMenu() {

-		super(SYSML_CREATION_COMMAND_CATEGORY);

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/stereotype/helper/advice/BlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/stereotype/helper/advice/BlockEditHelperAdvice.java
deleted file mode 100644
index 92b2c05be9e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/stereotype/helper/advice/BlockEditHelperAdvice.java
+++ /dev/null
@@ -1,134 +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.sysml.service.types.stereotype.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.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.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * <pre>

- * This advice is used to remove inconsistent {@link Connector} when a related {@link Block}

- * is set as encapsulated ({@link Block#isEncapsulated()} property).

- * </pre>

- */

-public class BlockEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * <pre>

-	 * {@inheritDoc}

-	 * 

-	 * Returns the command to destroy any {@link Connector} breaking encapsulation rules.

-	 * </pre>

-	 *

-	 * @param request

-	 *            the request to modify the model

-	 * @return

-	 *         the command to destroy the views of the parts which are not owned by the new type

-	 *

-	 */

-	@Override

-	protected ICommand getBeforeSetCommand(SetRequest request) {

-		ICommand setCommand = super.getBeforeSetCommand(request);

-		Set<Connector> connectorToDelete = new HashSet<Connector>();

-

-		EObject elementToEdit = request.getElementToEdit();

-		if ((elementToEdit instanceof Block) && (request.getFeature() == BlocksPackage.eINSTANCE.getBlock_IsEncapsulated())) {

-

-			Block blockApp = (Block) elementToEdit;

-			Boolean setAsEncapsulated = (request.getValue() instanceof Boolean) ? (Boolean) request.getValue() : false;

-			if (!blockApp.isEncapsulated() && setAsEncapsulated) {

-

-				for (Property property : getPropertyTypedByBlock(blockApp)) {

-					for (NestedConnectorEnd nestedEnd : getRelatedNestedConnectorEnd(property)) {

-						ConnectorEnd end = nestedEnd.getBase_ConnectorEnd();

-						Connector connector = (end != null) ? (Connector) end.eContainer() : null;

-						if (connector != null) {

-							connectorToDelete.add(connector);

-						}

-					}

-				}

-			}

-		}

-

-		// Add connector destroy command if needed

-		if (!(connectorToDelete.isEmpty())) {

-			DestroyDependentsRequest req = new DestroyDependentsRequest(request.getEditingDomain(), elementToEdit, false);

-			req.setClientContext(request.getClientContext());

-			req.addParameters(request.getParameters());

-			ICommand connectorDestroyCommand = req.getDestroyDependentsCommand(connectorToDelete);

-			if (connectorDestroyCommand != null) {

-				setCommand = CompositeCommand.compose(connectorDestroyCommand, setCommand);

-			}

-		}

-

-		return setCommand;

-	}

-

-	/**

-	 * Get any {@link Property} typed by the given {@link Block} (its base class).

-	 *

-	 * @param block

-	 *            the block.

-	 * @return a collection of {@link Property}

-	 */

-	private Collection<Property> getPropertyTypedByBlock(Block block) {

-		EReference[] eRefs = new EReference[] { UMLPackage.eINSTANCE.getTypedElement_Type() };

-

-		Collection<?> references = EMFCoreUtil.getReferencers(block.getBase_Class(), eRefs);

-		List<Property> propertyReferences = new LinkedList<Property>();

-		for (Object reference : references) {

-			if (reference instanceof Property) {

-				propertyReferences.add((Property) reference);

-			}

-		}

-

-		return propertyReferences;

-	}

-

-	/**

-	 * Get any {@link NestedConnectorEnd} stereotype application that holds the property in its path.

-	 *

-	 * @param property

-	 *            the property that should be in the path.

-	 * @return a collection of {@link NestedConnectorEnd}

-	 */

-	@SuppressWarnings("unchecked")

-	private Collection<NestedConnectorEnd> getRelatedNestedConnectorEnd(Property property) {

-		EReference[] eRefs = new EReference[] { BlocksPackage.eINSTANCE.getNestedConnectorEnd_PropertyPath() };

-

-		Collection<NestedConnectorEnd> references = EMFCoreUtil.getReferencers(property, eRefs);

-		return (references != null) ? references : Collections.unmodifiableList(new ArrayList<NestedConnectorEnd>());

-	}

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
deleted file mode 100644
index 3d91efa7de2..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
+++ /dev/null
@@ -1,505 +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
- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
-import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.TypedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Utility class for Connector edit helpers.
- */
-public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.ConnectorUtils {
-
-	/**
-	 * the key used to store the nested path as parameter of the request. The value will be a List of {@link Property}
-	 */
-	public static String NESTED_CONNECTOR_END_PATH = "connectorEndPath"; //$NON-NLS-1$
-
-	/** the separator used in the role path to distinguish the part. */
-	public static final String PART_SEPARATOR = "."; //$NON-NLS-1$
-
-	/** allow to know if a string contains others characters than a-z A-Z 0-9 and _. */
-	public static final String HAS_NO_WORD_CHAR_REGEX = "\\W+";
-
-	/** String used to delimit a name with contains special chars. */
-	public static final String STRING_DELIMITER = "\'";
-
-	/**
-	 * Gets the encapsulated container.
-	 *
-	 * @param view
-	 *            the view
-	 * @return the nearest encapsulated structure container or null
-	 */
-	public View getEncapsulatedContainer(View view) {
-		View encapsulatedContainer = null;
-
-		for (View containerView : getStructureContainers(view)) {
-
-			if (view == containerView) {
-				continue;
-			}
-
-			if ((view.getElement() instanceof Port) && (containerView.getChildren().contains(view))) {
-				continue;
-			}
-
-			StructuredClassifier structuredClassifier = getStructuredClassifier(containerView);
-			Block block = UMLUtil.getStereotypeApplication(structuredClassifier, Block.class);
-			if (block.isEncapsulated()) {
-				encapsulatedContainer = containerView;
-				break;
-			}
-		}
-
-		return encapsulatedContainer;
-	}
-
-	/**
-	 * Test if an encapsulation crossing is required to connect the checked end to the opposite end.
-	 *
-	 * @param checkedEnd
-	 *            the checked end view.
-	 * @param oppositeEnd
-	 *            the opposite end view.
-	 * @return true if the gesture break encapsulation rule.
-	 */
-	public boolean isCrossingEncapsulation(View checkedEnd, View oppositeEnd) {
-		boolean isCrossingEncapsulation = false;
-
-		View encapsulatedContainer = new ConnectorUtils().getEncapsulatedContainer(checkedEnd);
-		if (encapsulatedContainer != null) {
-			View containerView = new ConnectorUtils().deduceViewContainer(checkedEnd, oppositeEnd);
-			List<View> containers = new ConnectorUtils().getStructureContainers(checkedEnd);
-
-			if (containers.indexOf(encapsulatedContainer) < containers.indexOf(containerView)) {
-				isCrossingEncapsulation = true;
-			}
-		}
-
-		return isCrossingEncapsulation;
-	}
-
-	/**
-	 * Get the path of structure views crossed by the checked end.
-	 *
-	 * @param checkedEnd
-	 *            the checked end view.
-	 * @param oppositeEnd
-	 *            the opposite end view.
-	 * @return the list of crossed structure views.
-	 */
-	public List<View> getNestedPath(View checkedEnd, View oppositeEnd) {
-		List<View> isNestedConnectableElement = new ArrayList<View>();
-
-		View nearestContainer = new ConnectorUtils().getNearestStructureContainer(checkedEnd);
-		if (nearestContainer != null) {
-			View containerView = new ConnectorUtils().deduceViewContainer(checkedEnd, oppositeEnd);
-			List<View> containers = new ConnectorUtils().getStructureContainers(checkedEnd);
-
-			if (containers.indexOf(nearestContainer) < containers.indexOf(containerView)) {
-				isNestedConnectableElement = containers.subList(containers.indexOf(nearestContainer), containers.indexOf(containerView));
-			}
-		}
-
-		// nested path is taken from the top block to the deepest property ==> collection must be reverted
-		Collections.reverse(isNestedConnectableElement);
-
-		return isNestedConnectableElement;
-	}
-
-	/**
-	 * Get the path of structure views crossed by the checked end.
-	 *
-	 * @param checkedEnd
-	 *            the checked end view.
-	 * @param oppositeEnd
-	 *            the opposite end view.
-	 * @return the list of crossed structure views.
-	 */
-	public List<Property> getNestedPropertyPath(View checkedEnd, View oppositeEnd) {
-		List<Property> nestedPropertyPath = new ArrayList<Property>();
-		List<View> nestedPath = getNestedPath(checkedEnd, oppositeEnd);
-
-		for (View view : nestedPath) {
-			if ((view.getElement() != null) && (view.getElement() instanceof Property)) {
-				nestedPropertyPath.add((Property) view.getElement());
-			}
-		}
-
-		// if end is a port, and the list is not empty, add the property from the check view in the list
-		if (!nestedPropertyPath.isEmpty() && checkedEnd.getElement() instanceof Port) {
-			Property partWithPort = getPartWithPort(checkedEnd, oppositeEnd);
-			if (partWithPort != null) {
-				nestedPropertyPath.add(partWithPort);
-			}
-		}
-
-		return nestedPropertyPath;
-	}
-
-	/**
-	 * Test if the checked end is nested (means it cross StructuredClassifier borders).
-	 *
-	 * @param checkedEnd
-	 *            the checked end view.
-	 * @param oppositeEnd
-	 *            the opposite end view.
-	 * @return true if the checked end is nested.
-	 */
-	public boolean isNestedConnectableElement(View checkedEnd, View oppositeEnd) {
-		return !(getNestedPath(checkedEnd, oppositeEnd).isEmpty());
-	}
-
-	/**
-	 * Gets the nearest structure container.
-	 *
-	 * @param view
-	 *            the view
-	 * @return the nearest structure container or null
-	 */
-	public View getNearestStructureContainer(View view) {
-		View nearestStructureContainer = null;
-
-		for (View containerView : getStructureContainers(view)) {
-
-			if (view == containerView) {
-				continue;
-			}
-
-			if ((view.getElement() instanceof Port) && (containerView.getChildren().contains(view))) {
-				continue;
-			}
-
-			nearestStructureContainer = containerView;
-			break;
-		}
-
-		return nearestStructureContainer;
-	}
-
-
-
-	/**
-	 * Gets the role path.
-	 *
-	 * @param end
-	 *            the connector end
-	 * @return the role path
-	 *         the path for the role of the connector end (without using label provider)
-	 */
-	public static final String getRolePath(final ConnectorEnd end) {
-		final NestedConnectorEnd nestedConnectorEnd = UMLUtil.getStereotypeApplication(end, NestedConnectorEnd.class);
-		final ConnectableElement role = end.getRole();
-		final StringBuilder rolePath = new StringBuilder();
-		if (role != null) {
-			if (nestedConnectorEnd != null) {
-				final List<Property> properties = nestedConnectorEnd.getPropertyPath();
-				for (final Property current : properties) {
-					rolePath.append(getNameWithQuotes(current));
-					rolePath.append(ConnectorUtils.PART_SEPARATOR);
-				}
-			} else {
-				// when the stereotype is applied, the Property for partWithPort is included in the stereotype#path
-				final Property partWithPort = end.getPartWithPort();
-				if (partWithPort != null) {
-					rolePath.append(getNameWithQuotes(partWithPort));
-					rolePath.append(ConnectorUtils.PART_SEPARATOR);
-				}
-			}
-			rolePath.append(getNameWithQuotes(role));
-		}
-
-		return rolePath.toString();
-	}
-
-	/**
-	 * Gets the name with quotes.
-	 *
-	 * @param property
-	 *            a property
-	 * @return the name with quotes
-	 *         the property name with name delimiter if it is required
-	 */
-	public static final String getNameWithQuotes(final NamedElement property) {
-		final String partName = UMLLabelInternationalization.getInstance().getLabel(property);
-		final StringBuffer partNameBuffer = new StringBuffer();
-		final Pattern pattern = Pattern.compile(ConnectorUtils.HAS_NO_WORD_CHAR_REGEX);
-		final Matcher matcher = pattern.matcher(partName);
-		boolean mustHaveQuote = false;
-		while (matcher.find() && !mustHaveQuote) {
-			mustHaveQuote = true;
-		}
-		if (mustHaveQuote) {
-			partNameBuffer.append(ConnectorUtils.STRING_DELIMITER);
-			partNameBuffer.append(partName);
-			partNameBuffer.append(ConnectorUtils.STRING_DELIMITER);
-		} else {
-			partNameBuffer.append(partName);
-		}
-
-		return partNameBuffer.toString();
-	}
-
-	/**
-	 * Checks if is crossing encapsulation.
-	 *
-	 * @param nestedPath
-	 *            the nested path
-	 * @return true, if is crossing encapsulation <code>true</code> if we are breaking encapsulation (see SysML rules in SysML Standard 1.2, p.44):
-	 *         isEncapsulated: Boolean [0..1] If true, then the block is treated as a black box; a part typed by this black box can only be connected
-	 *         via its ports or directly to its outer boundary. If false, or if a value is not present, then connections can be established to
-	 *         elements of its internal structure via deep-nested connector ends.
-	 */
-	public static final boolean isCrossingEncapuslation(final List<Property> nestedPath) {
-		for (final Property current : nestedPath) {
-			final Type type = current.getType();
-			if (type != null) {
-				final Block block = UMLUtil.getStereotypeApplication(type, Block.class);
-				if (block != null && block.isEncapsulated()) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Can display existing connector between views according to nested paths.
-	 *
-	 * @param connector
-	 *            a connector existing in the model
-	 * @param sourceView
-	 *            a potential source for this connector
-	 * @param targetView
-	 *            a potential target for this connector
-	 * @return true, if successful <code>true</code> if displaying the existing connector between this source and this target view is correct
-	 */
-	public static boolean canDisplayExistingConnectorBetweenViewsAccordingToNestedPaths(final Connector connector, final View sourceView, final View targetView) {
-		ConnectorUtils utils = new ConnectorUtils();
-		final List<Property> sourcePath = utils.getNestedPropertyPath(sourceView, targetView);
-		final List<Property> targetPath = utils.getNestedPropertyPath(targetView, sourceView);
-		boolean hasWantedPath = true;
-		for (final ConnectorEnd end : connector.getEnds()) {
-			if (sourceView != null && end.getRole() == sourceView.getElement()) {
-				hasWantedPath = hasWantedPath && haveSamePath(sourcePath, end);
-			} else if (targetView != null && end.getRole() == targetView.getElement()) {
-				hasWantedPath = hasWantedPath && haveSamePath(targetPath, end);
-			}
-		}
-		return hasWantedPath;
-	}
-
-
-
-	/**
-	 * Have same path.
-	 *
-	 * @param wantedPath
-	 *            the wanted nested path for the end
-	 * @param end
-	 *            an end
-	 * @return true, if successful
-	 *         true if the end has as nested path THE wanted path
-	 */
-	protected static boolean haveSamePath(final List<Property> wantedPath, final ConnectorEnd end) {
-		Stereotype ste = end.getAppliedStereotype("SysML::Blocks::NestedConnectorEnd");//$NON-NLS-1$
-		if (ste != null) {
-			final NestedConnectorEnd nestedConnectorEnd = (NestedConnectorEnd) end.getStereotypeApplication(ste);
-			return nestedConnectorEnd.getPropertyPath().equals(wantedPath);
-		} else {
-			return wantedPath.isEmpty();
-		}
-	}
-
-
-
-	/**
-	 * Can display existing connector between views according to partWithPort.
-	 *
-	 * @param connector
-	 *            the connector
-	 * @param sourceView
-	 *            the source view
-	 * @param targetView
-	 *            the target view
-	 * @return true, if successful
-	 */
-	public boolean canDisplayExistingConnectorBetweenViewsAccordingToPartWithPort(final Connector connector, final View sourceView, final View targetView) {
-		Property partWithPort = getPartWithPortFromConnector(connector);
-		if (partWithPort != null) {
-			String partWithPortName = partWithPort.getName();
-			Type partWithPortType = partWithPort.getType();
-			EObject sourceContainer = ((View) sourceView.eContainer()).getElement();
-			EObject targetContainer = ((View) targetView.eContainer()).getElement();
-
-			boolean sameSourceType = false;
-			if (sourceContainer instanceof TypedElement) {
-				sameSourceType = partWithPortType.conformsTo(((TypedElement) sourceContainer).getType());
-			}
-			boolean sameSourceName = partWithPortName.equals(((NamedElement) sourceContainer).getName());
-
-			boolean sameTargetType = false;
-			if (targetContainer instanceof TypedElement) {
-				sameTargetType = partWithPortType.conformsTo(((TypedElement) targetContainer).getType());
-			}
-			boolean sametargetName = partWithPortName.equals(((NamedElement) targetContainer).getName());
-
-			return (sameSourceType && sameSourceName) || (sameTargetType && sametargetName);
-		}
-		return true;
-	}
-
-	/**
-	 * Gets the partWithPort from the connector.
-	 *
-	 * @param connector
-	 *            the connector
-	 * @return the part with port from connector
-	 */
-	public Property getPartWithPortFromConnector(final Connector connector) {
-		if (connector != null && connector.getEnds() != null) {
-			for (final ConnectorEnd end : connector.getEnds()) {
-				Property partWithPort = end.getPartWithPort();
-				if (partWithPort != null) {
-					return partWithPort;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Test if the relationship creation is allowed.
-	 *
-	 * @param source
-	 *            the relationship source can be null
-	 * @param target
-	 *            the relationship target can be null
-	 * @param sourceView
-	 *            the relationship graphical source can be null
-	 * @param targetView
-	 *            the relationship graphical target can be null
-	 * @return true if the creation is allowed
-	 */
-	public static boolean canCreate(EObject source, EObject target, View sourceView, View targetView) {
-
-		if ((source != null) && !(source instanceof ConnectableElement)) {
-			return false;
-		}
-
-		if ((target != null) && !(target instanceof ConnectableElement)) {
-			return false;
-		}
-
-		if ((sourceView != null) && (targetView != null)) {
-			// Allow to create a self connector on a view
-			// if(sourceView == targetView) {
-			// return false;
-			// }
-
-			// Cannot create a connector from a view representing a Part to its own Port (or the opposite)
-			if ((sourceView.getChildren().contains(targetView)) || (targetView.getChildren().contains(sourceView))) {
-				return false;
-			}
-
-			// Cannot connect a Part to one of its (possibly indirect) containment, must connect to one of its Port.
-			if (new ConnectorUtils().getStructureContainers(sourceView).contains(targetView) || new ConnectorUtils().getStructureContainers(targetView).contains(sourceView)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-
-
-	/**
-	 * Filter connectors that have this property in their <NestedConnectorEnd> property path.
-	 *
-	 * @param connectors
-	 * @param part
-	 * @return connectors that have this property in their <NestedConnectorEnd> property path.
-	 */
-	public static List<Connector> filterConnectorByPropertyInNestedConnectorEnd(List<Connector> connectors, Property part) {
-		List<Connector> res = new ArrayList<Connector>();
-		for (Connector connector : connectors) {
-			EList<ConnectorEnd> ends = connector.getEnds();
-			for (ConnectorEnd connectorEnd : ends) {
-				NestedConnectorEnd stereotypeApplication = UMLUtil.getStereotypeApplication(connectorEnd, NestedConnectorEnd.class);
-				if (stereotypeApplication != null) {
-					EList<Property> propertyPath = stereotypeApplication.getPropertyPath();
-					for (Property property : propertyPath) {
-						if (property.equals(part)) {
-							res.add(connector);
-						}
-					}
-				}
-			}
-		}
-		return res;
-	}
-
-	/**
-	 * Filter connectors that have this property in their <NestedConnectorEnd> property path.
-	 *
-	 * @param inverseReferences
-	 *            All the references towards part
-	 * @param part
-	 *
-	 * @return connectors that have this property in their <NestedConnectorEnd> property path.
-	 */
-	public static List<Connector> filterConnectorByPropertyInNestedConnectorEnd(Collection<Setting> inverseReferences, Property part) {
-		Set<Connector> result = new HashSet<Connector>();
-		for (Setting setting : inverseReferences) {
-			EObject referent = setting.getEObject();
-			if (referent instanceof NestedConnectorEnd) {
-				NestedConnectorEnd stereotypeApplication = (NestedConnectorEnd) referent;
-				if (stereotypeApplication.getPropertyPath().contains(part)) {
-					ConnectorEnd end = stereotypeApplication.getBase_ConnectorEnd();
-					if (end != null && end.getOwner() instanceof Connector) {
-						result.add((Connector) end.getOwner());
-					}
-				}
-			}
-		}
-		return new ArrayList<Connector>(result);
-	}
-
-
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml
deleted file mode 100644
index 3fadbebcf8e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- SysML ElementTypes declarations -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-
-	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-	
-	<!-- Declaration of IElementTypes -->
-	
-	<!-- ISpecializationType Allocate of UML::Abstraction -->
-	<specializationType id="org.eclipse.papyrus.sysml.Allocate" name="SysML::Allocate"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Allocate"/>
-		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Association of UML::AssociationBase -->
-	<specializationType id="org.eclipse.papyrus.sysml.Association" name="SysML::Association"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Association"/>
-		<specializes id="org.eclipse.papyrus.uml.AssociationBase" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.AssociationMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType AssociationComposite of SysML::Association -->
-	<specializationType id="org.eclipse.papyrus.sysml.AssociationComposite" name="SysML::AssociationComposite"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::AssociationComposite"/>
-		<specializes id="org.eclipse.papyrus.sysml.Association" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType AssociationCompositeDirected of SysML::Association -->
-	<specializationType id="org.eclipse.papyrus.sysml.AssociationCompositeDirected" name="SysML::AssociationCompositeDirected"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::AssociationCompositeDirected"/>
-		<specializes id="org.eclipse.papyrus.sysml.Association" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType AssociationNone of SysML::Association -->
-	<specializationType id="org.eclipse.papyrus.sysml.AssociationNone" name="SysML::AssociationNone"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::AssociationNone"/>
-		<specializes id="org.eclipse.papyrus.sysml.Association" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType AssociationNoneDirected of SysML::Association -->
-	<specializationType id="org.eclipse.papyrus.sysml.AssociationNoneDirected" name="SysML::AssociationNoneDirected"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneDirectedEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::AssociationNoneDirected"/>
-		<specializes id="org.eclipse.papyrus.sysml.Association" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType AssociationShared of SysML::Association -->
-	<specializationType id="org.eclipse.papyrus.sysml.AssociationShared" name="SysML::AssociationShared"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::AssociationShared"/>
-		<specializes id="org.eclipse.papyrus.sysml.Association" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType AssociationSharedDirected of SysML::Association -->
-	<specializationType id="org.eclipse.papyrus.sysml.AssociationSharedDirected" name="SysML::AssociationSharedDirected"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::AssociationSharedDirected"/>
-		<specializes id="org.eclipse.papyrus.sysml.Association" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Block of UML::Class -->
-	<specializationType id="org.eclipse.papyrus.sysml.Block" name="SysML::Block"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Block"/>
-		<specializes id="org.eclipse.papyrus.uml.Class" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Conform of UML::Dependency -->
-	<specializationType id="org.eclipse.papyrus.sysml.Conform" name="SysML::Conform"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Conform"/>
-		<specializes id="org.eclipse.papyrus.uml.Dependency" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ConstraintBlock of UML::Class -->
-	<specializationType id="org.eclipse.papyrus.sysml.ConstraintBlock" name="SysML::ConstraintBlock"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ConstraintBlock"/>
-		<specializes id="org.eclipse.papyrus.uml.Class" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ConstraintProperty of UML::Property -->
-	<specializationType id="org.eclipse.papyrus.sysml.ConstraintProperty" name="SysML::ConstraintProperty"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ConstraintProperty"/>
-		<specializes id="org.eclipse.papyrus.uml.Property" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Copy of UML::Abstraction -->
-	<specializationType id="org.eclipse.papyrus.sysml.Copy" name="SysML::Copy"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Copy"/>
-		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType DeriveReqt of UML::Abstraction -->
-	<specializationType id="org.eclipse.papyrus.sysml.DeriveReqt" name="SysML::DeriveReqt"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::DeriveReqt"/>
-		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Dimension of UML::InstanceSpecification -->
-	<specializationType id="org.eclipse.papyrus.sysml.Dimension" name="SysML::Dimension"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Dimension"/>
-		<specializes id="org.eclipse.papyrus.uml.InstanceSpecification" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType FlowPort of UML::Port -->
-	<specializationType id="org.eclipse.papyrus.sysml.FlowPort" name="SysML::FlowPort"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::FlowPort"/>
-		<specializes id="org.eclipse.papyrus.uml.Port" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType FlowPort_InOut of SysML::FlowPort -->
-	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_InOut" name="SysML::FlowPort_InOut"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::FlowPort_InOut"/>
-		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType FlowPort_In of SysML::FlowPort -->
-	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_In" name="SysML::FlowPort_In"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::FlowPort_In"/>
-		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType FlowPort_Out of SysML::FlowPort -->
-	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_Out" name="SysML::FlowPort_Out"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::FlowPort_Out"/>
-		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType FlowPort_NA of SysML::FlowPort -->
-	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_NA" name="SysML::FlowPort_NA"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortNAEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::FlowPort_NA"/>
-		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType FlowProperty of UML::Property -->
-	<specializationType id="org.eclipse.papyrus.sysml.FlowProperty" name="SysML::FlowProperty"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::FlowProperty"/>
-		<specializes id="org.eclipse.papyrus.uml.Property" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType FlowSpecification of UML::Interface -->
-	<specializationType id="org.eclipse.papyrus.sysml.FlowSpecification" name="SysML::FlowSpecification"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::FlowSpecification"/>
-		<specializes id="org.eclipse.papyrus.uml.Interface" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ItemFlow of UML::InformationFlow -->
-	<specializationType id="org.eclipse.papyrus.sysml.ItemFlow" name="SysML::ItemFlow"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ItemFlow"/>
-		<specializes id="org.eclipse.papyrus.uml.InformationFlow" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType PartProperty of UML::Property -->
-	<specializationType id="org.eclipse.papyrus.sysml.PartProperty" name="SysML::PartProperty"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.PartPropertyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::PartProperty"/>
-		<specializes id="org.eclipse.papyrus.uml.Property" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Problem of UML::Comment -->
-	<specializationType id="org.eclipse.papyrus.sysml.Problem" name="SysML::Problem"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Problem"/>
-		<specializes id="org.eclipse.papyrus.uml.Comment" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Rationale of UML::Comment -->
-	<specializationType id="org.eclipse.papyrus.sysml.Rationale" name="SysML::Rationale"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Rationale"/>
-		<specializes id="org.eclipse.papyrus.uml.Comment" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ReferenceProperty of UML::Property -->
-	<specializationType id="org.eclipse.papyrus.sysml.ReferenceProperty" name="SysML::ReferenceProperty"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ReferencePropertyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ReferenceProperty"/>
-		<specializes id="org.eclipse.papyrus.uml.Property" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Requirement of UML::Class -->
-	<specializationType id="org.eclipse.papyrus.sysml.Requirement" name="SysML::Requirement"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Requirement"/>
-		<specializes id="org.eclipse.papyrus.uml.Class" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Satisfy of UML::Abstraction -->
-	<specializationType id="org.eclipse.papyrus.sysml.Satisfy" name="SysML::Satisfy"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Satisfy"/>
-		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Unit of UML::InstanceSpecification -->
-	<specializationType id="org.eclipse.papyrus.sysml.Unit" name="SysML::Unit"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Unit"/>
-		<specializes id="org.eclipse.papyrus.uml.InstanceSpecification" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ValueProperty of UML::Property -->
-	<specializationType id="org.eclipse.papyrus.sysml.ValueProperty" name="SysML::ValueProperty"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValuePropertyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ValueProperty"/>
-		<specializes id="org.eclipse.papyrus.uml.Property" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ValueType of UML::DataType -->
-	<specializationType id="org.eclipse.papyrus.sysml.ValueType" name="SysML::ValueType"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ValueType"/>
-		<specializes id="org.eclipse.papyrus.uml.DataType" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ValueType_Enumeration of UML::Enumeration -->
-	<specializationType id="org.eclipse.papyrus.sysml.ValueType_Enumeration" name="SysML::ValueType_Enumeration"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ValueType_Enumeration"/>
-		<specializes id="org.eclipse.papyrus.uml.Enumeration" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ValueType_PrimitiveType of UML::PrimitiveType -->
-	<specializationType id="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" name="SysML::ValueType_PrimitiveType"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ValueType_PrimitiveType"/>
-		<specializes id="org.eclipse.papyrus.uml.PrimitiveType" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType Verify of UML::Abstraction -->
-	<specializationType id="org.eclipse.papyrus.sysml.Verify" name="SysML::Verify"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::Verify"/>
-		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType View of UML::Package -->
-	<specializationType id="org.eclipse.papyrus.sysml.View" name="SysML::View"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/View.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::View"/>
-		<specializes id="org.eclipse.papyrus.uml.Package" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher" />
-	</specializationType>
-	
-	<!-- ISpecializationType ViewPoint of UML::Class -->
-	<specializationType id="org.eclipse.papyrus.sysml.ViewPoint" name="SysML::ViewPoint"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice"
-		icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
-			<param name="semanticHint" value="SysML::ViewPoint"/>
-		<specializes id="org.eclipse.papyrus.uml.Class" />
-		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher" />
-	</specializationType>
-	
-	</metamodel>
-</extension>
-
-<!-- Helper advice declarations -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-
-	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-	
-	<!-- Helper advice for Property -->
-	<adviceBinding id="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice"
-		class="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockPropertyEditHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Property">
-	</adviceBinding>
-	
-	<!-- Helper advice for Classifier -->
-	<adviceBinding id="org.eclipse.papyrus.sysml.advice.Classifier"
-		class="org.eclipse.papyrus.sysml.service.types.helper.advice.ClassifierEditHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Classifier">
-	</adviceBinding>
-	
-	<!-- Helper advice for Property -->
-	<adviceBinding id="org.eclipse.papyrus.sysml.advice.Property"
-		class="org.eclipse.papyrus.sysml.service.types.helper.advice.PropertyEditHelperAdvice"
-		inheritance="all" typeId="org.eclipse.papyrus.uml.Property">
-	</adviceBinding>
-	
-	</metamodel>
-</extension>
-
-<!-- SysML ElementType bindings to Papyrus shared IClientContext -->
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-
-	<!-- Bindings declaration -->
-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
-	
-		<elementType ref="org.eclipse.papyrus.sysml.Allocate" />
-		<elementType ref="org.eclipse.papyrus.sysml.Association" />
-		<elementType ref="org.eclipse.papyrus.sysml.AssociationComposite" />
-		<elementType ref="org.eclipse.papyrus.sysml.AssociationCompositeDirected" />
-		<elementType ref="org.eclipse.papyrus.sysml.AssociationNone" />
-		<elementType ref="org.eclipse.papyrus.sysml.AssociationNoneDirected" />
-		<elementType ref="org.eclipse.papyrus.sysml.AssociationShared" />
-		<elementType ref="org.eclipse.papyrus.sysml.AssociationSharedDirected" />
-		<elementType ref="org.eclipse.papyrus.sysml.Block" />
-		<elementType ref="org.eclipse.papyrus.sysml.Conform" />
-		<elementType ref="org.eclipse.papyrus.sysml.ConstraintBlock" />
-		<elementType ref="org.eclipse.papyrus.sysml.ConstraintProperty" />
-		<elementType ref="org.eclipse.papyrus.sysml.Copy" />
-		<elementType ref="org.eclipse.papyrus.sysml.DeriveReqt" />
-		<elementType ref="org.eclipse.papyrus.sysml.Dimension" />
-		<elementType ref="org.eclipse.papyrus.sysml.FlowPort" />
-		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_InOut" />
-		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_In" />
-		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_Out" />
-		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_NA" />
-		<elementType ref="org.eclipse.papyrus.sysml.FlowProperty" />
-		<elementType ref="org.eclipse.papyrus.sysml.FlowSpecification" />
-		<elementType ref="org.eclipse.papyrus.sysml.ItemFlow" />
-		<elementType ref="org.eclipse.papyrus.sysml.PartProperty" />
-		<elementType ref="org.eclipse.papyrus.sysml.Problem" />
-		<elementType ref="org.eclipse.papyrus.sysml.Rationale" />
-		<elementType ref="org.eclipse.papyrus.sysml.ReferenceProperty" />
-		<elementType ref="org.eclipse.papyrus.sysml.Requirement" />
-		<elementType ref="org.eclipse.papyrus.sysml.Satisfy" />
-		<elementType ref="org.eclipse.papyrus.sysml.Unit" />
-		<elementType ref="org.eclipse.papyrus.sysml.ValueProperty" />
-		<elementType ref="org.eclipse.papyrus.sysml.ValueType" />
-		<elementType ref="org.eclipse.papyrus.sysml.ValueType_Enumeration" />
-		<elementType ref="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" />
-		<elementType ref="org.eclipse.papyrus.sysml.Verify" />
-		<elementType ref="org.eclipse.papyrus.sysml.View" />
-		<elementType ref="org.eclipse.papyrus.sysml.ViewPoint" />
-		<advice ref="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice" />
-		<advice ref="org.eclipse.papyrus.sysml.advice.Classifier" />
-		<advice ref="org.eclipse.papyrus.sysml.advice.Property" />
-
-	</binding>
-	
-</extension>
-
-</plugin>
-
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/.classpath b/plugins/sysml/org.eclipse.papyrus.sysml/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/.project b/plugins/sysml/org.eclipse.papyrus.sysml/.project
deleted file mode 100644
index 03fda280b61..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
deleted file mode 100644
index bdab799af10..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,46 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.papyrus.sysml,
- org.eclipse.papyrus.sysml.activities,
- org.eclipse.papyrus.sysml.activities.internal.impl,
- org.eclipse.papyrus.sysml.activities.util,
- org.eclipse.papyrus.sysml.allocations,
- org.eclipse.papyrus.sysml.allocations.internal.impl,
- org.eclipse.papyrus.sysml.allocations.util,
- org.eclipse.papyrus.sysml.blocks,
- org.eclipse.papyrus.sysml.blocks.internal.impl,
- org.eclipse.papyrus.sysml.blocks.util,
- org.eclipse.papyrus.sysml.constraints,
- org.eclipse.papyrus.sysml.constraints.internal.impl,
- org.eclipse.papyrus.sysml.constraints.util,
- org.eclipse.papyrus.sysml.interactions,
- org.eclipse.papyrus.sysml.interactions.internal.impl,
- org.eclipse.papyrus.sysml.interactions.util,
- org.eclipse.papyrus.sysml.internal.impl,
- org.eclipse.papyrus.sysml.modelelements,
- org.eclipse.papyrus.sysml.modelelements.internal.impl,
- org.eclipse.papyrus.sysml.modelelements.util,
- org.eclipse.papyrus.sysml.portandflows,
- org.eclipse.papyrus.sysml.portandflows.internal.impl,
- org.eclipse.papyrus.sysml.portandflows.util,
- org.eclipse.papyrus.sysml.requirements,
- org.eclipse.papyrus.sysml.requirements.internal.impl,
- org.eclipse.papyrus.sysml.requirements.util,
- org.eclipse.papyrus.sysml.statemachines,
- org.eclipse.papyrus.sysml.statemachines.internal.impl,
- org.eclipse.papyrus.sysml.statemachines.util,
- org.eclipse.papyrus.sysml.usecases,
- org.eclipse.papyrus.sysml.usecases.internal.impl,
- org.eclipse.papyrus.sysml.usecases.util,
- org.eclipse.papyrus.sysml.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/about.html b/plugins/sysml/org.eclipse.papyrus.sysml/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/build.properties b/plugins/sysml/org.eclipse.papyrus.sysml/build.properties
deleted file mode 100644
index 46f55c761bc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#

-#Mon Sep 12 09:30:13 CEST 2011

-output..=bin/

-bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,libraries/,icons/,about.html

-jars.compile.order=.

-src.includes = about.html

-source..=src/

-bin..=bin/

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLLibrary.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLLibrary.gif
deleted file mode 100644
index bf8bdd59934..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLLibrary.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLModel.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLModel.gif
deleted file mode 100644
index 35ee3e1cbec..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLModel.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLProfile.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLProfile.gif
deleted file mode 100644
index d8c3834e617..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/SysMLProfile.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Block.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Block.gif
deleted file mode 100644
index bc5ab8372bc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Block.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/BlockProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/BlockProperty.gif
deleted file mode 100644
index 0e14c65ba1b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/BlockProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif
deleted file mode 100644
index eb861a0905c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif
deleted file mode 100644
index 33bfb2643a6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif
deleted file mode 100644
index eb5441278bb..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif
deleted file mode 100644
index 3e7750a2cad..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif
deleted file mode 100644
index 7c948e8ed58..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif
deleted file mode 100644
index 1c2c5c231fa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif
deleted file mode 100644
index cd989e8be58..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif
deleted file mode 100644
index a82851f5e4a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/View.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/View.gif
deleted file mode 100644
index 2d874ff442c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/View.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif
deleted file mode 100644
index a1cd28589be..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif
deleted file mode 100644
index 78ed7ce331c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif
deleted file mode 100644
index 6e45798835a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif
deleted file mode 100644
index 78ed7ce331c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif
deleted file mode 100644
index 3fd4b0589b9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif
deleted file mode 100644
index 1b7c2cbf27e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif
deleted file mode 100644
index 77c0e2263b7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_IN.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_IN.gif
deleted file mode 100644
index dcf0b98d3b0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_IN.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_INOUT.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_INOUT.gif
deleted file mode 100644
index 9b24cf5cb14..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_INOUT.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_OUT.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_OUT.gif
deleted file mode 100644
index 16305357052..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_OUT.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif
deleted file mode 100644
index 1df635f4775..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif
deleted file mode 100644
index 31c9dc87412..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif
deleted file mode 100644
index 47caa0b1671..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif
deleted file mode 100644
index 62177483fec..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Refine.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Refine.gif
deleted file mode 100644
index c8d1d8c2f8f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Refine.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif
deleted file mode 100644
index 50618e0067a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif
deleted file mode 100644
index 00848d83b70..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/TestCase.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/TestCase.gif
deleted file mode 100644
index ac296118622..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/TestCase.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Trace.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Trace.gif
deleted file mode 100644
index f4cb0d328fe..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Trace.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif b/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif
deleted file mode 100644
index 2d54efc4f84..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif
+++ /dev/null
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/libraries/SysMLPrimitiveTypes.di2 b/plugins/sysml/org.eclipse.papyrus.sysml/libraries/SysMLPrimitiveTypes.di2
deleted file mode 100644
index 6f7d6b784d3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/libraries/SysMLPrimitiveTypes.di2
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di2:Diagram xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_AmRhALXmEduHWpAaWjM62w" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="Activities">

-  <contained xsi:type="di2:GraphNode" xmi:id="_E76EgLXmEduHWpAaWjM62w" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="116:56" size="146:130">

-    <contained xsi:type="di2:GraphNode" xmi:id="_E8DOcLXmEduHWpAaWjM62w" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-      <contained xsi:type="di2:GraphNode" xmi:id="_HFqmULXmEduHWpAaWjM62w" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_HFqmUbXmEduHWpAaWjM62w" presentation="TextStereotype">

-          <element xsi:type="uml:EnumerationLiteral" href="SysMLPrimitiveTypes.uml#_HFoKELXmEduHWpAaWjM62w"/>

-        </semanticModel>

-      </contained>

-      <contained xsi:type="di2:GraphNode" xmi:id="_HQ4-4LXmEduHWpAaWjM62w" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_HQ4-4bXmEduHWpAaWjM62w" presentation="TextStereotype">

-          <element xsi:type="uml:EnumerationLiteral" href="SysMLPrimitiveTypes.uml#_HQ3wwLXmEduHWpAaWjM62w"/>

-        </semanticModel>

-      </contained>

-    </contained>

-    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_E76EgbXmEduHWpAaWjM62w" presentation="TextStereotype">

-      <element xsi:type="uml:Enumeration" href="SysMLPrimitiveTypes.uml#_E7rbALXmEduHWpAaWjM62w"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di2:GraphNode" xmi:id="_vlkQsLXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="322:56" size="120:130">

-    <property key="PropStereoDisplay" value="SysML::Blocks::ValueType"/>

-    <contained xsi:type="di2:GraphNode" xmi:id="_vly6MLXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>

-    <contained xsi:type="di2:GraphNode" xmi:id="_vlzhQLXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>

-    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_vlkQsbXzEdu94_NE0EO5_A" presentation="TextStereotype">

-      <element xsi:type="uml:DataType" href="SysMLPrimitiveTypes.uml#_vjX4ULXzEdu94_NE0EO5_A"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di2:GraphNode" xmi:id="_xB658LXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="482:56" size="212:130">

-    <property key="PropStereoDisplay" value="SysML::Blocks::ValueType"/>

-    <contained xsi:type="di2:GraphNode" xmi:id="_xB9WMLXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-      <contained xsi:type="di2:GraphNode" xmi:id="_5plTULXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">

-        <property xmi:id="_5plTUrXzEdu94_NE0EO5_A" key="custom_disp" value="254"/>

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_5plTUbXzEdu94_NE0EO5_A" presentation="TextStereotype">

-          <element xsi:type="uml:Property" href="SysMLPrimitiveTypes.uml#_5pho8LXzEdu94_NE0EO5_A"/>

-        </semanticModel>

-      </contained>

-      <contained xsi:type="di2:GraphNode" xmi:id="_5vd44LXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">

-        <property xmi:id="_5vef8LXzEdu94_NE0EO5_A" key="custom_disp" value="254"/>

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_5vd44bXzEdu94_NE0EO5_A" presentation="TextStereotype">

-          <element xsi:type="uml:Property" href="SysMLPrimitiveTypes.uml#_5vcDsLXzEdu94_NE0EO5_A"/>

-        </semanticModel>

-      </contained>

-    </contained>

-    <contained xsi:type="di2:GraphNode" xmi:id="_xB99QLXzEdu94_NE0EO5_A" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>

-    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_xB658bXzEdu94_NE0EO5_A" presentation="TextStereotype">

-      <element xsi:type="uml:DataType" href="SysMLPrimitiveTypes.uml#_xB5r0LXzEdu94_NE0EO5_A"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="116:205" size="146:130">

-    <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-    <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-        <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-        <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-          <element xsi:type="uml:EnumerationLiteral" href="SysMLPrimitiveTypes.uml#_ME10cHUNEd2wL8HwXmHsqA"/>

-        </semanticModel>

-      </contained>

-      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-        <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-        <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-          <element xsi:type="uml:EnumerationLiteral" href="SysMLPrimitiveTypes.uml#_MOh78HUNEd2wL8HwXmHsqA"/>

-        </semanticModel>

-      </contained>

-      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-        <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-        <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-          <element xsi:type="uml:EnumerationLiteral" href="SysMLPrimitiveTypes.uml#_MUVpAHUNEd2wL8HwXmHsqA"/>

-        </semanticModel>

-      </contained>

-      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-        <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-        <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-          <element xsi:type="uml:EnumerationLiteral" href="SysMLPrimitiveTypes.uml#_MYg-YHUNEd2wL8HwXmHsqA"/>

-        </semanticModel>

-      </contained>

-    </contained>

-    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-      <element xsi:type="uml:Enumeration" href="SysMLPrimitiveTypes.uml#_JoVVwHUNEd2wL8HwXmHsqA"/>

-    </semanticModel>

-  </contained>

-  <owner xsi:type="di2:Uml1SemanticModelBridge" xmi:id="_AmRhAbXmEduHWpAaWjM62w">

-    <element xsi:type="uml:Model" href="SysMLPrimitiveTypes.uml#_AnZiYLXmEduHWpAaWjM62w"/>

-  </owner>

-</di2:Diagram>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/libraries/SysMLPrimitiveTypes.uml b/plugins/sysml/org.eclipse.papyrus.sysml/libraries/SysMLPrimitiveTypes.uml
deleted file mode 100644
index dbeb03f88a0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/libraries/SysMLPrimitiveTypes.uml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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: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">

-  <uml:Model xmi:id="_AnZiYLXmEduHWpAaWjM62w" name="SysMLPrimitiveTypes">

-    <ownedComment xmi:id="_FucPQLt5EdueBMWQd1bClA">

-      <body>Copyright (c) 2007 CEA List.&#xD;

-				&#xD;

-				All rights reserved. This

-				program and the accompanying materials&#xD;

-				are made available under

-				the terms of the Eclipse Public License

-				v1.0&#xD;

-				which accompanies

-				this distribution, and is available at&#xD;

-				http://www.eclipse.org/legal/epl-v10.html&#xD;

-				&#xD;

-				Contributors:&#xD;

-				CEA List - initial API and implementation

-			</body>

-    </ownedComment>

-    <packageImport xmi:id="_AnZiYbXmEduHWpAaWjM62w">

-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_E7rbALXmEduHWpAaWjM62w" name="ControlValue">

-      <ownedLiteral xmi:id="_HFoKELXmEduHWpAaWjM62w" name="disable"/>

-      <ownedLiteral xmi:id="_HQ3wwLXmEduHWpAaWjM62w" name="enable"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:DataType" xmi:id="_vjX4ULXzEdu94_NE0EO5_A" name="Real"/>

-    <packagedElement xmi:type="uml:DataType" xmi:id="_xB5r0LXzEdu94_NE0EO5_A" name="Complex">

-      <ownedAttribute xmi:id="_5pho8LXzEdu94_NE0EO5_A" name="realPart" visibility="public" type="_vjX4ULXzEdu94_NE0EO5_A" isUnique="false">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AgtjMLX0Edu94_NE0EO5_A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AgxNkLX0Edu94_NE0EO5_A" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_76JAsLXzEdu94_NE0EO5_A">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_5vcDsLXzEdu94_NE0EO5_A" name="imaginaryPart" visibility="public" type="_vjX4ULXzEdu94_NE0EO5_A" isUnique="false">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BCW3sLX0Edu94_NE0EO5_A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BCZ7ALX0Edu94_NE0EO5_A" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_-Yc2MLXzEdu94_NE0EO5_A">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_JoVVwHUNEd2wL8HwXmHsqA" name="VerdictKind">

-      <ownedLiteral xmi:id="_ME10cHUNEd2wL8HwXmHsqA" name="pass"/>

-      <ownedLiteral xmi:id="_MOh78HUNEd2wL8HwXmHsqA" name="fail"/>

-      <ownedLiteral xmi:id="_MUVpAHUNEd2wL8HwXmHsqA" name="inconclusive"/>

-      <ownedLiteral xmi:id="_MYg-YHUNEd2wL8HwXmHsqA" name="error"/>

-    </packagedElement>

-    <profileApplication xmi:id="_AnZiYrXmEduHWpAaWjM62w">

-      <eAnnotations xmi:id="_AnZiY7XmEduHWpAaWjM62w" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>

-      </eAnnotations>

-      <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-    </profileApplication>

-    <profileApplication xmi:id="_EO0nsKqaEeOxYPLQQ5QgYg">

-      <eAnnotations xmi:id="_EO0nsaqaEeOxYPLQQ5QgYg" 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 href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-  </uml:Model>

-  <Blocks:ValueType xmi:id="_T_ymgLX-EduFmqQsrNB9lw" base_DataType="_vjX4ULXzEdu94_NE0EO5_A"/>

-  <Blocks:ValueType xmi:id="_UrgdALX-EduFmqQsrNB9lw" base_DataType="_xB5r0LXzEdu94_NE0EO5_A"/>

-</xmi:XMI>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/.gitignore b/plugins/sysml/org.eclipse.papyrus.sysml/model/.gitignore
deleted file mode 100644
index 5660c136b46..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/SysML.profile.di
-/SysML.profile.notation
-/SysML.profile.sash
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.genmodel b/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.genmodel
deleted file mode 100644
index 2d8cbef0759..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.genmodel
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"

-    modelDirectory="/org.eclipse.papyrus.sysml/src" modelPluginID="org.eclipse.papyrus.sysml"

-    modelName="SysML" editPluginClass="org.eclipse.papyrus.sysml.provider.SysmlEditPlugin"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.uml2.uml.ecore.importer"

-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.uml.profile.standard/model/Standard.genmodel#//standard ../../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"/>

-    <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>SysML.profile.uml</foreignModel>

-  <genPackages xsi:type="genmodel:GenPackage" prefix="Sysml" basePackage="org.eclipse.papyrus"

-      disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-      ecorePackage="sysml.ecore#/">

-    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//Dummy"/>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Modelelements" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//modelelements">

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//modelelements/Conform">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//modelelements/Conform/base_Dependency"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//modelelements/View">

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//modelelements/View/viewPoint"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//modelelements/View/base_Package"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//modelelements/ViewPoint">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//modelelements/ViewPoint/base_Class"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//modelelements/ViewPoint/stakeHolders"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//modelelements/ViewPoint/purpose"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//modelelements/ViewPoint/concerns"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//modelelements/ViewPoint/languages"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//modelelements/ViewPoint/methods"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//modelelements/Rationale">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//modelelements/Rationale/base_Comment"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//modelelements/Problem">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//modelelements/Problem/base_Comment"/>

-      </genClasses>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Blocks" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//blocks">

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/Block">

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//blocks/Block/isEncapsulated"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/Block/base_Class"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/DistributedProperty">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/DistributedProperty/base_Property"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/Dimension">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/Dimension/base_InstanceSpecification"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/Unit">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/Unit/base_InstanceSpecification"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/Unit/dimension"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/ValueType">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/ValueType/base_DataType"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/ValueType/unit"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/ValueType/dimension"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/NestedConnectorEnd">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/NestedConnectorEnd/propertyPath"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/NestedConnectorEnd/base_ConnectorEnd"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/ParticipantProperty">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/ParticipantProperty/base_Property"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/ParticipantProperty/end"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/ConnectorProperty">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/ConnectorProperty/base_Property"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/ConnectorProperty/connector"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/BindingConnector">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/BindingConnector/base_Connector"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//blocks/PropertySpecificType">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//blocks/PropertySpecificType/base_Classifier"/>

-      </genClasses>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Portandflows" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//portandflows">

-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="sysml.ecore#//portandflows/FlowDirection">

-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="sysml.ecore#//portandflows/FlowDirection/in"/>

-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="sysml.ecore#//portandflows/FlowDirection/out"/>

-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="sysml.ecore#//portandflows/FlowDirection/inout"/>

-      </genEnums>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//portandflows/FlowPort">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//portandflows/FlowPort/base_Port"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" createChild="false"

-            ecoreFeature="ecore:EAttribute sysml.ecore#//portandflows/FlowPort/isAtomic"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//portandflows/FlowPort/isConjugated"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//portandflows/FlowPort/direction"/>

-        <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="sysml.ecore#//portandflows/FlowPort/getIcon"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//portandflows/FlowProperty">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//portandflows/FlowProperty/base_Property"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//portandflows/FlowProperty/direction"/>

-        <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="sysml.ecore#//portandflows/FlowProperty/getIcon"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//portandflows/FlowSpecification">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//portandflows/FlowSpecification/base_Interface"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//portandflows/ItemFlow">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//portandflows/ItemFlow/base_InformationFlow"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//portandflows/ItemFlow/itemProperty"/>

-      </genClasses>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Constraints" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//constraints">

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//constraints/ConstraintBlock"/>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//constraints/ConstraintProperty">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//constraints/ConstraintProperty/base_Property"/>

-      </genClasses>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Activities" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//activities">

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/Optional">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Optional/base_Parameter"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/Rate">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Rate/base_Parameter"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Rate/base_ActivityEdge"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Rate/rate"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/Probability">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Probability/base_ActivityEdge"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Probability/base_ParameterSet"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Probability/probability"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/Continuous"/>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/Discrete"/>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/ControlOperator">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/ControlOperator/base_Operation"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/ControlOperator/base_Behavior"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/NoBuffer">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/NoBuffer/base_ObjectNode"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//activities/Overwrite">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//activities/Overwrite/base_ObjectNode"/>

-      </genClasses>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Allocations" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//allocations">

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//allocations/Allocate">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//allocations/Allocate/base_Abstraction"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//allocations/Allocated">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//allocations/Allocated/base_NamedElement"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//allocations/Allocated/allocatedFrom"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//allocations/Allocated/allocatedTo"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//allocations/AllocateActivityPartition">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//allocations/AllocateActivityPartition/base_ActivityPartition"/>

-      </genClasses>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Requirements" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//requirements">

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/DeriveReqt"/>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/Verify"/>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/Copy"/>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/Satisfy"/>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/TestCase">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//requirements/TestCase/base_Behavior"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//requirements/TestCase/base_Operation"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/TestCase/verifies"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/Requirement">

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//requirements/Requirement/text"/>

-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute sysml.ecore#//requirements/Requirement/id"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/derived"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/derivedFrom"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/satisfiedBy"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/refinedBy"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/tracedTo"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/verifiedBy"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/master"/>

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//requirements/Requirement/base_Class"/>

-      </genClasses>

-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="sysml.ecore#//requirements/RequirementRelated">

-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-            propertySortChoices="true" ecoreFeature="ecore:EReference sysml.ecore#//requirements/RequirementRelated/base_NamedElement"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/RequirementRelated/tracedFrom"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/RequirementRelated/satisfies"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/RequirementRelated/refines"/>

-        <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"

-            createChild="false" ecoreFeature="ecore:EReference sysml.ecore#//requirements/RequirementRelated/verifies"/>

-      </genClasses>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Interactions" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//interactions">

-      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//interactions/Dummy"/>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Statemachines" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//statemachines">

-      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//statemachines/Dummy"/>

-    </nestedGenPackages>

-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Usecases" basePackage="org.eclipse.papyrus.sysml"

-        disposableProviderFactory="true" classPackageSuffix="internal.impl" fileExtensions=""

-        ecorePackage="sysml.ecore#//usecases">

-      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="sysml.ecore#//usecases/Dummy"/>

-    </nestedGenPackages>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml b/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
deleted file mode 100644
index e7e5f3e7678..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
+++ /dev/null
@@ -1,845 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" 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/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">

-  <uml:Profile xmi:id="_TZ_nULU5EduiKqCzJMWbGw" name="SysML" URI="http://www.eclipse.org/papyrus/0.7.0/SysML">

-    <ownedComment xmi:id="_S2RekKGvEdyj2Ya50HPlXg" annotatedElement="_TZ_nULU5EduiKqCzJMWbGw">

-      <body>OMG SysML V1.1 formal/2008-11-02</body>

-    </ownedComment>

-    <packageImport xmi:id="_TZ_nUbU5EduiKqCzJMWbGw">

-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-    </packageImport>

-    <packageImport xmi:id="_BssfwKG1Edyj2Ya50HPlXg">

-      <importedPackage xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-    </packageImport>

-    <packageImport xmi:id="_xyrS0EdKEeGJHdQius5NZA">

-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_Gx8MgLX7EduFmqQsrNB9lw" name="ModelElements" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements">

-      <ownedRule xmi:id="_h4cJsLVAEdu2ieF4ON8UjA" name="Conform_1" constrainedElement="_lsgYkLU9Edu2ieF4ON8UjA">

-        <specification xmi:type="uml:LiteralString" xmi:id="_vgvLYLVAEdu2ieF4ON8UjA" name="constraintBody" value="The supplier/target must be an element stereotyped by &lt;&lt;ViewPoint>>"/>

-      </ownedRule>

-      <ownedRule xmi:id="_ise1wLVAEdu2ieF4ON8UjA" name="Conform_2" constrainedElement="_lsgYkLU9Edu2ieF4ON8UjA">

-        <specification xmi:type="uml:LiteralString" xmi:id="_5gpKELVAEdu2ieF4ON8UjA" name="constraintBody" value="The client/source must be an element stereotyped by &lt;&lt;View>>"/>

-      </ownedRule>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_lsgYkLU9Edu2ieF4ON8UjA" name="Conform">

-        <ownedAttribute xmi:id="_9cxv0LU9Edu2ieF4ON8UjA" name="base_Dependency" isUnique="false" association="_9csQQLU9Edu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>

-        </ownedAttribute>

-        <icon xmi:id="_K8KhEIxREeCeve9iisDgtA" content="" format="" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Conform.gif">

-          <eAnnotations xmi:id="_K8KhEYxREeCeve9iisDgtA" source="image_papyrus">

-            <details xmi:id="_K8KhEoxREeCeve9iisDgtA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_mPGvULU9Edu2ieF4ON8UjA" name="View">

-        <ownedAttribute xmi:id="_3Qho8LU9Edu2ieF4ON8UjA" name="viewPoint" type="_mhSEcLU9Edu2ieF4ON8UjA" isUnique="false" isReadOnly="true" isDerived="true"/>

-        <ownedAttribute xmi:id="_9HrpkLU9Edu2ieF4ON8UjA" name="base_Package" isUnique="false" association="_9Hn_MLU9Edu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-        </ownedAttribute>

-        <icon xmi:id="_HbhE0IxREeCeve9iisDgtA" content="" format="" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/View.gif">

-          <eAnnotations xmi:id="_HbhE0YxREeCeve9iisDgtA" source="image_papyrus">

-            <details xmi:id="_HbhE0oxREeCeve9iisDgtA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_mhSEcLU9Edu2ieF4ON8UjA" name="ViewPoint">

-        <ownedAttribute xmi:id="_89GKMLU9Edu2ieF4ON8UjA" name="base_Class" isUnique="false" association="_889AQLU9Edu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="__VwDoLU9Edu2ieF4ON8UjA" name="stakeHolders" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CoC60LU-Edu2ieF4ON8UjA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CoJBcLU-Edu2ieF4ON8UjA" value="*"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="__lB1wLU9Edu2ieF4ON8UjA" name="purpose" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CYtcELXzEdu94_NE0EO5_A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CYy7oLXzEdu94_NE0EO5_A" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="__s9pwLU9Edu2ieF4ON8UjA" name="concerns" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GLB5YLU-Edu2ieF4ON8UjA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GLE8sLU-Edu2ieF4ON8UjA" value="*"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="__48QQLU9Edu2ieF4ON8UjA" name="languages" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JsAs0LU-Edu2ieF4ON8UjA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JsEXMLU-Edu2ieF4ON8UjA" value="*"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_AEs0ULU-Edu2ieF4ON8UjA" name="methods" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NyO7ULU-Edu2ieF4ON8UjA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NyTz0LU-Edu2ieF4ON8UjA" value="*"/>

-        </ownedAttribute>

-        <icon xmi:id="__ZyqEIxQEeCeve9iisDgtA" content="" format="" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Viewpoint.gif">

-          <eAnnotations xmi:id="__ZyqEYxQEeCeve9iisDgtA" source="image_papyrus">

-            <details xmi:id="__ZyqEoxQEeCeve9iisDgtA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_mwAc8LU9Edu2ieF4ON8UjA" name="Rationale">

-        <ownedAttribute xmi:id="_8w124LU9Edu2ieF4ON8UjA" name="base_Comment" isUnique="false" association="_8wOy4LU9Edu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>

-        </ownedAttribute>

-        <icon xmi:id="_he_gwJaqEd2oqf5htPjXnA" format="" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif">

-          <eAnnotations xmi:id="_iLsOsJaqEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_iLsOsZaqEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_nARGgLU9Edu2ieF4ON8UjA" name="Problem">

-        <ownedAttribute xmi:id="_8fBuILU9Edu2ieF4ON8UjA" name="base_Comment" isUnique="false" association="_8ezEoLU9Edu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>

-        </ownedAttribute>

-        <icon xmi:id="_bMlHgJaqEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif">

-          <eAnnotations xmi:id="_clOVcJaqEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_clOVcZaqEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_8ezEoLU9Edu2ieF4ON8UjA" name="CommentProblem" memberEnd="_8e050LU9Edu2ieF4ON8UjA _8fBuILU9Edu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_8e050LU9Edu2ieF4ON8UjA" name="extension_Problem" type="_nARGgLU9Edu2ieF4ON8UjA" aggregation="composite" association="_8ezEoLU9Edu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_8wOy4LU9Edu2ieF4ON8UjA" name="CommentRationale" memberEnd="_8wQBALU9Edu2ieF4ON8UjA _8w124LU9Edu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_8wQBALU9Edu2ieF4ON8UjA" name="extension_Rationale" type="_mwAc8LU9Edu2ieF4ON8UjA" aggregation="composite" association="_8wOy4LU9Edu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_889AQLU9Edu2ieF4ON8UjA" name="ClassViewPoint" memberEnd="_88-OYLU9Edu2ieF4ON8UjA _89GKMLU9Edu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_88-OYLU9Edu2ieF4ON8UjA" name="extension_ViewPoint" type="_mhSEcLU9Edu2ieF4ON8UjA" aggregation="composite" association="_889AQLU9Edu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_9Hn_MLU9Edu2ieF4ON8UjA" name="PackageView" memberEnd="_9HpNULU9Edu2ieF4ON8UjA _9HrpkLU9Edu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_9HpNULU9Edu2ieF4ON8UjA" name="extension_View" type="_mPGvULU9Edu2ieF4ON8UjA" aggregation="composite" association="_9Hn_MLU9Edu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_9csQQLU9Edu2ieF4ON8UjA" name="DependencyConform" memberEnd="_9cuFcLU9Edu2ieF4ON8UjA _9cxv0LU9Edu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_9cuFcLU9Edu2ieF4ON8UjA" name="extension_Conform" type="_lsgYkLU9Edu2ieF4ON8UjA" aggregation="composite" association="_9csQQLU9Edu2ieF4ON8UjA"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_fSw28LX7EduFmqQsrNB9lw" name="Blocks" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks">

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_8J2A8LVAEdu2ieF4ON8UjA" name="Block">

-        <ownedAttribute xmi:id="__AIRkLVAEdu2ieF4ON8UjA" name="isEncapsulated" visibility="public" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YlBtQLXzEdu94_NE0EO5_A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YlJpELXzEdu94_NE0EO5_A" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_CJ77ILVBEdu2ieF4ON8UjA">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_GdjFYLVBEdu2ieF4ON8UjA" name="base_Class" isUnique="false" association="_GdeM4LVBEdu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-        </ownedAttribute>

-        <icon xmi:id="_YOLAMJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif">

-          <eAnnotations xmi:id="_YvPs8JarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_YvPs8ZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_GdeM4LVBEdu2ieF4ON8UjA" name="ClassBlock" memberEnd="_GdgpILVBEdu2ieF4ON8UjA _GdjFYLVBEdu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_GdgpILVBEdu2ieF4ON8UjA" name="extension_Block" type="_8J2A8LVAEdu2ieF4ON8UjA" aggregation="composite" association="_GdeM4LVBEdu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_RbW2wLVBEdu2ieF4ON8UjA" name="DistributedProperty">

-        <ownedAttribute xmi:id="_S2fEgKGwEdyj2Ya50HPlXg" name="base_Property" isUnique="false" association="_S1PuYKGwEdyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_sLKhQLVBEdu2ieF4ON8UjA" name="Dimension">

-        <ownedAttribute xmi:id="_A8oRkKGxEdyj2Ya50HPlXg" name="base_InstanceSpecification" isUnique="false" association="_A73ckKGxEdyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-        </ownedAttribute>

-        <icon xmi:id="_cmay0JarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif">

-          <eAnnotations xmi:id="_dWPtQJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_dWPtQZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_t9k6ELVBEdu2ieF4ON8UjA" name="Unit">

-        <ownedAttribute xmi:id="_CWx7YKGxEdyj2Ya50HPlXg" name="base_InstanceSpecification" isUnique="false" association="_CVceoKGxEdyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_U8AxIKGxEdyj2Ya50HPlXg" name="dimension" type="_sLKhQLVBEdu2ieF4ON8UjA" isUnique="false" association="_U6SS0KGxEdyj2Ya50HPlXg">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U8ZLoKGxEdyj2Ya50HPlXg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U8fSQKGxEdyj2Ya50HPlXg" value="1"/>

-        </ownedAttribute>

-        <icon xmi:id="_fyOngJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif">

-          <eAnnotations xmi:id="_gUMsIJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_gUMsIZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_yfp-ILVBEdu2ieF4ON8UjA" name="ValueType">

-        <ownedAttribute xmi:id="_1IPJ8LVBEdu2ieF4ON8UjA" name="base_DataType" isUnique="false" association="_1IK4gLVBEdu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_mfPXUKGxEdyj2Ya50HPlXg" name="unit" type="_t9k6ELVBEdu2ieF4ON8UjA" isUnique="false" association="_meABMKGxEdyj2Ya50HPlXg">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mfhrMKGxEdyj2Ya50HPlXg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mfnx0KGxEdyj2Ya50HPlXg" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_pj40EKGxEdyj2Ya50HPlXg" name="dimension" type="_sLKhQLVBEdu2ieF4ON8UjA" isUnique="false" association="_pivkkKGxEdyj2Ya50HPlXg">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pkLH8KGxEdyj2Ya50HPlXg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pkLH8aGxEdyj2Ya50HPlXg" value="1"/>

-        </ownedAttribute>

-        <icon xmi:id="_hqnFcJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif">

-          <eAnnotations xmi:id="_iJTzoJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_iJTzoZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_1IK4gLVBEdu2ieF4ON8UjA" name="DataTypeValueType" memberEnd="_1IMGoLVBEdu2ieF4ON8UjA _1IPJ8LVBEdu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_1IMGoLVBEdu2ieF4ON8UjA" name="extension_ValueType" type="_yfp-ILVBEdu2ieF4ON8UjA" aggregation="composite" association="_1IK4gLVBEdu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_moxaQLVCEdu2ieF4ON8UjA" name="NestedConnectorEnd">

-        <ownedAttribute xmi:id="_oH640LVCEdu2ieF4ON8UjA" name="propertyPath" visibility="public" isOrdered="true" isUnique="false">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4ZtWsMq4Ed2earfX6q16xg" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4Z1SgMq4Ed2earfX6q16xg" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="__DZ9ILVCEdu2ieF4ON8UjA">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_pbCGgLVCEdu2ieF4ON8UjA" name="base_ConnectorEnd" isUnique="false" association="_pa9OALVCEdu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ConnectorEnd"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_pa9OALVCEdu2ieF4ON8UjA" name="ConnectorEndNestedConnectorEnd" memberEnd="_pa_qQLVCEdu2ieF4ON8UjA _pbCGgLVCEdu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_pa_qQLVCEdu2ieF4ON8UjA" name="extension_NestedConnectorEnd" type="_moxaQLVCEdu2ieF4ON8UjA" aggregation="composite" association="_pa9OALVCEdu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_AJuDYKGwEdyj2Ya50HPlXg" name="ParticipantProperty">

-        <ownedAttribute xmi:id="_VHXiAKGwEdyj2Ya50HPlXg" name="base_Property" isUnique="false" association="_VGOSgKGwEdyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_X_BroKGwEdyj2Ya50HPlXg" name="end" visibility="public" isUnique="false">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aock8KGwEdyj2Ya50HPlXg" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aock8aGwEdyj2Ya50HPlXg" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_aoirkKGwEdyj2Ya50HPlXg">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_FC-RUKGwEdyj2Ya50HPlXg" name="ConnectorProperty">

-        <ownedAttribute xmi:id="_TsQO4KGwEdyj2Ya50HPlXg" name="base_Property" isUnique="false" association="_TrG_YKGwEdyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_bq6ukKGwEdyj2Ya50HPlXg" name="connector" visibility="public" isUnique="false">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pyY_kKGwEdyj2Ya50HPlXg" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pyfGMKGwEdyj2Ya50HPlXg" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_pyfGMaGwEdyj2Ya50HPlXg">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_S1PuYKGwEdyj2Ya50HPlXg" name="Extension_DistributedProperty" memberEnd="_S2S3QKGwEdyj2Ya50HPlXg _S2fEgKGwEdyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_S2S3QKGwEdyj2Ya50HPlXg" name="extension_DistributedProperty" type="_RbW2wLVBEdu2ieF4ON8UjA" aggregation="composite" association="_S1PuYKGwEdyj2Ya50HPlXg"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_TrG_YKGwEdyj2Ya50HPlXg" name="Extension_ConnectorProperty" memberEnd="_TsEBoKGwEdyj2Ya50HPlXg _TsQO4KGwEdyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_TsEBoKGwEdyj2Ya50HPlXg" name="extension_ConnectorProperty" type="_FC-RUKGwEdyj2Ya50HPlXg" aggregation="composite" association="_TrG_YKGwEdyj2Ya50HPlXg"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_VGOSgKGwEdyj2Ya50HPlXg" name="Extension_ParticipantProperty" memberEnd="_VHLUwKGwEdyj2Ya50HPlXg _VHXiAKGwEdyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_VHLUwKGwEdyj2Ya50HPlXg" name="extension_ParticipantProperty" type="_AJuDYKGwEdyj2Ya50HPlXg" aggregation="composite" association="_VGOSgKGwEdyj2Ya50HPlXg"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_A73ckKGxEdyj2Ya50HPlXg" name="Extension_Dimension" memberEnd="_A8iK8KGxEdyj2Ya50HPlXg _A8oRkKGxEdyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_A8iK8KGxEdyj2Ya50HPlXg" name="extension_Dimension" type="_sLKhQLVBEdu2ieF4ON8UjA" aggregation="composite" association="_A73ckKGxEdyj2Ya50HPlXg"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_CVceoKGxEdyj2Ya50HPlXg" name="Extension_Unit" memberEnd="_CWfngKGxEdyj2Ya50HPlXg _CWx7YKGxEdyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_CWfngKGxEdyj2Ya50HPlXg" name="extension_Unit" type="_t9k6ELVBEdu2ieF4ON8UjA" aggregation="composite" association="_CVceoKGxEdyj2Ya50HPlXg"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_2qgsEKGxEdyj2Ya50HPlXg" name="BindingConnector">

-        <ownedAttribute xmi:id="_7l3y0KGxEdyj2Ya50HPlXg" name="base_Connector" isUnique="false" association="_7k6wkKGxEdyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_7k6wkKGxEdyj2Ya50HPlXg" name="Extension_BindingConnector" memberEnd="_7lrlkKGxEdyj2Ya50HPlXg _7l3y0KGxEdyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_7lrlkKGxEdyj2Ya50HPlXg" name="extension_BindingConnector" type="_2qgsEKGxEdyj2Ya50HPlXg" aggregation="composite" association="_7k6wkKGxEdyj2Ya50HPlXg"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_aD-7EKGyEdyj2Ya50HPlXg" name="PropertySpecificType">

-        <ownedAttribute xmi:id="_kwLYAKGyEdyj2Ya50HPlXg" name="base_Classifier" isUnique="false" association="_kuv0oKGyEdyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_U6SS0KGxEdyj2Ya50HPlXg" name="Association_Unit_Dimension" memberEnd="_U8AxIKGxEdyj2Ya50HPlXg _U8lY4KGxEdyj2Ya50HPlXg">

-        <ownedEnd xmi:id="_U8lY4KGxEdyj2Ya50HPlXg" name="unit" type="_t9k6ELVBEdu2ieF4ON8UjA" isUnique="false" association="_U6SS0KGxEdyj2Ya50HPlXg">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U9KAoaGxEdyj2Ya50HPlXg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U9KAoKGxEdyj2Ya50HPlXg" value="*"/>

-        </ownedEnd>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_meABMKGxEdyj2Ya50HPlXg" name="Association_ValueType_Unit" memberEnd="_mfPXUKGxEdyj2Ya50HPlXg _mfnx0aGxEdyj2Ya50HPlXg">

-        <ownedEnd xmi:id="_mfnx0aGxEdyj2Ya50HPlXg" name="valueType" type="_yfp-ILVBEdu2ieF4ON8UjA" isUnique="false" association="_meABMKGxEdyj2Ya50HPlXg">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mgGS8aGxEdyj2Ya50HPlXg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mgGS8KGxEdyj2Ya50HPlXg" value="*"/>

-        </ownedEnd>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_pivkkKGxEdyj2Ya50HPlXg" name="Association_ValueType_Dimension" memberEnd="_pj40EKGxEdyj2Ya50HPlXg _pkROkKGxEdyj2Ya50HPlXg">

-        <ownedEnd xmi:id="_pkROkKGxEdyj2Ya50HPlXg" name="valueType" type="_yfp-ILVBEdu2ieF4ON8UjA" isUnique="false" association="_pivkkKGxEdyj2Ya50HPlXg">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pkdb0aGxEdyj2Ya50HPlXg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pkdb0KGxEdyj2Ya50HPlXg" value="*"/>

-        </ownedEnd>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_kuv0oKGyEdyj2Ya50HPlXg" name="Extension_PropertySpecificType" memberEnd="_kv_KwKGyEdyj2Ya50HPlXg _kwLYAKGyEdyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_kv_KwKGyEdyj2Ya50HPlXg" name="extension_PropertySpecificType" type="_aD-7EKGyEdyj2Ya50HPlXg" aggregation="composite" association="_kuv0oKGyEdyj2Ya50HPlXg"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_rpx28LX7EduFmqQsrNB9lw" name="PortAndFlows" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows">

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_lNvKMLVDEdu2ieF4ON8UjA" name="FlowPort">

-        <ownedAttribute xmi:id="_CFKogLVEEdu2ieF4ON8UjA" name="base_Port" isUnique="false" association="_CFFI8LVEEdu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_TrY4ULVEEdu2ieF4ON8UjA" name="isAtomic" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XOdWcLVEEdu2ieF4ON8UjA" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XOnugLVEEdu2ieF4ON8UjA" value="1"/>

-          <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_YqxjcLVEEdu2ieF4ON8UjA"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_T-tc8LVEEdu2ieF4ON8UjA" name="isConjugated" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bKXLULVEEdu2ieF4ON8UjA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bKcD0LVEEdu2ieF4ON8UjA" value="1"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_ULDP0LVEEdu2ieF4ON8UjA" name="direction" visibility="public" type="_6uLz4LVDEdu2ieF4ON8UjA" isUnique="false">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_am2iIKGzEdyj2Ya50HPlXg" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_am8owKGzEdyj2Ya50HPlXg" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_awls8KGzEdyj2Ya50HPlXg" value="inout"/>

-        </ownedAttribute>

-        <ownedOperation xmi:id="_hxx1MKaVEd2T5POpEd8M_A" name="getIcon">

-          <ownedParameter xmi:id="_j2I5oKaVEd2T5POpEd8M_A" name="img" direction="return">

-            <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Image"/>

-          </ownedParameter>

-        </ownedOperation>

-        <icon xmi:id="_Prrn8KaUEd2T5POpEd8M_A" format="" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif">

-          <eAnnotations xmi:id="_bgbBUKaUEd2T5POpEd8M_A" source="image_papyrus">

-            <details xmi:id="_bgbBUaaUEd2T5POpEd8M_A" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-        <icon xmi:id="_RCIdgKaUEd2T5POpEd8M_A" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif">

-          <eAnnotations xmi:id="_c1rkEKaUEd2T5POpEd8M_A" source="image_papyrus">

-            <details xmi:id="_c1rkEaaUEd2T5POpEd8M_A" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-        <icon xmi:id="_UZgpAKaUEd2T5POpEd8M_A" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif">

-          <eAnnotations xmi:id="_eKCu8KaUEd2T5POpEd8M_A" source="image_papyrus">

-            <details xmi:id="_eKL44KaUEd2T5POpEd8M_A" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-        <icon xmi:id="_WNehAKaUEd2T5POpEd8M_A" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif">

-          <eAnnotations xmi:id="_geMi4KaUEd2T5POpEd8M_A" source="image_papyrus">

-            <details xmi:id="_geMi4aaUEd2T5POpEd8M_A" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-        <icon xmi:id="_Wx_jUKaUEd2T5POpEd8M_A" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif">

-          <eAnnotations xmi:id="_iKaNEKaUEd2T5POpEd8M_A" source="image_papyrus">

-            <details xmi:id="_iKaNEaaUEd2T5POpEd8M_A" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_mB-qkLVDEdu2ieF4ON8UjA" name="FlowProperty">

-        <ownedAttribute xmi:id="_CyXswLVEEdu2ieF4ON8UjA" name="base_Property" isUnique="false" association="_CyRmILVEEdu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_M9NJELVEEdu2ieF4ON8UjA" name="direction" visibility="public" type="_6uLz4LVDEdu2ieF4ON8UjA" isUnique="false">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eNi_gLX0Edu94_NE0EO5_A" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eNqUQLX0Edu94_NE0EO5_A" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_PRpQ4LVEEdu2ieF4ON8UjA" value="inout"/>

-        </ownedAttribute>

-        <ownedOperation xmi:id="_sZT0kKaVEd2T5POpEd8M_A" name="getIcon">

-          <ownedParameter xmi:id="_sZT0kaaVEd2T5POpEd8M_A" name="img" direction="return">

-            <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Image"/>

-          </ownedParameter>

-        </ownedOperation>

-        <icon xmi:id="_3Fo88NOpEeCksKIBVNCBtw" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif">

-          <eAnnotations xmi:id="_3Fo88dOpEeCksKIBVNCBtw" source="image_papyrus">

-            <details xmi:id="_3Fo88tOpEeCksKIBVNCBtw" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-        <icon xmi:id="_yZrmoJayEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_IN.gif">

-          <eAnnotations xmi:id="_010R4JayEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_01-C4JayEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-        <icon xmi:id="_y_heoJayEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_OUT.gif">

-          <eAnnotations xmi:id="_2tBEEJayEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_2tBEEZayEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-        <icon xmi:id="_z-GmwJayEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_INOUT.gif">

-          <eAnnotations xmi:id="_36CQ0JayEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_36CQ0ZayEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_m9QnELVDEdu2ieF4ON8UjA" name="FlowSpecification">

-        <ownedAttribute xmi:id="_DD6vwLVEEdu2ieF4ON8UjA" name="base_Interface" isUnique="false" association="_DD0pILVEEdu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>

-        </ownedAttribute>

-        <icon xmi:id="_viR7sJayEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif">

-          <eAnnotations xmi:id="_wU7goJayEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_wU7goZayEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_6uLz4LVDEdu2ieF4ON8UjA" name="FlowDirection">

-        <ownedLiteral xmi:id="_8A5Y8LVDEdu2ieF4ON8UjA" name="in"/>

-        <ownedLiteral xmi:id="_8ZVHELVDEdu2ieF4ON8UjA" name="out"/>

-        <ownedLiteral xmi:id="_8lvLYLVDEdu2ieF4ON8UjA" name="inout"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_CFFI8LVEEdu2ieF4ON8UjA" name="PortFlowPort" memberEnd="_CFG-ILVEEdu2ieF4ON8UjA _CFKogLVEEdu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_CFG-ILVEEdu2ieF4ON8UjA" name="extension_FlowPort" type="_lNvKMLVDEdu2ieF4ON8UjA" aggregation="composite" association="_CFFI8LVEEdu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_CyRmILVEEdu2ieF4ON8UjA" name="PropertyFlowProperty" memberEnd="_CyUCYLVEEdu2ieF4ON8UjA _CyXswLVEEdu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_CyUCYLVEEdu2ieF4ON8UjA" name="extension_FlowProperty" type="_mB-qkLVDEdu2ieF4ON8UjA" aggregation="composite" association="_CyRmILVEEdu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_DD0pILVEEdu2ieF4ON8UjA" name="InterfaceFlowSpecification" memberEnd="_DD2eULVEEdu2ieF4ON8UjA _DD6vwLVEEdu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DD2eULVEEdu2ieF4ON8UjA" name="extension_FlowSpecification" type="_m9QnELVDEdu2ieF4ON8UjA" aggregation="composite" association="_DD0pILVEEdu2ieF4ON8UjA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_9cdikLVEEdu2ieF4ON8UjA" name="ItemFlow">

-        <ownedAttribute xmi:id="_-8t0YLVEEdu2ieF4ON8UjA" name="base_InformationFlow" isUnique="false" association="_-8ntwLVEEdu2ieF4ON8UjA">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InformationFlow"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="__ulWMLVEEdu2ieF4ON8UjA" name="itemProperty" visibility="public" isUnique="false">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FduDQLVFEdu2ieF4ON8UjA"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fdy7wLVFEdu2ieF4ON8UjA" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_D-wK4LVFEdu2ieF4ON8UjA">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <icon xmi:id="_iNY0AIQlEd-0wPxCyQxNhg" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif">

-          <eAnnotations xmi:id="_mKHvUIQlEd-0wPxCyQxNhg" source="image_papyrus">

-            <details xmi:id="_mKHvUYQlEd-0wPxCyQxNhg" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_-8ntwLVEEdu2ieF4ON8UjA" name="InformationFlowItemFlow" memberEnd="_-8qKALVEEdu2ieF4ON8UjA _-8t0YLVEEdu2ieF4ON8UjA">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_-8qKALVEEdu2ieF4ON8UjA" name="extension_ItemFlow" type="_9cdikLVEEdu2ieF4ON8UjA" aggregation="composite" association="_-8ntwLVEEdu2ieF4ON8UjA"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_5WYJ0LX7EduFmqQsrNB9lw" name="Constraints" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints">

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_YDK7cLVFEdu2ieF4ON8UjA" name="ConstraintBlock">

-        <generalization xmi:id="_dgUgoLVFEdu2ieF4ON8UjA" general="_8J2A8LVAEdu2ieF4ON8UjA"/>

-        <icon xmi:id="_Oy6msJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif">

-          <eAnnotations xmi:id="_PcehEJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_PcehEZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_Y9X54LVFEdu2ieF4ON8UjA" name="ConstraintProperty">

-        <ownedAttribute xmi:id="_F3b3UKG0Edyj2Ya50HPlXg" name="base_Property" isUnique="false" association="_F2AT8KG0Edyj2Ya50HPlXg">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        </ownedAttribute>

-        <icon xmi:id="_TSAoMJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif">

-          <eAnnotations xmi:id="_T2OIgJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_T2OIgZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_F2AT8KG0Edyj2Ya50HPlXg" name="Extension_ConstraintProperty" memberEnd="_F3PqEKG0Edyj2Ya50HPlXg _F3b3UKG0Edyj2Ya50HPlXg">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_F3PqEKG0Edyj2Ya50HPlXg" name="extension_ConstraintProperty" type="_Y9X54LVFEdu2ieF4ON8UjA" aggregation="composite" association="_F2AT8KG0Edyj2Ya50HPlXg"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_C2zXMLX8EduFmqQsrNB9lw" name="Activities" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities">

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_1uhmQLXjEduHWpAaWjM62w" name="Optional">

-        <ownedAttribute xmi:id="_Cs5hMLXkEduHWpAaWjM62w" name="base_Parameter" isUnique="false" association="_CslYILXkEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_2a7ZQLXjEduHWpAaWjM62w" name="Rate">

-        <ownedAttribute xmi:id="_C-oKYLXkEduHWpAaWjM62w" name="base_Parameter" isUnique="false" association="_C-XrsLXkEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_DP0BALXkEduHWpAaWjM62w" name="base_ActivityEdge" isUnique="false" association="_DPssQLXkEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityEdge"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_YzasYLXkEduHWpAaWjM62w" name="rate" visibility="public" isUnique="false">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w53UsLX0Edu94_NE0EO5_A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w5_QgLX0Edu94_NE0EO5_A" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_68ayALXkEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_3MEiULXjEduHWpAaWjM62w" name="Probability">

-        <ownedAttribute xmi:id="_Dlxp8LXkEduHWpAaWjM62w" name="base_ActivityEdge" isUnique="false" association="_DlqVMLXkEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityEdge"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_DzIJcLXkEduHWpAaWjM62w" name="base_ParameterSet" isUnique="false" association="_DyyyQLXkEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ParameterSet"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_frTxQLXkEduHWpAaWjM62w" name="probability" visibility="public" isUnique="false">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xbhQQLX0Edu94_NE0EO5_A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xbmIwLX0Edu94_NE0EO5_A" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_9CuXMLXkEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_8X4f4LXjEduHWpAaWjM62w" name="Continuous">

-        <generalization xmi:id="_BsHZoLXkEduHWpAaWjM62w" general="_2a7ZQLXjEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_-N-e0LXjEduHWpAaWjM62w" name="Discrete">

-        <generalization xmi:id="_BcS08LXkEduHWpAaWjM62w" general="_2a7ZQLXjEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_CslYILXkEduHWpAaWjM62w" name="ParameterOptionnal" memberEnd="_CsppkLXkEduHWpAaWjM62w _Cs5hMLXkEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_CsppkLXkEduHWpAaWjM62w" name="extension_Optionnal" type="_1uhmQLXjEduHWpAaWjM62w" aggregation="composite" association="_CslYILXkEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_C-XrsLXkEduHWpAaWjM62w" name="ParameterRate" memberEnd="_C-b9ILXkEduHWpAaWjM62w _C-oKYLXkEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_C-b9ILXkEduHWpAaWjM62w" name="extension_Rate" type="_2a7ZQLXjEduHWpAaWjM62w" aggregation="composite" association="_C-XrsLXkEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_DPssQLXkEduHWpAaWjM62w" name="ActivityEdgeRate" memberEnd="_DPvIgLXkEduHWpAaWjM62w _DP0BALXkEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DPvIgLXkEduHWpAaWjM62w" name="extension_Rate" type="_2a7ZQLXjEduHWpAaWjM62w" aggregation="composite" association="_DPssQLXkEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_DlqVMLXkEduHWpAaWjM62w" name="ActivityEdgeProbability" memberEnd="_DltYgLXkEduHWpAaWjM62w _Dlxp8LXkEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DltYgLXkEduHWpAaWjM62w" name="extension_Probability" type="_3MEiULXjEduHWpAaWjM62w" aggregation="composite" association="_DlqVMLXkEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_DyyyQLXkEduHWpAaWjM62w" name="ParameterSetProbability" memberEnd="_Dy9KULXkEduHWpAaWjM62w _DzIJcLXkEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Dy9KULXkEduHWpAaWjM62w" name="extension_Probability" type="_3MEiULXjEduHWpAaWjM62w" aggregation="composite" association="_DyyyQLXkEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_KngK0LXlEduHWpAaWjM62w" name="ControlOperator">

-        <ownedAttribute xmi:id="_b2g0gLXlEduHWpAaWjM62w" name="base_Operation" isUnique="false" association="_b2ZfwLXlEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_cEMrMLXlEduHWpAaWjM62w" name="base_Behavior" isUnique="false" association="_cEEvYLXlEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_LClkULXlEduHWpAaWjM62w" name="NoBuffer">

-        <ownedAttribute xmi:id="_bbg6kLXlEduHWpAaWjM62w" name="base_ObjectNode" isUnique="false" association="_bbOmsLXlEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ObjectNode"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_LZkg8LXlEduHWpAaWjM62w" name="Overwrite">

-        <ownedAttribute xmi:id="_a-uQ4LXlEduHWpAaWjM62w" name="base_ObjectNode" isUnique="false" association="_a-V2YLXlEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ObjectNode"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_a-V2YLXlEduHWpAaWjM62w" name="ObjectNodeOverwrite" memberEnd="_a-Y5sLXlEduHWpAaWjM62w _a-uQ4LXlEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_a-Y5sLXlEduHWpAaWjM62w" name="extension_Overwrite" type="_LZkg8LXlEduHWpAaWjM62w" aggregation="composite" association="_a-V2YLXlEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_bbOmsLXlEduHWpAaWjM62w" name="ObjectNodeNoBuffer" memberEnd="_bbRqALXlEduHWpAaWjM62w _bbg6kLXlEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_bbRqALXlEduHWpAaWjM62w" name="extension_NoBuffer" type="_LClkULXlEduHWpAaWjM62w" aggregation="composite" association="_bbOmsLXlEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_b2ZfwLXlEduHWpAaWjM62w" name="OperationControlOperator" memberEnd="_b2cjELXlEduHWpAaWjM62w _b2g0gLXlEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_b2cjELXlEduHWpAaWjM62w" name="extension_ControlOperator" type="_KngK0LXlEduHWpAaWjM62w" aggregation="composite" association="_b2ZfwLXlEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_cEEvYLXlEduHWpAaWjM62w" name="BehaviorControlOperator" memberEnd="_cEHLoLXlEduHWpAaWjM62w _cEMrMLXlEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_cEHLoLXlEduHWpAaWjM62w" name="extension_ControlOperator" type="_KngK0LXlEduHWpAaWjM62w" aggregation="composite" association="_cEEvYLXlEduHWpAaWjM62w"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_NxdG4LX8EduFmqQsrNB9lw" name="Allocations" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations">

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_HGNjcLXnEduHWpAaWjM62w" name="Allocate">

-        <ownedAttribute xmi:id="_xL5QILYFEdutJMhZXRvi7w" name="base_Abstraction" isUnique="false" association="_xLkgALYFEdutJMhZXRvi7w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_Hj0sgLXnEduHWpAaWjM62w" name="Allocated">

-        <ownedAttribute xmi:id="_NkvtILXnEduHWpAaWjM62w" name="base_NamedElement" isUnique="false" association="_NkSaILXnEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_Sj35kLXnEduHWpAaWjM62w" name="allocatedFrom" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZwR14LXnEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZwZKoLXnEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_VkmfoLXnEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_S07NULXnEduHWpAaWjM62w" name="allocatedTo" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZGYkULXnEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZGdc0LXnEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_XgyfgLXnEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_IMU28LXnEduHWpAaWjM62w" name="AllocateActivityPartition">

-        <ownedAttribute xmi:id="_NJulELXnEduHWpAaWjM62w" name="base_ActivityPartition" isUnique="false" association="_NJacALXnEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityPartition"/>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_NJacALXnEduHWpAaWjM62w" name="ActivityPartitionAllocateActivityPartition" memberEnd="_NJdfULXnEduHWpAaWjM62w _NJulELXnEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_NJdfULXnEduHWpAaWjM62w" name="extension_AllocateActivityPartition" type="_IMU28LXnEduHWpAaWjM62w" aggregation="composite" association="_NJacALXnEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_NkSaILXnEduHWpAaWjM62w" name="NamedElementAllocated" memberEnd="_NkVdcLXnEduHWpAaWjM62w _NkvtILXnEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_NkVdcLXnEduHWpAaWjM62w" name="extension_Allocated" type="_Hj0sgLXnEduHWpAaWjM62w" aggregation="composite" association="_NkSaILXnEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_xLkgALYFEdutJMhZXRvi7w" name="AbstractionAllocate" memberEnd="_xLyicLYFEdutJMhZXRvi7w _xL5QILYFEdutJMhZXRvi7w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_xLyicLYFEdutJMhZXRvi7w" name="extension_Allocate" type="_HGNjcLXnEduHWpAaWjM62w" aggregation="composite" association="_xLkgALYFEdutJMhZXRvi7w"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_OOJC4LX8EduFmqQsrNB9lw" name="Requirements" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements">

-      <ownedComment xmi:id="_BmpG8LXoEduHWpAaWjM62w" annotatedElement="_TZ_nULU5EduiKqCzJMWbGw">

-        <body>Trace instead of Abstraction in SysML specifications.</body>

-      </ownedComment>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_LPnzYLXoEduHWpAaWjM62w" name="DeriveReqt">

-        <generalization xmi:id="_lr5SAKG1Edyj2Ya50HPlXg">

-          <general xmi:type="uml:Stereotype" href="pathmap://UML_PROFILES/Standard.profile.uml#Trace"/>

-        </generalization>

-        <icon xmi:id="__AeBoJaqEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif">

-          <eAnnotations xmi:id="__kO2AJaqEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="__kO2AZaqEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_Lop-cLXoEduHWpAaWjM62w" name="Verify">

-        <generalization xmi:id="_mRzbcKG1Edyj2Ya50HPlXg">

-          <general xmi:type="uml:Stereotype" href="pathmap://UML_PROFILES/Standard.profile.uml#Trace"/>

-        </generalization>

-        <icon xmi:id="_Kcv3sJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif">

-          <eAnnotations xmi:id="_LGnUEJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_LGxFEJarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_L8HF8LXoEduHWpAaWjM62w" name="Copy">

-        <generalization xmi:id="_m3h-sKG1Edyj2Ya50HPlXg">

-          <general xmi:type="uml:Stereotype" href="pathmap://UML_PROFILES/Standard.profile.uml#Trace"/>

-        </generalization>

-        <icon xmi:id="_6oq68JaqEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif">

-          <eAnnotations xmi:id="_7LYmcJaqEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_7LYmcZaqEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_Mqyw4LXoEduHWpAaWjM62w" name="Satisfy">

-        <generalization xmi:id="_qvChAMq5Ed2earfX6q16xg">

-          <general xmi:type="uml:Stereotype" href="pathmap://UML_PROFILES/Standard.profile.uml#Trace"/>

-        </generalization>

-        <icon xmi:id="_Fsqz4JarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif">

-          <eAnnotations xmi:id="_GTQSwJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_GTQSwZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_Sb6wELXqEduHWpAaWjM62w" name="TestCase">

-        <ownedAttribute xmi:id="_WCq0ULXqEduHWpAaWjM62w" name="base_Behavior" isUnique="false" association="_WCfOILXqEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_WeiQ8LXqEduHWpAaWjM62w" name="base_Operation" isUnique="false" association="_WeNg0LXqEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_zN7ToKG1Edyj2Ya50HPlXg" name="verifies" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_38THQKG1Edyj2Ya50HPlXg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_38ZN4KG1Edyj2Ya50HPlXg" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_3MQxcKG1Edyj2Ya50HPlXg">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <icon xmi:id="_Hz8pcJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/TestCase.gif">

-          <eAnnotations xmi:id="_ITiIcJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_ITiIcZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_WCfOILXqEduHWpAaWjM62w" name="BehaviorTestCase" memberEnd="_WCjfkLXqEduHWpAaWjM62w _WCq0ULXqEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_WCjfkLXqEduHWpAaWjM62w" name="extension_TestCase" type="_Sb6wELXqEduHWpAaWjM62w" aggregation="composite" association="_WCfOILXqEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_WeNg0LXqEduHWpAaWjM62w" name="OperationTestCase" memberEnd="_WeRLMLXqEduHWpAaWjM62w _WeiQ8LXqEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_WeRLMLXqEduHWpAaWjM62w" name="extension_TestCase" type="_Sb6wELXqEduHWpAaWjM62w" aggregation="composite" association="_WeNg0LXqEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_xajygLXqEduHWpAaWjM62w" name="Requirement">

-        <ownedAttribute xmi:id="_3DxdwLXqEduHWpAaWjM62w" name="text" visibility="public" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6I1KMLXqEduHWpAaWjM62w" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6I6pwLXqEduHWpAaWjM62w" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_6JDzsLXqEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_3YlQILXqEduHWpAaWjM62w" name="id" visibility="public" isUnique="false">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_82gRYLXqEduHWpAaWjM62w" value="1"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_82hfgLXqEduHWpAaWjM62w" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_82itoLXqEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_3jp3sLXqEduHWpAaWjM62w" name="derived" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AyC54LXrEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AyHyYLXrEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_AC_bgLXrEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_3wFxMLXqEduHWpAaWjM62w" name="derivedFrom" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DjDB4LXrEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DjJvkLXrEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_DBZGULXrEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_FHcz4LXrEduHWpAaWjM62w" name="satisfiedBy" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MWueALXrEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MW1ywLXrEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_IKZAcLXrEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_F-KZcLXrEduHWpAaWjM62w" name="refinedBy" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M3wugLXrEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M31nALXrEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_KKjhYLXrEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_O6rBcLXrEduHWpAaWjM62w" name="tracedTo" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_attxsLXrEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_at2UkLXrEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Qjs0wLXrEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_PHumALXrEduHWpAaWjM62w" name="verifiedBy" visibility="public" isUnique="false" isReadOnly="true" isDerived="true">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aFCoILXrEduHWpAaWjM62w"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aFIHsLXrEduHWpAaWjM62w" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_R1wSgLXrEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_PStuALXrEduHWpAaWjM62w" name="master" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PxcPcA_rEd2d6-7wXQb4hQ"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PxlZYA_rEd2d6-7wXQb4hQ" value="1"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Svy44LXrEduHWpAaWjM62w">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_tSTRwLXsEduHWpAaWjM62w" name="base_Class" isUnique="false" association="_tRNsoLXsEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-        </ownedAttribute>

-        <icon xmi:id="_CEZFoJarEd2oqf5htPjXnA" location="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif">

-          <eAnnotations xmi:id="_CsUoUJarEd2oqf5htPjXnA" source="image_papyrus">

-            <details xmi:id="_CsUoUZarEd2oqf5htPjXnA" key="image_kind_key" value="icon"/>

-          </eAnnotations>

-        </icon>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_ypiHELXqEduHWpAaWjM62w" name="RequirementRelated">

-        <ownedAttribute xmi:id="_s4dOYLXsEduHWpAaWjM62w" name="base_NamedElement" isUnique="false" association="_s3V0ELXsEduHWpAaWjM62w">

-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_0nBtgLX1Edu94_NE0EO5_A" name="tracedFrom" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DO4HsLX2Edu94_NE0EO5_A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DO9nQLX2Edu94_NE0EO5_A" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_3hjk8LX1Edu94_NE0EO5_A">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_0yJ_cLX1Edu94_NE0EO5_A" name="satisfies" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_D2jywLX2Edu94_NE0EO5_A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D2pSULX2Edu94_NE0EO5_A" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_6xIfULX1Edu94_NE0EO5_A">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_1AqVgLX1Edu94_NE0EO5_A" name="refines" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Epd2YLX2Edu94_NE0EO5_A"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Epiu4LX2Edu94_NE0EO5_A" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_4jXAMLX1Edu94_NE0EO5_A">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-        <ownedAttribute xmi:id="_56-VIMq4Ed2earfX6q16xg" name="verifies" visibility="public" type="_xajygLXqEduHWpAaWjM62w" isUnique="false" isReadOnly="true" isDerived="true">

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9PR-gMq4Ed2earfX6q16xg"/>

-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9PbIcMq4Ed2earfX6q16xg" value="*"/>

-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Q73d4Mq5Ed2earfX6q16xg">

-            <value xsi:nil="true"/>

-          </defaultValue>

-        </ownedAttribute>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_s3V0ELXsEduHWpAaWjM62w" name="NamedElementRequirementRelated" memberEnd="_s32xcLXsEduHWpAaWjM62w _s4dOYLXsEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_s32xcLXsEduHWpAaWjM62w" name="extension_RequirementRelated" type="_ypiHELXqEduHWpAaWjM62w" aggregation="composite" association="_s3V0ELXsEduHWpAaWjM62w"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_tRNsoLXsEduHWpAaWjM62w" name="ClassRequirement" memberEnd="_tRfZcLXsEduHWpAaWjM62w _tSTRwLXsEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_tRfZcLXsEduHWpAaWjM62w" name="extension_Requirement" type="_xajygLXqEduHWpAaWjM62w" aggregation="composite" association="_tRNsoLXsEduHWpAaWjM62w"/>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_meOioLX8EduFmqQsrNB9lw" name="Interactions" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/Interactions">

-      <ownedComment xmi:id="_YQ6KULXmEduHWpAaWjM62w">

-        <body>No stereotypes defined for interactions.</body>

-      </ownedComment>

-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_MmIPsIY8Ed22f52x9jcYIQ" name="Dummy">

-        <ownedComment xmi:id="_MmIPsYY8Ed22f52x9jcYIQ">

-          <body>Dummy DataType, just added for code generation purpose.&#xD;

-In other words, this data type for EMF generation of SysmlPackage and SysmlFactory&#xD;

-java classes in the model code.&#xD;

-&#xD;

-Do not remove this !!!</body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_nAF5kLX8EduFmqQsrNB9lw" name="StateMachines" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/StateMachines">

-      <ownedComment xmi:id="_jYmQcLXmEduHWpAaWjM62w">

-        <body>No stereotypes defined for StateMachines.</body>

-      </ownedComment>

-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_MbshUIY8Ed22f52x9jcYIQ" name="Dummy">

-        <ownedComment xmi:id="_MbshUYY8Ed22f52x9jcYIQ">

-          <body>Dummy DataType, just added for code generation purpose.&#xD;

-In other words, this data type for EMF generation of SysmlPackage and SysmlFactory&#xD;

-java classes in the model code.&#xD;

-&#xD;

-Do not remove this !!!</body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Profile" xmi:id="_neZmMLX8EduFmqQsrNB9lw" name="UseCases" URI="http://www.eclipse.org/papyrus/0.7.0/SysML/UseCases">

-      <ownedComment xmi:id="_t3QAoLXmEduHWpAaWjM62w">

-        <body>No stereotypes defined for UseCases.</body>

-      </ownedComment>

-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_MCXbUIY8Ed22f52x9jcYIQ" name="Dummy">

-        <ownedComment xmi:id="_MCXbUYY8Ed22f52x9jcYIQ">

-          <body>Dummy DataType, just added for code generation purpose.&#xD;

-In other words, this data type for EMF generation of SysmlPackage and SysmlFactory&#xD;

-java classes in the model code.&#xD;

-&#xD;

-Do not remove this !!!</body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_q7WXMIV3Ed2MZ72qAlfQ3A" name="Dummy">

-      <ownedComment xmi:id="_OQi_oIV3Ed2MZ72qAlfQ3A">

-        <body>Dummy DataType, just added for code generation purpose.&#xD;

-In other words, this data type for EMF generation of SysmlPackage and SysmlFactory&#xD;

-java classes in the model code.&#xD;

-&#xD;

-Do not remove this !!!</body>

-      </ownedComment>

-    </packagedElement>

-    <profileApplication xmi:id="_5GlvYAerEd22I9XGJS-A2Q">

-      <eAnnotations xmi:id="_6knzoAerEd22I9XGJS-A2Q" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>

-      </eAnnotations>

-      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

-    </profileApplication>

-  </uml:Profile>

-  <Ecore:EPackage xmi:id="_B1O6gAesEd22I9XGJS-A2Q" base_Package="_TZ_nULU5EduiKqCzJMWbGw" packageName="sysml" nsPrefix="SysML" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML" basePackage="org.eclipse.papyrus" prefix="sysml"/>

-  <Ecore:EPackage xmi:id="_3pfbQAfXEd2QR6cYbtS0qQ" base_Package="_Gx8MgLX7EduFmqQsrNB9lw" packageName="modelelements" nsPrefix="ModelElements" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements" basePackage="org.eclipse.papyrus.sysml" prefix="modelelements"/>

-  <Ecore:EPackage xmi:id="_IwWr4AlUEd2igeYZcwolcw" base_Package="_fSw28LX7EduFmqQsrNB9lw" packageName="blocks" nsPrefix="Blocks" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" basePackage="org.eclipse.papyrus.sysml" prefix="blocks"/>

-  <Ecore:EPackage xmi:id="_d1ggsAlUEd2igeYZcwolcw" base_Package="_rpx28LX7EduFmqQsrNB9lw" packageName="portandflows" nsPrefix="PortAndFlows" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows" basePackage="org.eclipse.papyrus.sysml" prefix="portandflows"/>

-  <Ecore:EPackage xmi:id="_rO6x0AlUEd2igeYZcwolcw" base_Package="_5WYJ0LX7EduFmqQsrNB9lw" packageName="constraints" nsPrefix="Constraints" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints" basePackage="org.eclipse.papyrus.sysml" prefix="constraints"/>

-  <Ecore:EPackage xmi:id="_yQfXIAlUEd2igeYZcwolcw" base_Package="_C2zXMLX8EduFmqQsrNB9lw" packageName="activities" nsPrefix="Activities" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities" basePackage="org.eclipse.papyrus.sysml" prefix="activities"/>

-  <Ecore:EPackage xmi:id="_AMeJ0AlVEd2igeYZcwolcw" base_Package="_NxdG4LX8EduFmqQsrNB9lw" packageName="allocations" nsPrefix="Allocations" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations" basePackage="org.eclipse.papyrus.sysml" prefix="allocations"/>

-  <Ecore:EPackage xmi:id="_F8-v4AlVEd2igeYZcwolcw" base_Package="_OOJC4LX8EduFmqQsrNB9lw" packageName="requirements" nsPrefix="Requirements" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" basePackage="org.eclipse.papyrus.sysml" prefix="requirements"/>

-  <Ecore:EPackage xmi:id="_OZvg0AlVEd2igeYZcwolcw" base_Package="_meOioLX8EduFmqQsrNB9lw" packageName="interactions" nsPrefix="Interactions" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Interactions" basePackage="org.eclipse.papyrus.sysml" prefix="interactions"/>

-  <Ecore:EPackage xmi:id="_UYsykAlVEd2igeYZcwolcw" base_Package="_nAF5kLX8EduFmqQsrNB9lw" packageName="statemachines" nsPrefix="StateMachines" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/StateMachines" basePackage="org.eclipse.papyrus.sysml" prefix="statemachines"/>

-  <Ecore:EPackage xmi:id="_aw_xYAlVEd2igeYZcwolcw" base_Package="_neZmMLX8EduFmqQsrNB9lw" packageName="usecases" nsPrefix="UseCases" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/UseCases" basePackage="org.eclipse.papyrus.sysml" prefix="usecases"/>

-  <Ecore:EReference xmi:id="_gYTVgBETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_3Qho8LU9Edu2ieF4ON8UjA"/>

-  <Ecore:EAttribute xmi:id="_nuL98BETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_TrY4ULVEEdu2ieF4ON8UjA"/>

-  <Ecore:EReference xmi:id="_vCiVUBETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_Sj35kLXnEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_vsX8gBETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_S07NULXnEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_2MezgBETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_zN7ToKG1Edyj2Ya50HPlXg"/>

-  <Ecore:EReference xmi:id="_6gNSgBETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_3jp3sLXqEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_9TX9sBETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_3wFxMLXqEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="__o8G4BETEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_FHcz4LXrEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_CsuA8BEUEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_F-KZcLXrEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_F8uZIBEUEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_O6rBcLXrEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_JbEIQBEUEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_PHumALXrEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_MKgKABEUEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_PStuALXrEduHWpAaWjM62w"/>

-  <Ecore:EReference xmi:id="_PQ9koBEUEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_0nBtgLX1Edu94_NE0EO5_A"/>

-  <Ecore:EReference xmi:id="_SDRUMBEUEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_0yJ_cLX1Edu94_NE0EO5_A"/>

-  <Ecore:EReference xmi:id="_U_zWwBEUEd2lltFUEAEueA" isTransient="true" isVolatile="true" base_Property="_1AqVgLX1Edu94_NE0EO5_A"/>

-  <Ecore:EDataType xmi:id="_uEM-gIV3Ed2MZ72qAlfQ3A" instanceClassName="java.lang.String" base_PrimitiveType="_q7WXMIV3Ed2MZ72qAlfQ3A" dataTypeName="Dummy"/>

-  <Ecore:EDataType xmi:id="_PODUMIY8Ed22f52x9jcYIQ" instanceClassName="java.lang.String" base_PrimitiveType="_MmIPsIY8Ed22f52x9jcYIQ" dataTypeName="Dummy"/>

-  <Ecore:EDataType xmi:id="_Q0twAIY8Ed22f52x9jcYIQ" instanceClassName="java.lang.String" base_PrimitiveType="_MbshUIY8Ed22f52x9jcYIQ" dataTypeName="Dummy"/>

-  <Ecore:EDataType xmi:id="_SRZJYIY8Ed22f52x9jcYIQ" instanceClassName="java.lang.String" base_PrimitiveType="_MCXbUIY8Ed22f52x9jcYIQ"/>

-  <Ecore:EReference xmi:id="_T8NCYMq5Ed2earfX6q16xg" isTransient="true" isVolatile="true" base_Property="_56-VIMq4Ed2earfX6q16xg"/>

-</xmi:XMI>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
deleted file mode 100644
index 12889b90393..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
+++ /dev/null
@@ -1,283 +0,0 @@
-<?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="sysml" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML" nsPrefix="SysML">

-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-    <details key="documentation" value="OMG SysML V1.1 formal/2008-11-02&#xD;&#xA;Trace instead of Abstraction in SysML specifications."/>

-  </eAnnotations>

-  <eClassifiers xsi:type="ecore:EDataType" name="Dummy" instanceClassName="java.lang.String"/>

-  <eSubpackages name="modelelements" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements"

-      nsPrefix="ModelElements">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="The supplier/target must be an element stereotyped by &lt;&lt;ViewPoint>>&#xD;&#xA;The client/source must be an element stereotyped by &lt;&lt;View>>"/>

-    </eAnnotations>

-    <eClassifiers xsi:type="ecore:EClass" name="Conform">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Dependency" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="View">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="viewPoint" ordered="false"

-          unique="false" lowerBound="1" eType="#//modelelements/ViewPoint" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ViewPoint">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="stakeHolders" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="purpose" ordered="false"

-          unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="concerns" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="languages" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="methods" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Rationale">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Comment" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Problem">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Comment" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="blocks" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks"

-      nsPrefix="Blocks">

-    <eClassifiers xsi:type="ecore:EClass" name="Block">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEncapsulated" ordered="false"

-          unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="DistributedProperty">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Dimension">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_InstanceSpecification"

-          ordered="false" unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Unit">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_InstanceSpecification"

-          ordered="false" unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="dimension" ordered="false"

-          unique="false" eType="#//blocks/Dimension"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ValueType">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_DataType" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//DataType"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="unit" ordered="false"

-          unique="false" eType="#//blocks/Unit"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="dimension" ordered="false"

-          unique="false" eType="#//blocks/Dimension"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="NestedConnectorEnd">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="propertyPath" unique="false"

-          lowerBound="1" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_ConnectorEnd" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ConnectorEnd"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ParticipantProperty">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="end" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ConnectorProperty">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="connector" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="BindingConnector">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Connector" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="PropertySpecificType">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Classifier" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Classifier"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="portandflows" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows"

-      nsPrefix="PortAndFlows">

-    <eClassifiers xsi:type="ecore:EClass" name="FlowPort">

-      <eOperations name="getIcon" ordered="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Image"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Port" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAtomic" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"

-          changeable="false" volatile="true" transient="true" defaultValueLiteral="false"

-          derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="isConjugated" ordered="false"

-          unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" ordered="false"

-          unique="false" lowerBound="1" eType="#//portandflows/FlowDirection" defaultValueLiteral="inout"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="FlowDirection">

-      <eLiterals name="in"/>

-      <eLiterals name="out" value="1"/>

-      <eLiterals name="inout" value="2"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FlowProperty">

-      <eOperations name="getIcon" ordered="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Image"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" ordered="false"

-          unique="false" lowerBound="1" eType="#//portandflows/FlowDirection" defaultValueLiteral="inout"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FlowSpecification">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Interface" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Interface"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ItemFlow">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_InformationFlow"

-          ordered="false" unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InformationFlow"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="itemProperty" ordered="false"

-          unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="constraints" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints"

-      nsPrefix="Constraints">

-    <eClassifiers xsi:type="ecore:EClass" name="ConstraintBlock" eSuperTypes="#//blocks/Block"/>

-    <eClassifiers xsi:type="ecore:EClass" name="ConstraintProperty">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="activities" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities"

-      nsPrefix="Activities">

-    <eClassifiers xsi:type="ecore:EClass" name="Optional">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Rate">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityEdge" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityEdge"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="rate" ordered="false"

-          unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Probability">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityEdge" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityEdge"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_ParameterSet" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ParameterSet"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="probability" ordered="false"

-          unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Continuous" eSuperTypes="#//activities/Rate"/>

-    <eClassifiers xsi:type="ecore:EClass" name="Discrete" eSuperTypes="#//activities/Rate"/>

-    <eClassifiers xsi:type="ecore:EClass" name="ControlOperator">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Operation" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Behavior" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Behavior"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="NoBuffer">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_ObjectNode" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ObjectNode"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Overwrite">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_ObjectNode" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ObjectNode"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="allocations" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations"

-      nsPrefix="Allocations">

-    <eClassifiers xsi:type="ecore:EClass" name="Allocate">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Abstraction" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Abstraction"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Allocated">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_NamedElement" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="allocatedFrom" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

-          changeable="false" volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="allocatedTo" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

-          changeable="false" volatile="true" transient="true" derived="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="AllocateActivityPartition">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityPartition"

-          ordered="false" unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityPartition"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="requirements" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements"

-      nsPrefix="Requirements">

-    <eClassifiers xsi:type="ecore:EClass" name="DeriveReqt" eSuperTypes="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>

-    <eClassifiers xsi:type="ecore:EClass" name="Verify" eSuperTypes="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>

-    <eClassifiers xsi:type="ecore:EClass" name="Copy" eSuperTypes="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>

-    <eClassifiers xsi:type="ecore:EClass" name="Satisfy" eSuperTypes="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>

-    <eClassifiers xsi:type="ecore:EClass" name="TestCase">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Behavior" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Behavior"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Operation" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="verifies" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/Requirement" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Requirement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" unique="false"

-          lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="derived" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/Requirement" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="derivedFrom" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/Requirement" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="satisfiedBy" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

-          changeable="false" volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="refinedBy" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

-          changeable="false" volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="tracedTo" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

-          changeable="false" volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="verifiedBy" ordered="false"

-          unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"

-          changeable="false" volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="master" ordered="false"

-          unique="false" eType="#//requirements/Requirement" changeable="false" volatile="true"

-          transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="RequirementRelated">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_NamedElement" ordered="false"

-          unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="tracedFrom" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/Requirement" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="satisfies" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/Requirement" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="refines" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/Requirement" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="verifies" ordered="false"

-          unique="false" upperBound="-1" eType="#//requirements/Requirement" changeable="false"

-          volatile="true" transient="true" derived="true"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="interactions" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Interactions"

-      nsPrefix="Interactions">

-    <eClassifiers xsi:type="ecore:EDataType" name="Dummy" instanceClassName="java.lang.String"/>

-  </eSubpackages>

-  <eSubpackages name="statemachines" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/StateMachines"

-      nsPrefix="StateMachines">

-    <eClassifiers xsi:type="ecore:EDataType" name="Dummy" instanceClassName="java.lang.String"/>

-  </eSubpackages>

-  <eSubpackages name="usecases" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/UseCases"

-      nsPrefix="UseCases">

-    <eClassifiers xsi:type="ecore:EDataType" name="Dummy" instanceClassName="java.lang.String"/>

-  </eSubpackages>

-</ecore:EPackage>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/plugin.properties b/plugins/sysml/org.eclipse.papyrus.sysml/plugin.properties
deleted file mode 100644
index 94c70c89d03..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/plugin.properties
+++ /dev/null
@@ -1,12 +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:

-#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation

-##################################################################################

-pluginName=UML profile for SysML (from OMG SysML V1.1 formal/2008-11-02)

-providerName=Eclipse Modeling Project

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml/plugin.xml
deleted file mode 100644
index c134fafc34d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/plugin.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

-  <extension point="org.eclipse.emf.ecore.generated_package">

-    <package 

-       uri = "http://www.eclipse.org/papyrus/0.7.0/SysML" 

-       class = "org.eclipse.papyrus.sysml.SysmlPackage"

-       genModel = "model/SysML.profile.genmodel" /> 

-  </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements"

-            class="org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks"

-            class="org.eclipse.papyrus.sysml.blocks.BlocksPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows"

-            class="org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints"

-            class="org.eclipse.papyrus.sysml.constraints.ConstraintsPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities"

-            class="org.eclipse.papyrus.sysml.activities.ActivitiesPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations"

-            class="org.eclipse.papyrus.sysml.allocations.AllocationsPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements"

-            class="org.eclipse.papyrus.sysml.requirements.RequirementsPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Interactions"

-            class="org.eclipse.papyrus.sysml.interactions.InteractionsPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/StateMachines"

-            class="org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SysML.profile -->

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/SysML/UseCases"

-            class="org.eclipse.papyrus.sysml.usecases.UsecasesPackage"

-            genModel="model/SysML.profile.genmodel"/>

-   </extension>

-

-  

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/> 

-  </extension>  

-

-  

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/> 

-  </extension>  

-  

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/> 

-  </extension>    

-  

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/> 

-  </extension>      

-

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/> 

-  </extension>        

-

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/> 

-  </extension>       

-

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/> 

-  </extension>     

-

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/> 

-  </extension>     

-    

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/Interactions" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/> 

-  </extension> 

-

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-        <profile 

-   			uri="http://www.eclipse.org/papyrus/0.7.0/SysML/StateMachines" 

-   			location="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/> 

-  </extension>

-  <extension

-        point="org.eclipse.uml2.uml.generated_package">

-     <profile

-           uri="http://www.eclipse.org/papyrus/0.7.0/SysML/UseCases"

-           location="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>

-  </extension> 

-  <extension

-         point="org.eclipse.emf.ecore.uri_mapping">

-      <mapping

-            source="pathmap://SysML_LIBRARIES/"

-            target="platform:/plugin/org.eclipse.papyrus.sysml/libraries/"/>

-      <mapping

-            source="pathmap://SysML_PROFILES/"

-            target="platform:/plugin/org.eclipse.papyrus.sysml/model/"/>

-   </extension>

-   <extension

-        point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

-     <profile

-           description="UML profile for SysML (from OMG SysML V1.1 formal/2008-11-02)"

-           iconpath="icons/SysMLProfile.gif"

-           name="SysML"

-           path="pathmap://SysML_PROFILES/SysML.profile.uml"

-           provider="Eclipse Modeling Project">

-     </profile>

-  </extension>

-  <extension

-        point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">

-     <library

-           description="UML profile for SysML (from OMG SysML V1.1 formal/2008-11-02)"

-           iconpath="icons/SysMLLibrary.gif"

-           name="SysMLPrimitiveTypes"

-           path="pathmap://SysML_LIBRARIES/SysMLPrimitiveTypes.uml"

-           provider="Eclipse Modeling Project">

-     </library>

-  </extension>    

-</plugin>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/pom.xml b/plugins/sysml/org.eclipse.papyrus.sysml/pom.xml
deleted file mode 100644
index b43ba2ef7d7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.sysml</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlFactory.java
deleted file mode 100644
index 820add8a829..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml;

-

-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.sysml.SysmlPackage

- * @generated

- */

-public interface SysmlFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	SysmlFactory eINSTANCE = org.eclipse.papyrus.sysml.internal.impl.SysmlFactoryImpl.init();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	SysmlPackage getSysmlPackage();

-

-} // SysmlFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlPackage.java
deleted file mode 100644
index 3953a44c237..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/SysmlPackage.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml;

-

-import org.eclipse.emf.ecore.EDataType;

-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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc --> <!-- begin-model-doc --> Version : 1.0 Based on OMG

- * SysML Specification V1.0 (formal/2007-09-01) Trace instead of Abstraction in

- * SysML specifications. <!-- end-model-doc -->

- *

- * @see org.eclipse.papyrus.sysml.SysmlFactory

- * @model kind="package"

- * @generated

- */

-public interface SysmlPackage extends EPackage {

-

-	/**

-	 * <!-- 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 '<em>Dummy</em>' data type. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see java.lang.String

-		 * @see org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl#getDummy()

-		 * @generated

-		 */

-		EDataType DUMMY = eINSTANCE.getDummy();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "sysml";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "SysML";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	SysmlPackage eINSTANCE = org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl.init();

-

-	/**

-	 * The meta object id for the '<em>Dummy</em>' data type. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see java.lang.String

-	 * @see org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl#getDummy()

-	 * @generated

-	 */

-	int DUMMY = 0;

-

-	/**

-	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for data type '<em>Dummy</em>'.

-	 * @see java.lang.String

-	 * @model instanceClass="java.lang.String"

-	 * @generated

-	 */

-	EDataType getDummy();

-

-	/**

-	 * 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

-	 */

-	SysmlFactory getSysmlFactory();

-

-} // SysmlPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
deleted file mode 100644
index d7bfc047646..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-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.sysml.activities.ActivitiesPackage

- * @generated

- */

-public interface ActivitiesFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ActivitiesFactory eINSTANCE = org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Optional</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Optional</em>'.

-	 * @generated

-	 */

-	Optional createOptional();

-

-	/**

-	 * Returns a new object of class '<em>Continuous</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Continuous</em>'.

-	 * @generated

-	 */

-	Continuous createContinuous();

-

-	/**

-	 * Returns a new object of class '<em>Control Operator</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Control Operator</em>'.

-	 * @generated

-	 */

-	ControlOperator createControlOperator();

-

-	/**

-	 * Returns a new object of class '<em>Discrete</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Discrete</em>'.

-	 * @generated

-	 */

-	Discrete createDiscrete();

-

-	/**

-	 * Returns a new object of class '<em>No Buffer</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>No Buffer</em>'.

-	 * @generated

-	 */

-	NoBuffer createNoBuffer();

-

-	/**

-	 * Returns a new object of class '<em>Overwrite</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Overwrite</em>'.

-	 * @generated

-	 */

-	Overwrite createOverwrite();

-

-	/**

-	 * Returns a new object of class '<em>Probability</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Probability</em>'.

-	 * @generated

-	 */

-	Probability createProbability();

-

-	/**

-	 * Returns a new object of class '<em>Rate</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Rate</em>'.

-	 * @generated

-	 */

-	Rate createRate();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ActivitiesPackage getActivitiesPackage();

-

-} // ActivitiesFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
deleted file mode 100644
index e1ed3d66064..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
+++ /dev/null
@@ -1,870 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains

- * accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesFactory

- * @model kind="package"

- * @generated

- */

-public interface ActivitiesPackage extends EPackage {

-

-	/**

-	 * <!-- 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.sysml.activities.internal.impl.OptionalImpl

-		 * <em>Optional</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOptional()

-		 * @generated

-		 */

-		EClass OPTIONAL = eINSTANCE.getOptional();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference OPTIONAL__BASE_PARAMETER = eINSTANCE.getOptional_Base_Parameter();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl <em>Rate</em>}' class.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getRate()

-		 * @generated

-		 */

-		EClass RATE = eINSTANCE.getRate();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference RATE__BASE_PARAMETER = eINSTANCE.getRate_Base_Parameter();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Activity Edge</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference RATE__BASE_ACTIVITY_EDGE = eINSTANCE.getRate_Base_ActivityEdge();

-

-		/**

-		 * The meta object literal for the '<em><b>Rate</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference RATE__RATE = eINSTANCE.getRate_Rate();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl <em>Probability</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getProbability()

-		 * @generated

-		 */

-		EClass PROBABILITY = eINSTANCE.getProbability();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Activity Edge</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PROBABILITY__BASE_ACTIVITY_EDGE = eINSTANCE.getProbability_Base_ActivityEdge();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Parameter Set</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PROBABILITY__BASE_PARAMETER_SET = eINSTANCE.getProbability_Base_ParameterSet();

-

-		/**

-		 * The meta object literal for the '<em><b>Probability</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PROBABILITY__PROBABILITY = eINSTANCE.getProbability_Probability();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl <em>Continuous</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getContinuous()

-		 * @generated

-		 */

-		EClass CONTINUOUS = eINSTANCE.getContinuous();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl

-		 * <em>Discrete</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getDiscrete()

-		 * @generated

-		 */

-		EClass DISCRETE = eINSTANCE.getDiscrete();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl <em>Control Operator</em>}'

-		 * class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getControlOperator()

-		 * @generated

-		 */

-		EClass CONTROL_OPERATOR = eINSTANCE.getControlOperator();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Operation</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONTROL_OPERATOR__BASE_OPERATION = eINSTANCE.getControlOperator_Base_Operation();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Behavior</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONTROL_OPERATOR__BASE_BEHAVIOR = eINSTANCE.getControlOperator_Base_Behavior();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl

-		 * <em>No Buffer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getNoBuffer()

-		 * @generated

-		 */

-		EClass NO_BUFFER = eINSTANCE.getNoBuffer();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Object Node</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference NO_BUFFER__BASE_OBJECT_NODE = eINSTANCE.getNoBuffer_Base_ObjectNode();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl

-		 * <em>Overwrite</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl

-		 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOverwrite()

-		 * @generated

-		 */

-		EClass OVERWRITE = eINSTANCE.getOverwrite();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Object Node</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference OVERWRITE__BASE_OBJECT_NODE = eINSTANCE.getOverwrite_Base_ObjectNode();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "activities";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Activities";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "Activities";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ActivitiesPackage eINSTANCE = org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl <em>Optional</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOptional()

-	 * @generated

-	 */

-	int OPTIONAL = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OPTIONAL__BASE_PARAMETER = 0;

-

-	/**

-	 * The number of structural features of the '<em>Optional</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OPTIONAL_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Optional</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OPTIONAL_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl <em>Rate</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getRate()

-	 * @generated

-	 */

-	int RATE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATE__BASE_PARAMETER = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATE__BASE_ACTIVITY_EDGE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Rate</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATE__RATE = 2;

-

-	/**

-	 * The number of structural features of the '<em>Rate</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATE_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>Rate</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl

-	 * <em>Probability</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getProbability()

-	 * @generated

-	 */

-	int PROBABILITY = 2;

-

-	/**

-	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBABILITY__BASE_ACTIVITY_EDGE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Parameter Set</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBABILITY__BASE_PARAMETER_SET = 1;

-

-	/**

-	 * The feature id for the '<em><b>Probability</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBABILITY__PROBABILITY = 2;

-

-	/**

-	 * The number of structural features of the '<em>Probability</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBABILITY_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>Probability</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBABILITY_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl

-	 * <em>Continuous</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ContinuousImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getContinuous()

-	 * @generated

-	 */

-	int CONTINUOUS = 3;

-

-	/**

-	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTINUOUS__BASE_PARAMETER = RATE__BASE_PARAMETER;

-

-	/**

-	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTINUOUS__BASE_ACTIVITY_EDGE = RATE__BASE_ACTIVITY_EDGE;

-

-	/**

-	 * The feature id for the '<em><b>Rate</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTINUOUS__RATE = RATE__RATE;

-

-	/**

-	 * The number of structural features of the '<em>Continuous</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTINUOUS_FEATURE_COUNT = RATE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Continuous</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTINUOUS_OPERATION_COUNT = RATE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl <em>Discrete</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.DiscreteImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getDiscrete()

-	 * @generated

-	 */

-	int DISCRETE = 4;

-

-	/**

-	 * The feature id for the '<em><b>Base Parameter</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCRETE__BASE_PARAMETER = RATE__BASE_PARAMETER;

-

-	/**

-	 * The feature id for the '<em><b>Base Activity Edge</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCRETE__BASE_ACTIVITY_EDGE = RATE__BASE_ACTIVITY_EDGE;

-

-	/**

-	 * The feature id for the '<em><b>Rate</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCRETE__RATE = RATE__RATE;

-

-	/**

-	 * The number of structural features of the '<em>Discrete</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCRETE_FEATURE_COUNT = RATE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Discrete</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCRETE_OPERATION_COUNT = RATE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl <em>Control Operator</em>}' class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getControlOperator()

-	 * @generated

-	 */

-	int CONTROL_OPERATOR = 5;

-

-	/**

-	 * The feature id for the '<em><b>Base Operation</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROL_OPERATOR__BASE_OPERATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Behavior</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROL_OPERATOR__BASE_BEHAVIOR = 1;

-

-	/**

-	 * The number of structural features of the '<em>Control Operator</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROL_OPERATOR_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Control Operator</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROL_OPERATOR_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl <em>No Buffer</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getNoBuffer()

-	 * @generated

-	 */

-	int NO_BUFFER = 6;

-

-	/**

-	 * The feature id for the '<em><b>Base Object Node</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NO_BUFFER__BASE_OBJECT_NODE = 0;

-

-	/**

-	 * The number of structural features of the '<em>No Buffer</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NO_BUFFER_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>No Buffer</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NO_BUFFER_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl <em>Overwrite</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl

-	 * @see org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl#getOverwrite()

-	 * @generated

-	 */

-	int OVERWRITE = 7;

-

-	/**

-	 * The feature id for the '<em><b>Base Object Node</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OVERWRITE__BASE_OBJECT_NODE = 0;

-

-	/**

-	 * The number of structural features of the '<em>Overwrite</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OVERWRITE_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Overwrite</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OVERWRITE_OPERATION_COUNT = 0;

-

-	/**

-	 * 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

-	 */

-	ActivitiesFactory getActivitiesFactory();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Continuous <em>Continuous</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Continuous</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Continuous

-	 * @generated

-	 */

-	EClass getContinuous();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.activities.ControlOperator

-	 * <em>Control Operator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for class '<em>Control Operator</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.ControlOperator

-	 * @generated

-	 */

-	EClass getControlOperator();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior <em>Base Behavior</em>} '.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Behavior</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior()

-	 * @see #getControlOperator()

-	 * @generated

-	 */

-	EReference getControlOperator_Base_Behavior();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#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.sysml.activities.ControlOperator#getBase_Operation()

-	 * @see #getControlOperator()

-	 * @generated

-	 */

-	EReference getControlOperator_Base_Operation();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Discrete <em>Discrete</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Discrete</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Discrete

-	 * @generated

-	 */

-	EClass getDiscrete();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.NoBuffer <em>No Buffer</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>No Buffer</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.NoBuffer

-	 * @generated

-	 */

-	EClass getNoBuffer();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode

-	 * <em>Base Object Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Object Node</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode()

-	 * @see #getNoBuffer()

-	 * @generated

-	 */

-	EReference getNoBuffer_Base_ObjectNode();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Optional <em>Optional</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Optional</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Optional

-	 * @generated

-	 */

-	EClass getOptional();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Parameter</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter()

-	 * @see #getOptional()

-	 * @generated

-	 */

-	EReference getOptional_Base_Parameter();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Overwrite <em>Overwrite</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Overwrite</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Overwrite

-	 * @generated

-	 */

-	EClass getOverwrite();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode

-	 * <em>Base Object Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Object Node</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode()

-	 * @see #getOverwrite()

-	 * @generated

-	 */

-	EReference getOverwrite_Base_ObjectNode();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Probability <em>Probability</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Probability</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Probability

-	 * @generated

-	 */

-	EClass getProbability();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ActivityEdge

-	 * <em>Base Activity Edge</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Activity Edge</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Probability#getBase_ActivityEdge()

-	 * @see #getProbability()

-	 * @generated

-	 */

-	EReference getProbability_Base_ActivityEdge();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ParameterSet

-	 * <em>Base Parameter Set</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Parameter Set</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Probability#getBase_ParameterSet()

-	 * @see #getProbability()

-	 * @generated

-	 */

-	EReference getProbability_Base_ParameterSet();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Probability#getProbability <em>Probability</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Probability</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Probability#getProbability()

-	 * @see #getProbability()

-	 * @generated

-	 */

-	EReference getProbability_Probability();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.activities.Rate <em>Rate</em>}'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Rate</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Rate

-	 * @generated

-	 */

-	EClass getRate();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.activities.Rate#getBase_ActivityEdge

-	 * <em>Base Activity Edge</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Activity Edge</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Rate#getBase_ActivityEdge()

-	 * @see #getRate()

-	 * @generated

-	 */

-	EReference getRate_Base_ActivityEdge();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_Parameter <em>Base Parameter</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Parameter</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Rate#getBase_Parameter()

-	 * @see #getRate()

-	 * @generated

-	 */

-	EReference getRate_Base_Parameter();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Rate#getRate <em>Rate</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Rate</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Rate#getRate()

-	 * @see #getRate()

-	 * @generated

-	 */

-	EReference getRate_Rate();

-

-} // ActivitiesPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Continuous.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Continuous.java
deleted file mode 100644
index 7af2047755b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Continuous.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Continuous</b></em>'. <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getContinuous()

- * @model

- * @generated

- */

-public interface Continuous extends Rate {

-} // Continuous

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ControlOperator.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ControlOperator.java
deleted file mode 100644
index 43694a322ff..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ControlOperator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.Operation;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Control Operator</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Operation <em>Base Operation</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior <em>Base Behavior</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getControlOperator()

- * @model

- * @generated

- */

-public interface ControlOperator extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Behavior</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Behavior</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 Behavior</em>' reference.

-	 * @see #setBase_Behavior(Behavior)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getControlOperator_Base_Behavior()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Behavior getBase_Behavior();

-

-	/**

-	 * 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.sysml.activities.ActivitiesPackage#getControlOperator_Base_Operation()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Operation getBase_Operation();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#getBase_Behavior <em>Base Behavior</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Behavior</em>' reference.

-	 * @see #getBase_Behavior()

-	 * @generated

-	 */

-	void setBase_Behavior(Behavior value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.ControlOperator#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);

-

-} // ControlOperator

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Discrete.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Discrete.java
deleted file mode 100644
index 14830fb9f55..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Discrete.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Discrete</b></em>'. <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getDiscrete()

- * @model

- * @generated

- */

-public interface Discrete extends Rate {

-} // Discrete

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/NoBuffer.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/NoBuffer.java
deleted file mode 100644
index b9cacccc111..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/NoBuffer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.ObjectNode;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>No Buffer</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode <em>Base Object Node</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getNoBuffer()

- * @model

- * @generated

- */

-public interface NoBuffer extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Object Node</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Object Node</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 Object Node</em>' reference.

-	 * @see #setBase_ObjectNode(ObjectNode)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getNoBuffer_Base_ObjectNode()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	ObjectNode getBase_ObjectNode();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.NoBuffer#getBase_ObjectNode <em>Base Object Node</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Object Node</em>' reference.

-	 * @see #getBase_ObjectNode()

-	 * @generated

-	 */

-	void setBase_ObjectNode(ObjectNode value);

-

-} // NoBuffer

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java
deleted file mode 100644
index c6b2cd3561f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Parameter;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Optional</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptional()

- * @model

- * @generated

- */

-public interface Optional extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Parameter</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Parameter</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 Parameter</em>' reference.

-	 * @see #setBase_Parameter(Parameter)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptional_Base_Parameter()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Parameter getBase_Parameter();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Parameter</em>' reference.

-	 * @see #getBase_Parameter()

-	 * @generated

-	 */

-	void setBase_Parameter(Parameter value);

-

-} // Optional

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Overwrite.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Overwrite.java
deleted file mode 100644
index 518c85fa82b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Overwrite.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.ObjectNode;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Overwrite</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode <em>Base Object Node</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOverwrite()

- * @model

- * @generated

- */

-public interface Overwrite extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Object Node</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Object Node</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 Object Node</em>' reference.

-	 * @see #setBase_ObjectNode(ObjectNode)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOverwrite_Base_ObjectNode()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	ObjectNode getBase_ObjectNode();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Overwrite#getBase_ObjectNode <em>Base Object Node</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Object Node</em>' reference.

-	 * @see #getBase_ObjectNode()

-	 * @generated

-	 */

-	void setBase_ObjectNode(ObjectNode value);

-

-} // Overwrite

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Probability.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Probability.java
deleted file mode 100644
index 565b810542c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Probability.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.ActivityEdge;

-import org.eclipse.uml2.uml.ParameterSet;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Probability</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ActivityEdge <em>Base Activity Edge</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ParameterSet <em>Base Parameter Set</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Probability#getProbability <em>Probability</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability()

- * @model

- * @generated

- */

-public interface Probability extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Activity Edge</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Activity Edge</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 Activity Edge</em>' reference.

-	 * @see #setBase_ActivityEdge(ActivityEdge)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability_Base_ActivityEdge()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	ActivityEdge getBase_ActivityEdge();

-

-	/**

-	 * Returns the value of the '<em><b>Base Parameter Set</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Parameter Set</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 Parameter Set</em>' reference.

-	 * @see #setBase_ParameterSet(ParameterSet)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability_Base_ParameterSet()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	ParameterSet getBase_ParameterSet();

-

-	/**

-	 * Returns the value of the '<em><b>Probability</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Probability</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Probability</em>' reference.

-	 * @see #setProbability(ValueSpecification)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getProbability_Probability()

-	 * @model ordered="false"

-	 * @generated

-	 */

-	ValueSpecification getProbability();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ActivityEdge <em>Base Activity Edge</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Activity Edge</em>' reference.

-	 * @see #getBase_ActivityEdge()

-	 * @generated

-	 */

-	void setBase_ActivityEdge(ActivityEdge value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Probability#getBase_ParameterSet <em>Base Parameter Set</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Parameter Set</em>' reference.

-	 * @see #getBase_ParameterSet()

-	 * @generated

-	 */

-	void setBase_ParameterSet(ParameterSet value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Probability#getProbability <em>Probability</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Probability</em>' reference.

-	 * @see #getProbability()

-	 * @generated

-	 */

-	void setProbability(ValueSpecification value);

-

-} // Probability

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Rate.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Rate.java
deleted file mode 100644
index 06b24cd226e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Rate.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.ActivityEdge;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.Parameter;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Rate</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_Parameter <em>Base Parameter</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_ActivityEdge <em>Base Activity Edge</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Rate#getRate <em>Rate</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate()

- * @model

- * @generated

- */

-public interface Rate extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Activity Edge</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Activity Edge</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 Activity Edge</em>' reference.

-	 * @see #setBase_ActivityEdge(ActivityEdge)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate_Base_ActivityEdge()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	ActivityEdge getBase_ActivityEdge();

-

-	/**

-	 * Returns the value of the '<em><b>Base Parameter</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Parameter</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 Parameter</em>' reference.

-	 * @see #setBase_Parameter(Parameter)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate_Base_Parameter()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Parameter getBase_Parameter();

-

-	/**

-	 * Returns the value of the '<em><b>Rate</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Rate</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Rate</em>' reference.

-	 * @see #setRate(InstanceSpecification)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getRate_Rate()

-	 * @model ordered="false"

-	 * @generated

-	 */

-	InstanceSpecification getRate();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_ActivityEdge <em>Base Activity Edge</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Activity Edge</em>' reference.

-	 * @see #getBase_ActivityEdge()

-	 * @generated

-	 */

-	void setBase_ActivityEdge(ActivityEdge value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Rate#getBase_Parameter <em>Base Parameter</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Parameter</em>' reference.

-	 * @see #getBase_Parameter()

-	 * @generated

-	 */

-	void setBase_Parameter(Parameter value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Rate#getRate <em>Rate</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Rate</em>' reference.

-	 * @see #getRate()

-	 * @generated

-	 */

-	void setRate(InstanceSpecification value);

-

-} // Rate

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesFactoryImpl.java
deleted file mode 100644
index 8e05955df75..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesFactoryImpl.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.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.sysml.activities.ActivitiesFactory;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Continuous;

-import org.eclipse.papyrus.sysml.activities.ControlOperator;

-import org.eclipse.papyrus.sysml.activities.Discrete;

-import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optional;

-import org.eclipse.papyrus.sysml.activities.Overwrite;

-import org.eclipse.papyrus.sysml.activities.Probability;

-import org.eclipse.papyrus.sysml.activities.Rate;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ActivitiesPackage getPackage() {

-		return ActivitiesPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ActivitiesFactory init() {

-		try {

-			ActivitiesFactory theActivitiesFactory = (ActivitiesFactory) EPackage.Registry.INSTANCE.getEFactory(ActivitiesPackage.eNS_URI);

-			if (theActivitiesFactory != null) {

-				return theActivitiesFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ActivitiesFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case ActivitiesPackage.OPTIONAL:

-			return createOptional();

-		case ActivitiesPackage.RATE:

-			return createRate();

-		case ActivitiesPackage.PROBABILITY:

-			return createProbability();

-		case ActivitiesPackage.CONTINUOUS:

-			return createContinuous();

-		case ActivitiesPackage.DISCRETE:

-			return createDiscrete();

-		case ActivitiesPackage.CONTROL_OPERATOR:

-			return createControlOperator();

-		case ActivitiesPackage.NO_BUFFER:

-			return createNoBuffer();

-		case ActivitiesPackage.OVERWRITE:

-			return createOverwrite();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Optional createOptional() {

-		OptionalImpl optional = new OptionalImpl();

-		return optional;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Continuous createContinuous() {

-		ContinuousImpl continuous = new ContinuousImpl();

-		return continuous;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ControlOperator createControlOperator() {

-		ControlOperatorImpl controlOperator = new ControlOperatorImpl();

-		return controlOperator;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Discrete createDiscrete() {

-		DiscreteImpl discrete = new DiscreteImpl();

-		return discrete;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NoBuffer createNoBuffer() {

-		NoBufferImpl noBuffer = new NoBufferImpl();

-		return noBuffer;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Overwrite createOverwrite() {

-		OverwriteImpl overwrite = new OverwriteImpl();

-		return overwrite;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Probability createProbability() {

-		ProbabilityImpl probability = new ProbabilityImpl();

-		return probability;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Rate createRate() {

-		RateImpl rate = new RateImpl();

-		return rate;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesPackage getActivitiesPackage() {

-		return (ActivitiesPackage) getEPackage();

-	}

-

-} // ActivitiesFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesPackageImpl.java
deleted file mode 100644
index 4f1571be694..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ActivitiesPackageImpl.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesFactory;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Continuous;

-import org.eclipse.papyrus.sysml.activities.ControlOperator;

-import org.eclipse.papyrus.sysml.activities.Discrete;

-import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optional;

-import org.eclipse.papyrus.sysml.activities.Overwrite;

-import org.eclipse.papyrus.sysml.activities.Probability;

-import org.eclipse.papyrus.sysml.activities.Rate;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPackage {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass optionalEClass = null;

-

-	/**

-	 * <!-- 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 ActivitiesPackage#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 ActivitiesPackage init() {

-		if (isInited) {

-			return (ActivitiesPackage) EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ActivitiesPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theActivitiesPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theActivitiesPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theActivitiesPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ActivitiesPackage.eNS_URI, theActivitiesPackage);

-		return theActivitiesPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getOptional() {

-		return optionalEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getOptional_Base_Parameter() {

-		return (EReference) optionalEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass rateEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass probabilityEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass continuousEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass discreteEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass controlOperatorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass noBufferEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass overwriteEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.activities.ActivitiesPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ActivitiesPackageImpl() {

-		super(eNS_URI, ActivitiesFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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

-		optionalEClass = createEClass(OPTIONAL);

-		createEReference(optionalEClass, OPTIONAL__BASE_PARAMETER);

-

-		rateEClass = createEClass(RATE);

-		createEReference(rateEClass, RATE__BASE_PARAMETER);

-		createEReference(rateEClass, RATE__BASE_ACTIVITY_EDGE);

-		createEReference(rateEClass, RATE__RATE);

-

-		probabilityEClass = createEClass(PROBABILITY);

-		createEReference(probabilityEClass, PROBABILITY__BASE_ACTIVITY_EDGE);

-		createEReference(probabilityEClass, PROBABILITY__BASE_PARAMETER_SET);

-		createEReference(probabilityEClass, PROBABILITY__PROBABILITY);

-

-		continuousEClass = createEClass(CONTINUOUS);

-

-		discreteEClass = createEClass(DISCRETE);

-

-		controlOperatorEClass = createEClass(CONTROL_OPERATOR);

-		createEReference(controlOperatorEClass, CONTROL_OPERATOR__BASE_OPERATION);

-		createEReference(controlOperatorEClass, CONTROL_OPERATOR__BASE_BEHAVIOR);

-

-		noBufferEClass = createEClass(NO_BUFFER);

-		createEReference(noBufferEClass, NO_BUFFER__BASE_OBJECT_NODE);

-

-		overwriteEClass = createEClass(OVERWRITE);

-		createEReference(overwriteEClass, OVERWRITE__BASE_OBJECT_NODE);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesFactory getActivitiesFactory() {

-		return (ActivitiesFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getContinuous() {

-		return continuousEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getControlOperator() {

-		return controlOperatorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getControlOperator_Base_Behavior() {

-		return (EReference) controlOperatorEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getControlOperator_Base_Operation() {

-		return (EReference) controlOperatorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getDiscrete() {

-		return discreteEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getNoBuffer() {

-		return noBufferEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getNoBuffer_Base_ObjectNode() {

-		return (EReference) noBufferEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getOverwrite() {

-		return overwriteEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getOverwrite_Base_ObjectNode() {

-		return (EReference) overwriteEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getProbability() {

-		return probabilityEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getProbability_Base_ActivityEdge() {

-		return (EReference) probabilityEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getProbability_Base_ParameterSet() {

-		return (EReference) probabilityEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getProbability_Probability() {

-		return (EReference) probabilityEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getRate() {

-		return rateEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRate_Base_ActivityEdge() {

-		return (EReference) rateEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRate_Base_Parameter() {

-		return (EReference) rateEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRate_Rate() {

-		return (EReference) rateEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * 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);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		continuousEClass.getESuperTypes().add(this.getRate());

-		discreteEClass.getESuperTypes().add(this.getRate());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(optionalEClass, Optional.class, "Optional", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getOptional_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Optional.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-

-		initEClass(rateEClass, Rate.class, "Rate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRate_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getRate_Base_ActivityEdge(), theUMLPackage.getActivityEdge(), null, "base_ActivityEdge", null, 1, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRate_Rate(), theUMLPackage.getInstanceSpecification(), null, "rate", null, 0, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(probabilityEClass, Probability.class, "Probability", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getProbability_Base_ActivityEdge(), theUMLPackage.getActivityEdge(), null, "base_ActivityEdge", null, 1, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-		initEReference(getProbability_Base_ParameterSet(), theUMLPackage.getParameterSet(), null, "base_ParameterSet", null, 1, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-		initEReference(getProbability_Probability(), theUMLPackage.getValueSpecification(), null, "probability", null, 0, 1, Probability.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-

-		initEClass(continuousEClass, Continuous.class, "Continuous", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(discreteEClass, Discrete.class, "Discrete", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(controlOperatorEClass, ControlOperator.class, "ControlOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getControlOperator_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, ControlOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-		initEReference(getControlOperator_Base_Behavior(), theUMLPackage.getBehavior(), null, "base_Behavior", null, 1, 1, ControlOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-

-		initEClass(noBufferEClass, NoBuffer.class, "NoBuffer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getNoBuffer_Base_ObjectNode(), theUMLPackage.getObjectNode(), null, "base_ObjectNode", null, 1, 1, NoBuffer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-

-		initEClass(overwriteEClass, Overwrite.class, "Overwrite", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getOverwrite_Base_ObjectNode(), theUMLPackage.getObjectNode(), null, "base_ObjectNode", null, 1, 1, Overwrite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-	}

-

-} // ActivitiesPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ContinuousImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ContinuousImpl.java
deleted file mode 100644
index be6f478e4d3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ContinuousImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Continuous;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Continuous</b></em>'. <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class ContinuousImpl extends RateImpl implements Continuous {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ContinuousImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.CONTINUOUS;

-	}

-

-} // ContinuousImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ControlOperatorImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ControlOperatorImpl.java
deleted file mode 100644
index 85c7b12ef91..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ControlOperatorImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.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.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.ControlOperator;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.Operation;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Control Operator</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl#getBase_Operation <em>Base Operation</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.ControlOperatorImpl#getBase_Behavior <em>Base Behavior</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ControlOperatorImpl extends MinimalEObjectImpl.Container implements ControlOperator {

-

-	/**

-	 * 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;

-

-	/**

-	 * The cached value of the '{@link #getBase_Behavior() <em>Base Behavior</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Behavior()

-	 * @generated

-	 * @ordered

-	 */

-	protected Behavior base_Behavior;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ControlOperatorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Behavior basicGetBase_Behavior() {

-		return base_Behavior;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Operation basicGetBase_Operation() {

-		return base_Operation;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

-			if (resolve) {

-				return getBase_Operation();

-			}

-			return basicGetBase_Operation();

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

-			if (resolve) {

-				return getBase_Behavior();

-			}

-			return basicGetBase_Behavior();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

-			return base_Operation != null;

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

-			return base_Behavior != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

-			setBase_Operation((Operation) newValue);

-			return;

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.CONTROL_OPERATOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION:

-			setBase_Operation((Operation) null);

-			return;

-		case ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Behavior getBase_Behavior() {

-		if (base_Behavior != null && base_Behavior.eIsProxy()) {

-			InternalEObject oldBase_Behavior = (InternalEObject) base_Behavior;

-			base_Behavior = (Behavior) eResolveProxy(oldBase_Behavior);

-			if (base_Behavior != oldBase_Behavior) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

-				}

-			}

-		}

-		return base_Behavior;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION, oldBase_Operation, base_Operation));

-				}

-			}

-		}

-		return base_Operation;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Behavior(Behavior newBase_Behavior) {

-		Behavior oldBase_Behavior = base_Behavior;

-		base_Behavior = newBase_Behavior;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.CONTROL_OPERATOR__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Operation(Operation newBase_Operation) {

-		Operation oldBase_Operation = base_Operation;

-		base_Operation = newBase_Operation;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.CONTROL_OPERATOR__BASE_OPERATION, oldBase_Operation, base_Operation));

-		}

-	}

-

-} // ControlOperatorImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/DiscreteImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/DiscreteImpl.java
deleted file mode 100644
index b5c01ac2325..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/DiscreteImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Discrete;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Discrete</b></em>'. <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class DiscreteImpl extends RateImpl implements Discrete {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DiscreteImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.DISCRETE;

-	}

-

-} // DiscreteImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/NoBufferImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/NoBufferImpl.java
deleted file mode 100644
index 1267758b28b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/NoBufferImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.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.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.uml2.uml.ObjectNode;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>No Buffer</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.NoBufferImpl#getBase_ObjectNode <em>Base Object Node</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class NoBufferImpl extends MinimalEObjectImpl.Container implements NoBuffer {

-

-	/**

-	 * The cached value of the '{@link #getBase_ObjectNode() <em>Base Object Node</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_ObjectNode()

-	 * @generated

-	 * @ordered

-	 */

-	protected ObjectNode base_ObjectNode;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected NoBufferImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ObjectNode basicGetBase_ObjectNode() {

-		return base_ObjectNode;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

-			if (resolve) {

-				return getBase_ObjectNode();

-			}

-			return basicGetBase_ObjectNode();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

-			return base_ObjectNode != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.NO_BUFFER;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ObjectNode getBase_ObjectNode() {

-		if (base_ObjectNode != null && base_ObjectNode.eIsProxy()) {

-			InternalEObject oldBase_ObjectNode = (InternalEObject) base_ObjectNode;

-			base_ObjectNode = (ObjectNode) eResolveProxy(oldBase_ObjectNode);

-			if (base_ObjectNode != oldBase_ObjectNode) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

-				}

-			}

-		}

-		return base_ObjectNode;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_ObjectNode(ObjectNode newBase_ObjectNode) {

-		ObjectNode oldBase_ObjectNode = base_ObjectNode;

-		base_ObjectNode = newBase_ObjectNode;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.NO_BUFFER__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

-		}

-	}

-

-} // NoBufferImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OptionalImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OptionalImpl.java
deleted file mode 100644
index 11508b6c986..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OptionalImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.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.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Optional;

-import org.eclipse.uml2.uml.Parameter;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Optional</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.OptionalImpl#getBase_Parameter <em>Base Parameter</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class OptionalImpl extends MinimalEObjectImpl.Container implements Optional {

-

-	/**

-	 * The cached value of the '{@link #getBase_Parameter() <em>Base Parameter</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Parameter()

-	 * @generated

-	 * @ordered

-	 */

-	protected Parameter base_Parameter;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected OptionalImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.OPTIONAL;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Parameter getBase_Parameter() {

-		if (base_Parameter != null && base_Parameter.eIsProxy()) {

-			InternalEObject oldBase_Parameter = (InternalEObject) base_Parameter;

-			base_Parameter = (Parameter) eResolveProxy(oldBase_Parameter);

-			if (base_Parameter != oldBase_Parameter) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.OPTIONAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

-				}

-			}

-		}

-		return base_Parameter;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Parameter basicGetBase_Parameter() {

-		return base_Parameter;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Parameter(Parameter newBase_Parameter) {

-		Parameter oldBase_Parameter = base_Parameter;

-		base_Parameter = newBase_Parameter;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.OPTIONAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

-			if (resolve) {

-				return getBase_Parameter();

-			}

-			return basicGetBase_Parameter();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

-			setBase_Parameter((Parameter) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

-			setBase_Parameter((Parameter) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

-			return base_Parameter != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // OptionalImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OverwriteImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OverwriteImpl.java
deleted file mode 100644
index 6934aaa574f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/OverwriteImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.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.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Overwrite;

-import org.eclipse.uml2.uml.ObjectNode;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Overwrite</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.OverwriteImpl#getBase_ObjectNode <em>Base Object Node</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class OverwriteImpl extends MinimalEObjectImpl.Container implements Overwrite {

-

-	/**

-	 * The cached value of the '{@link #getBase_ObjectNode() <em>Base Object Node</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_ObjectNode()

-	 * @generated

-	 * @ordered

-	 */

-	protected ObjectNode base_ObjectNode;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected OverwriteImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ObjectNode basicGetBase_ObjectNode() {

-		return base_ObjectNode;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

-			if (resolve) {

-				return getBase_ObjectNode();

-			}

-			return basicGetBase_ObjectNode();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

-			return base_ObjectNode != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.OVERWRITE;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE:

-			setBase_ObjectNode((ObjectNode) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ObjectNode getBase_ObjectNode() {

-		if (base_ObjectNode != null && base_ObjectNode.eIsProxy()) {

-			InternalEObject oldBase_ObjectNode = (InternalEObject) base_ObjectNode;

-			base_ObjectNode = (ObjectNode) eResolveProxy(oldBase_ObjectNode);

-			if (base_ObjectNode != oldBase_ObjectNode) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

-				}

-			}

-		}

-		return base_ObjectNode;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_ObjectNode(ObjectNode newBase_ObjectNode) {

-		ObjectNode oldBase_ObjectNode = base_ObjectNode;

-		base_ObjectNode = newBase_ObjectNode;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.OVERWRITE__BASE_OBJECT_NODE, oldBase_ObjectNode, base_ObjectNode));

-		}

-	}

-

-} // OverwriteImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ProbabilityImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ProbabilityImpl.java
deleted file mode 100644
index 21dd9a37b4f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/ProbabilityImpl.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.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.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Probability;

-import org.eclipse.uml2.uml.ActivityEdge;

-import org.eclipse.uml2.uml.ParameterSet;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Probability</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl#getBase_ActivityEdge <em>Base Activity Edge</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl#getBase_ParameterSet <em>Base Parameter Set</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.ProbabilityImpl#getProbability <em>Probability</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ProbabilityImpl extends MinimalEObjectImpl.Container implements Probability {

-

-	/**

-	 * The cached value of the '{@link #getBase_ActivityEdge() <em>Base Activity Edge</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_ActivityEdge()

-	 * @generated

-	 * @ordered

-	 */

-	protected ActivityEdge base_ActivityEdge;

-

-	/**

-	 * The cached value of the '{@link #getBase_ParameterSet() <em>Base Parameter Set</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_ParameterSet()

-	 * @generated

-	 * @ordered

-	 */

-	protected ParameterSet base_ParameterSet;

-

-	/**

-	 * The cached value of the '{@link #getProbability() <em>Probability</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getProbability()

-	 * @generated

-	 * @ordered

-	 */

-	protected ValueSpecification probability;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ProbabilityImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivityEdge basicGetBase_ActivityEdge() {

-		return base_ActivityEdge;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ParameterSet basicGetBase_ParameterSet() {

-		return base_ParameterSet;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ValueSpecification basicGetProbability() {

-		return probability;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

-			if (resolve) {

-				return getBase_ActivityEdge();

-			}

-			return basicGetBase_ActivityEdge();

-		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

-			if (resolve) {

-				return getBase_ParameterSet();

-			}

-			return basicGetBase_ParameterSet();

-		case ActivitiesPackage.PROBABILITY__PROBABILITY:

-			if (resolve) {

-				return getProbability();

-			}

-			return basicGetProbability();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

-			return base_ActivityEdge != null;

-		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

-			return base_ParameterSet != null;

-		case ActivitiesPackage.PROBABILITY__PROBABILITY:

-			return probability != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge) newValue);

-			return;

-		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

-			setBase_ParameterSet((ParameterSet) newValue);

-			return;

-		case ActivitiesPackage.PROBABILITY__PROBABILITY:

-			setProbability((ValueSpecification) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.PROBABILITY;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge) null);

-			return;

-		case ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET:

-			setBase_ParameterSet((ParameterSet) null);

-			return;

-		case ActivitiesPackage.PROBABILITY__PROBABILITY:

-			setProbability((ValueSpecification) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivityEdge getBase_ActivityEdge() {

-		if (base_ActivityEdge != null && base_ActivityEdge.eIsProxy()) {

-			InternalEObject oldBase_ActivityEdge = (InternalEObject) base_ActivityEdge;

-			base_ActivityEdge = (ActivityEdge) eResolveProxy(oldBase_ActivityEdge);

-			if (base_ActivityEdge != oldBase_ActivityEdge) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

-				}

-			}

-		}

-		return base_ActivityEdge;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ParameterSet getBase_ParameterSet() {

-		if (base_ParameterSet != null && base_ParameterSet.eIsProxy()) {

-			InternalEObject oldBase_ParameterSet = (InternalEObject) base_ParameterSet;

-			base_ParameterSet = (ParameterSet) eResolveProxy(oldBase_ParameterSet);

-			if (base_ParameterSet != oldBase_ParameterSet) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET, oldBase_ParameterSet, base_ParameterSet));

-				}

-			}

-		}

-		return base_ParameterSet;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ValueSpecification getProbability() {

-		if (probability != null && probability.eIsProxy()) {

-			InternalEObject oldProbability = (InternalEObject) probability;

-			probability = (ValueSpecification) eResolveProxy(oldProbability);

-			if (probability != oldProbability) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.PROBABILITY__PROBABILITY, oldProbability, probability));

-				}

-			}

-		}

-		return probability;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_ActivityEdge(ActivityEdge newBase_ActivityEdge) {

-		ActivityEdge oldBase_ActivityEdge = base_ActivityEdge;

-		base_ActivityEdge = newBase_ActivityEdge;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.PROBABILITY__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_ParameterSet(ParameterSet newBase_ParameterSet) {

-		ParameterSet oldBase_ParameterSet = base_ParameterSet;

-		base_ParameterSet = newBase_ParameterSet;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.PROBABILITY__BASE_PARAMETER_SET, oldBase_ParameterSet, base_ParameterSet));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setProbability(ValueSpecification newProbability) {

-		ValueSpecification oldProbability = probability;

-		probability = newProbability;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.PROBABILITY__PROBABILITY, oldProbability, probability));

-		}

-	}

-

-} // ProbabilityImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/RateImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/RateImpl.java
deleted file mode 100644
index 3a53fce3aae..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/internal/impl/RateImpl.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.internal.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.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Rate;

-import org.eclipse.uml2.uml.ActivityEdge;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.Parameter;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Rate</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl#getBase_Parameter <em>Base Parameter</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl#getBase_ActivityEdge <em>Base Activity Edge</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.activities.internal.impl.RateImpl#getRate <em>Rate</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class RateImpl extends MinimalEObjectImpl.Container implements Rate {

-

-	/**

-	 * The cached value of the '{@link #getBase_Parameter() <em>Base Parameter</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Parameter()

-	 * @generated

-	 * @ordered

-	 */

-	protected Parameter base_Parameter;

-

-	/**

-	 * The cached value of the '{@link #getBase_ActivityEdge() <em>Base Activity Edge</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_ActivityEdge()

-	 * @generated

-	 * @ordered

-	 */

-	protected ActivityEdge base_ActivityEdge;

-

-	/**

-	 * The cached value of the '{@link #getRate() <em>Rate</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getRate()

-	 * @generated

-	 * @ordered

-	 */

-	protected InstanceSpecification rate;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RateImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivityEdge basicGetBase_ActivityEdge() {

-		return base_ActivityEdge;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Parameter basicGetBase_Parameter() {

-		return base_Parameter;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InstanceSpecification basicGetRate() {

-		return rate;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ActivitiesPackage.RATE__BASE_PARAMETER:

-			if (resolve) {

-				return getBase_Parameter();

-			}

-			return basicGetBase_Parameter();

-		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

-			if (resolve) {

-				return getBase_ActivityEdge();

-			}

-			return basicGetBase_ActivityEdge();

-		case ActivitiesPackage.RATE__RATE:

-			if (resolve) {

-				return getRate();

-			}

-			return basicGetRate();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.RATE__BASE_PARAMETER:

-			return base_Parameter != null;

-		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

-			return base_ActivityEdge != null;

-		case ActivitiesPackage.RATE__RATE:

-			return rate != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ActivitiesPackage.RATE__BASE_PARAMETER:

-			setBase_Parameter((Parameter) newValue);

-			return;

-		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge) newValue);

-			return;

-		case ActivitiesPackage.RATE__RATE:

-			setRate((InstanceSpecification) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.RATE;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ActivitiesPackage.RATE__BASE_PARAMETER:

-			setBase_Parameter((Parameter) null);

-			return;

-		case ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE:

-			setBase_ActivityEdge((ActivityEdge) null);

-			return;

-		case ActivitiesPackage.RATE__RATE:

-			setRate((InstanceSpecification) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivityEdge getBase_ActivityEdge() {

-		if (base_ActivityEdge != null && base_ActivityEdge.eIsProxy()) {

-			InternalEObject oldBase_ActivityEdge = (InternalEObject) base_ActivityEdge;

-			base_ActivityEdge = (ActivityEdge) eResolveProxy(oldBase_ActivityEdge);

-			if (base_ActivityEdge != oldBase_ActivityEdge) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

-				}

-			}

-		}

-		return base_ActivityEdge;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Parameter getBase_Parameter() {

-		if (base_Parameter != null && base_Parameter.eIsProxy()) {

-			InternalEObject oldBase_Parameter = (InternalEObject) base_Parameter;

-			base_Parameter = (Parameter) eResolveProxy(oldBase_Parameter);

-			if (base_Parameter != oldBase_Parameter) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.RATE__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

-				}

-			}

-		}

-		return base_Parameter;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InstanceSpecification getRate() {

-		if (rate != null && rate.eIsProxy()) {

-			InternalEObject oldRate = (InternalEObject) rate;

-			rate = (InstanceSpecification) eResolveProxy(oldRate);

-			if (rate != oldRate) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.RATE__RATE, oldRate, rate));

-				}

-			}

-		}

-		return rate;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_ActivityEdge(ActivityEdge newBase_ActivityEdge) {

-		ActivityEdge oldBase_ActivityEdge = base_ActivityEdge;

-		base_ActivityEdge = newBase_ActivityEdge;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.RATE__BASE_ACTIVITY_EDGE, oldBase_ActivityEdge, base_ActivityEdge));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Parameter(Parameter newBase_Parameter) {

-		Parameter oldBase_Parameter = base_Parameter;

-		base_Parameter = newBase_Parameter;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.RATE__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setRate(InstanceSpecification newRate) {

-		InstanceSpecification oldRate = rate;

-		rate = newRate;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.RATE__RATE, oldRate, rate));

-		}

-	}

-

-} // RateImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
deleted file mode 100644
index eaa06e2511e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.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.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Continuous;

-import org.eclipse.papyrus.sysml.activities.ControlOperator;

-import org.eclipse.papyrus.sysml.activities.Discrete;

-import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optional;

-import org.eclipse.papyrus.sysml.activities.Overwrite;

-import org.eclipse.papyrus.sysml.activities.Probability;

-import org.eclipse.papyrus.sysml.activities.Rate;

-

-/**

- * <!-- 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.sysml.activities.ActivitiesPackage

- * @generated

- */

-public class ActivitiesAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ActivitiesPackage modelPackage;

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ActivitiesSwitch<Adapter> modelSwitch = new ActivitiesSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseOptional(Optional object) {

-			return createOptionalAdapter();

-		}

-

-		@Override

-		public Adapter caseRate(Rate object) {

-			return createRateAdapter();

-		}

-

-		@Override

-		public Adapter caseProbability(Probability object) {

-			return createProbabilityAdapter();

-		}

-

-		@Override

-		public Adapter caseContinuous(Continuous object) {

-			return createContinuousAdapter();

-		}

-

-		@Override

-		public Adapter caseDiscrete(Discrete object) {

-			return createDiscreteAdapter();

-		}

-

-		@Override

-		public Adapter caseControlOperator(ControlOperator object) {

-			return createControlOperatorAdapter();

-		}

-

-		@Override

-		public Adapter caseNoBuffer(NoBuffer object) {

-			return createNoBufferAdapter();

-		}

-

-		@Override

-		public Adapter caseOverwrite(Overwrite object) {

-			return createOverwriteAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ActivitiesPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * 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.sysml.activities.Optional <em>Optional</em>}'.

-	 * <!-- begin-user-doc --> This default implementation returns null so that

-	 * we can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.Optional

-	 * @generated

-	 */

-	public Adapter createOptionalAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.activities.Continuous <em>Continuous</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.Continuous

-	 * @generated

-	 */

-	public Adapter createContinuousAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.activities.ControlOperator <em>Control Operator</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.ControlOperator

-	 * @generated

-	 */

-	public Adapter createControlOperatorAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.activities.Discrete <em>Discrete</em>}'.

-	 * <!-- begin-user-doc --> This default implementation returns null so that

-	 * we can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.Discrete

-	 * @generated

-	 */

-	public Adapter createDiscreteAdapter() {

-		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;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.activities.NoBuffer <em>No Buffer</em>}'.

-	 * <!-- begin-user-doc

-	 * --> This default implementation returns null so

-	 * that we can easily ignore cases; it's useful to ignore a case when

-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.NoBuffer

-	 * @generated

-	 */

-	public Adapter createNoBufferAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.activities.Overwrite <em>Overwrite</em>}'.

-	 * <!-- begin-user-doc

-	 * --> This default implementation returns null so

-	 * that we can easily ignore cases; it's useful to ignore a case when

-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.Overwrite

-	 * @generated

-	 */

-	public Adapter createOverwriteAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.activities.Probability <em>Probability</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.Probability

-	 * @generated

-	 */

-	public Adapter createProbabilityAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.activities.Rate <em>Rate</em>}'. <!--

-	 * begin-user-doc --> This default implementation returns null so that we

-	 * can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.Rate

-	 * @generated

-	 */

-	public Adapter createRateAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // ActivitiesAdapterFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceFactoryImpl.java
deleted file mode 100644
index 89acbee6bc9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.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.sysml.activities.util.ActivitiesResourceImpl

- * @generated

- */

-public class ActivitiesResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new ActivitiesResourceImpl(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;

-	}

-

-} // ActivitiesResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceImpl.java
deleted file mode 100644
index 881bf80b002..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.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.sysml.activities.util.ActivitiesResourceFactoryImpl

- * @generated

- */

-public class ActivitiesResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public ActivitiesResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // ActivitiesResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
deleted file mode 100644
index 9ce786c20aa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Continuous;

-import org.eclipse.papyrus.sysml.activities.ControlOperator;

-import org.eclipse.papyrus.sysml.activities.Discrete;

-import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optional;

-import org.eclipse.papyrus.sysml.activities.Overwrite;

-import org.eclipse.papyrus.sysml.activities.Probability;

-import org.eclipse.papyrus.sysml.activities.Rate;

-

-/**

- * <!-- 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.sysml.activities.ActivitiesPackage

- * @generated

- */

-public class ActivitiesSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ActivitiesPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ActivitiesPackage.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;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Continuous</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Continuous</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseContinuous(Continuous object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Control Operator</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Control Operator</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseControlOperator(ControlOperator object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Discrete</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Discrete</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDiscrete(Discrete object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>No Buffer</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>No Buffer</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseNoBuffer(NoBuffer object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Overwrite</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Overwrite</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOverwrite(Overwrite object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Probability</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Probability</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseProbability(Probability object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of ' <em>Rate</em>'. <!-- begin-user-doc --> This implementation returns null;

-	 * returning a non-null result will terminate the switch. <!-- end-user-doc

-	 * -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of ' <em>Rate</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseRate(Rate 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;

-	}

-

-	/**

-	 * 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 ActivitiesPackage.OPTIONAL: {

-			Optional optional = (Optional) theEObject;

-			T result = caseOptional(optional);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ActivitiesPackage.RATE: {

-			Rate rate = (Rate) theEObject;

-			T result = caseRate(rate);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ActivitiesPackage.PROBABILITY: {

-			Probability probability = (Probability) theEObject;

-			T result = caseProbability(probability);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ActivitiesPackage.CONTINUOUS: {

-			Continuous continuous = (Continuous) theEObject;

-			T result = caseContinuous(continuous);

-			if (result == null) {

-				result = caseRate(continuous);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ActivitiesPackage.DISCRETE: {

-			Discrete discrete = (Discrete) theEObject;

-			T result = caseDiscrete(discrete);

-			if (result == null) {

-				result = caseRate(discrete);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ActivitiesPackage.CONTROL_OPERATOR: {

-			ControlOperator controlOperator = (ControlOperator) theEObject;

-			T result = caseControlOperator(controlOperator);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ActivitiesPackage.NO_BUFFER: {

-			NoBuffer noBuffer = (NoBuffer) theEObject;

-			T result = caseNoBuffer(noBuffer);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ActivitiesPackage.OVERWRITE: {

-			Overwrite overwrite = (Overwrite) theEObject;

-			T result = caseOverwrite(overwrite);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Optional</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Optional</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOptional(Optional object) {

-		return null;

-	}

-

-} // ActivitiesSwitch

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesXMLProcessor.java
deleted file mode 100644
index eb8b4094c77..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.activities.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.sysml.activities.ActivitiesPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class ActivitiesXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivitiesXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		ActivitiesPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the ActivitiesResourceFactoryImpl 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 ActivitiesResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new ActivitiesResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // ActivitiesXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocate.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocate.java
deleted file mode 100644
index 19ebd966708..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocate.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Abstraction;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Allocate</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction <em>Base Abstraction</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocate()

- * @model

- * @generated

- */

-public interface Allocate extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Abstraction</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Abstraction</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 Abstraction</em>' reference.

-	 * @see #setBase_Abstraction(Abstraction)

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocate_Base_Abstraction()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Abstraction getBase_Abstraction();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction <em>Base Abstraction</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Abstraction</em>' reference.

-	 * @see #getBase_Abstraction()

-	 * @generated

-	 */

-	void setBase_Abstraction(Abstraction value);

-

-} // Allocate

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocateActivityPartition.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocateActivityPartition.java
deleted file mode 100644
index 583d7e357ad..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocateActivityPartition.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.ActivityPartition;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Allocate Activity Partition</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition#getBase_ActivityPartition <em>Base Activity Partition</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocateActivityPartition()

- * @model

- * @generated

- */

-public interface AllocateActivityPartition extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Activity Partition</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Activity Partition</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 Activity Partition</em>' reference.

-	 * @see #setBase_ActivityPartition(ActivityPartition)

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocateActivityPartition_Base_ActivityPartition()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	ActivityPartition getBase_ActivityPartition();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition#getBase_ActivityPartition

-	 * <em>Base Activity Partition</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Activity Partition</em>' reference.

-	 * @see #getBase_ActivityPartition()

-	 * @generated

-	 */

-	void setBase_ActivityPartition(ActivityPartition value);

-

-} // AllocateActivityPartition

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocated.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocated.java
deleted file mode 100644
index 44fc979e92a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/Allocated.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Allocated</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getBase_NamedElement <em>Base Named Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom <em>Allocated From</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo <em>Allocated To</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated()

- * @model

- * @generated

- */

-public interface Allocated extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Allocated From</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Allocated From</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Allocated From</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated_AllocatedFrom()

-	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

-	 * @generated

-	 */

-	EList<NamedElement> getAllocatedFrom();

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the ' <em><b>Allocated From</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getAllocatedFrom()

-	 * @generated

-	 */

-	NamedElement getAllocatedFrom(String name);

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the ' <em><b>Allocated From</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @param ignoreCase

-	 *            Whether to ignore case in {@link java.lang.String} comparisons.

-	 * @param eClass

-	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getAllocatedFrom()

-	 * @generated

-	 */

-	NamedElement getAllocatedFrom(String name, boolean ignoreCase, EClass eClass);

-

-	/**

-	 * Returns the value of the '<em><b>Allocated To</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Allocated To</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Allocated To</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated_AllocatedTo()

-	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

-	 * @generated

-	 */

-	EList<NamedElement> getAllocatedTo();

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Allocated To</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getAllocatedTo()

-	 * @generated

-	 */

-	NamedElement getAllocatedTo(String name);

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Allocated To</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @param ignoreCase

-	 *            Whether to ignore case in {@link java.lang.String} comparisons.

-	 * @param eClass

-	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getAllocatedTo()

-	 * @generated

-	 */

-	NamedElement getAllocatedTo(String name, boolean ignoreCase, EClass eClass);

-

-	/**

-	 * Returns the value of the '<em><b>Base Named Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Named 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 Named Element</em>' reference.

-	 * @see #setBase_NamedElement(NamedElement)

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocationsPackage#getAllocated_Base_NamedElement()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	NamedElement getBase_NamedElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getBase_NamedElement <em>Base Named Element</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Named Element</em>' reference.

-	 * @see #getBase_NamedElement()

-	 * @generated

-	 */

-	void setBase_NamedElement(NamedElement value);

-

-} // Allocated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsFactory.java
deleted file mode 100644
index 7abf6421596..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations;

-

-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.sysml.allocations.AllocationsPackage

- * @generated

- */

-public interface AllocationsFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	AllocationsFactory eINSTANCE = org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Allocate</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Allocate</em>'.

-	 * @generated

-	 */

-	Allocate createAllocate();

-

-	/**

-	 * Returns a new object of class '<em>Allocate Activity Partition</em>'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Allocate Activity Partition</em>'.

-	 * @generated

-	 */

-	AllocateActivityPartition createAllocateActivityPartition();

-

-	/**

-	 * Returns a new object of class '<em>Allocated</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Allocated</em>'.

-	 * @generated

-	 */

-	Allocated createAllocated();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	AllocationsPackage getAllocationsPackage();

-

-} // AllocationsFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsPackage.java
deleted file mode 100644
index ed5c73af8cf..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/AllocationsPackage.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains

- * accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.allocations.AllocationsFactory

- * @model kind="package"

- * @generated

- */

-public interface AllocationsPackage extends EPackage {

-

-	/**

-	 * <!-- 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.sysml.allocations.internal.impl.AllocateImpl

-		 * <em>Allocate</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl

-		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocate()

-		 * @generated

-		 */

-		EClass ALLOCATE = eINSTANCE.getAllocate();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Abstraction</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ALLOCATE__BASE_ABSTRACTION = eINSTANCE.getAllocate_Base_Abstraction();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl

-		 * <em>Allocated</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl

-		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocated()

-		 * @generated

-		 */

-		EClass ALLOCATED = eINSTANCE.getAllocated();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Named Element</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ALLOCATED__BASE_NAMED_ELEMENT = eINSTANCE.getAllocated_Base_NamedElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Allocated From</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ALLOCATED__ALLOCATED_FROM = eINSTANCE.getAllocated_AllocatedFrom();

-

-		/**

-		 * The meta object literal for the '<em><b>Allocated To</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ALLOCATED__ALLOCATED_TO = eINSTANCE.getAllocated_AllocatedTo();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl

-		 * <em>Allocate Activity Partition</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl

-		 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocateActivityPartition()

-		 * @generated

-		 */

-		EClass ALLOCATE_ACTIVITY_PARTITION = eINSTANCE.getAllocateActivityPartition();

-

-		/**

-		 * The meta object literal for the ' <em><b>Base Activity Partition</b></em>' reference feature. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION = eINSTANCE.getAllocateActivityPartition_Base_ActivityPartition();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "allocations";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "Allocations";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	AllocationsPackage eINSTANCE = org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl <em>Allocate</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl

-	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocate()

-	 * @generated

-	 */

-	int ALLOCATE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATE__BASE_ABSTRACTION = 0;

-

-	/**

-	 * The number of structural features of the '<em>Allocate</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATE_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Allocate</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl <em>Allocated</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl

-	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocated()

-	 * @generated

-	 */

-	int ALLOCATED = 1;

-

-	/**

-	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATED__BASE_NAMED_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Allocated From</b></em>' reference list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATED__ALLOCATED_FROM = 1;

-

-	/**

-	 * The feature id for the '<em><b>Allocated To</b></em>' reference list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATED__ALLOCATED_TO = 2;

-

-	/**

-	 * The number of structural features of the '<em>Allocated</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATED_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>Allocated</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATED_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl

-	 * <em>Allocate Activity Partition</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl

-	 * @see org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl#getAllocateActivityPartition()

-	 * @generated

-	 */

-	int ALLOCATE_ACTIVITY_PARTITION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Base Activity Partition</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION = 0;

-

-	/**

-	 * The number of structural features of the '<em>Allocate Activity Partition</em>' class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATE_ACTIVITY_PARTITION_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Allocate Activity Partition</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ALLOCATE_ACTIVITY_PARTITION_OPERATION_COUNT = 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.allocations.Allocate <em>Allocate</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Allocate</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocate

-	 * @generated

-	 */

-	EClass getAllocate();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction

-	 * <em>Base Abstraction</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Abstraction</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocate#getBase_Abstraction()

-	 * @see #getAllocate()

-	 * @generated

-	 */

-	EReference getAllocate_Base_Abstraction();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition <em>Allocate Activity Partition</em>} '.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Allocate Activity Partition</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition

-	 * @generated

-	 */

-	EClass getAllocateActivityPartition();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition#getBase_ActivityPartition

-	 * <em>Base Activity Partition</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Activity Partition</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition#getBase_ActivityPartition()

-	 * @see #getAllocateActivityPartition()

-	 * @generated

-	 */

-	EReference getAllocateActivityPartition_Base_ActivityPartition();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.allocations.Allocated <em>Allocated</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Allocated</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocated

-	 * @generated

-	 */

-	EClass getAllocated();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom

-	 * <em>Allocated From</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Allocated From</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom()

-	 * @see #getAllocated()

-	 * @generated

-	 */

-	EReference getAllocated_AllocatedFrom();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo <em>Allocated To</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Allocated To</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo()

-	 * @see #getAllocated()

-	 * @generated

-	 */

-	EReference getAllocated_AllocatedTo();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.allocations.Allocated#getBase_NamedElement

-	 * <em>Base Named Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Named Element</em>'.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocated#getBase_NamedElement()

-	 * @see #getAllocated()

-	 * @generated

-	 */

-	EReference getAllocated_Base_NamedElement();

-

-	/**

-	 * 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

-	 */

-	AllocationsFactory getAllocationsFactory();

-

-} // AllocationsPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateActivityPartitionImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateActivityPartitionImpl.java
deleted file mode 100644
index 446a48330b6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateActivityPartitionImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.internal.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.sysml.allocations.AllocateActivityPartition;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.uml2.uml.ActivityPartition;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Allocate Activity Partition</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateActivityPartitionImpl#getBase_ActivityPartition <em>Base Activity Partition </em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AllocateActivityPartitionImpl extends MinimalEObjectImpl.Container implements AllocateActivityPartition {

-

-	/**

-	 * The cached value of the '{@link #getBase_ActivityPartition() <em>Base Activity Partition</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getBase_ActivityPartition()

-	 * @generated

-	 * @ordered

-	 */

-	protected ActivityPartition base_ActivityPartition;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AllocateActivityPartitionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivityPartition basicGetBase_ActivityPartition() {

-		return base_ActivityPartition;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

-			if (resolve) {

-				return getBase_ActivityPartition();

-			}

-			return basicGetBase_ActivityPartition();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

-			return base_ActivityPartition != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

-			setBase_ActivityPartition((ActivityPartition) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return AllocationsPackage.Literals.ALLOCATE_ACTIVITY_PARTITION;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION:

-			setBase_ActivityPartition((ActivityPartition) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActivityPartition getBase_ActivityPartition() {

-		if (base_ActivityPartition != null && base_ActivityPartition.eIsProxy()) {

-			InternalEObject oldBase_ActivityPartition = (InternalEObject) base_ActivityPartition;

-			base_ActivityPartition = (ActivityPartition) eResolveProxy(oldBase_ActivityPartition);

-			if (base_ActivityPartition != oldBase_ActivityPartition) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, oldBase_ActivityPartition, base_ActivityPartition));

-				}

-			}

-		}

-		return base_ActivityPartition;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_ActivityPartition(ActivityPartition newBase_ActivityPartition) {

-		ActivityPartition oldBase_ActivityPartition = base_ActivityPartition;

-		base_ActivityPartition = newBase_ActivityPartition;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, oldBase_ActivityPartition, base_ActivityPartition));

-		}

-	}

-

-} // AllocateActivityPartitionImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateImpl.java
deleted file mode 100644
index 5ee2c0e8b91..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocateImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.internal.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.sysml.allocations.Allocate;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.uml2.uml.Abstraction;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Allocate</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocateImpl#getBase_Abstraction <em>Base Abstraction</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AllocateImpl extends MinimalEObjectImpl.Container implements Allocate {

-

-	/**

-	 * The cached value of the '{@link #getBase_Abstraction() <em>Base Abstraction</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Abstraction()

-	 * @generated

-	 * @ordered

-	 */

-	protected Abstraction base_Abstraction;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AllocateImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Abstraction basicGetBase_Abstraction() {

-		return base_Abstraction;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

-			if (resolve) {

-				return getBase_Abstraction();

-			}

-			return basicGetBase_Abstraction();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

-			return base_Abstraction != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

-			setBase_Abstraction((Abstraction) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return AllocationsPackage.Literals.ALLOCATE;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATE__BASE_ABSTRACTION:

-			setBase_Abstraction((Abstraction) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Abstraction getBase_Abstraction() {

-		if (base_Abstraction != null && base_Abstraction.eIsProxy()) {

-			InternalEObject oldBase_Abstraction = (InternalEObject) base_Abstraction;

-			base_Abstraction = (Abstraction) eResolveProxy(oldBase_Abstraction);

-			if (base_Abstraction != oldBase_Abstraction) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, AllocationsPackage.ALLOCATE__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));

-				}

-			}

-		}

-		return base_Abstraction;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Abstraction(Abstraction newBase_Abstraction) {

-		Abstraction oldBase_Abstraction = base_Abstraction;

-		base_Abstraction = newBase_Abstraction;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, AllocationsPackage.ALLOCATE__BASE_ABSTRACTION, oldBase_Abstraction, base_Abstraction));

-		}

-	}

-

-} // AllocateImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocatedImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocatedImpl.java
deleted file mode 100644
index 52c473d1181..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocatedImpl.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.internal.impl;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEList;

-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.EcoreEList.UnmodifiableEList;

-import org.eclipse.papyrus.sysml.allocations.Allocate;

-import org.eclipse.papyrus.sysml.allocations.Allocated;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.DirectedRelationship;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Allocated</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl#getBase_NamedElement <em>Base Named Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl#getAllocatedFrom <em>Allocated From</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.allocations.internal.impl.AllocatedImpl#getAllocatedTo <em>Allocated To</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AllocatedImpl extends MinimalEObjectImpl.Container implements Allocated {

-

-	/**

-	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_NamedElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected NamedElement base_NamedElement;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AllocatedImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement basicGetBase_NamedElement() {

-		return base_NamedElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

-			if (resolve) {

-				return getBase_NamedElement();

-			}

-			return basicGetBase_NamedElement();

-		case AllocationsPackage.ALLOCATED__ALLOCATED_FROM:

-			return getAllocatedFrom();

-		case AllocationsPackage.ALLOCATED__ALLOCATED_TO:

-			return getAllocatedTo();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

-			return base_NamedElement != null;

-		case AllocationsPackage.ALLOCATED__ALLOCATED_FROM:

-			return !getAllocatedFrom().isEmpty();

-		case AllocationsPackage.ALLOCATED__ALLOCATED_TO:

-			return !getAllocatedTo().isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return AllocationsPackage.Literals.ALLOCATED;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<NamedElement> getAllocatedFrom() {

-		// AllocatedFrom property lists all the named elements linked to current

-		// by an Allocate link.

-		// Current element is the target of the Allocate link.

-		EList<NamedElement> allocatedFrom = new BasicEList<NamedElement>();

-		Allocate currentAllocate = null;

-

-		if (getBase_NamedElement() != null) {

-			// Find Allocate link

-			Iterator<DirectedRelationship> itDep = getBase_NamedElement().getTargetDirectedRelationships().iterator();

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDRelationship = itDep.next();

-				currentAllocate = UMLUtil.getStereotypeApplication(currentDRelationship, Allocate.class);

-

-				if (currentAllocate != null) {

-					EList<Element> targets = currentAllocate.getBase_Abstraction().getSources();

-					Iterator<Element> it = targets.iterator();

-					while (it.hasNext()) {

-						Element currentElt = it.next();

-						if (currentElt instanceof NamedElement) {

-							allocatedFrom.add((NamedElement) currentElt);

-						}

-					}

-				}

-			}

-		}

-

-		UnmodifiableEList<NamedElement> resultList = new UnmodifiableEList<NamedElement>(this, AllocationsPackage.eINSTANCE.getAllocated_AllocatedFrom(), allocatedFrom.size(), allocatedFrom.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getAllocatedFrom(String name) {

-		return getAllocatedFrom(name, false, null);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getAllocatedFrom(String name, boolean ignoreCase, EClass eClass) {

-		allocatedFromLoop: for (NamedElement allocatedFrom : getAllocatedFrom()) {

-			if (eClass != null && !eClass.isInstance(allocatedFrom)) {

-				continue allocatedFromLoop;

-			}

-			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(allocatedFrom.getName()) : name.equals(allocatedFrom.getName()))) {

-				continue allocatedFromLoop;

-			}

-			return allocatedFrom;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<NamedElement> getAllocatedTo() {

-		// AllocatedFrom property lists all the named elements linked to current

-		// by an Allocate link.

-		// Current element is the target of the Allocate link.

-		EList<NamedElement> allocatedTo = new BasicEList<NamedElement>();

-		Allocate currentAllocate = null;

-

-		if (getBase_NamedElement() != null) {

-			// Find Allocate link

-			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

-			while (itDep.hasNext()) {

-				Dependency currentDependency = itDep.next();

-				currentAllocate = UMLUtil.getStereotypeApplication(currentDependency, Allocate.class);

-

-				if (currentAllocate != null) {

-					allocatedTo.addAll(currentAllocate.getBase_Abstraction().getSuppliers());

-				}

-			}

-		}

-		UnmodifiableEList<NamedElement> resultList = new UnmodifiableEList<NamedElement>(this, AllocationsPackage.eINSTANCE.getAllocated_AllocatedTo(), allocatedTo.size(), allocatedTo.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getAllocatedTo(String name) {

-		return getAllocatedTo(name, false, null);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getAllocatedTo(String name, boolean ignoreCase, EClass eClass) {

-		allocatedToLoop: for (NamedElement allocatedTo : getAllocatedTo()) {

-			if (eClass != null && !eClass.isInstance(allocatedTo)) {

-				continue allocatedToLoop;

-			}

-			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(allocatedTo.getName()) : name.equals(allocatedTo.getName()))) {

-				continue allocatedToLoop;

-			}

-			return allocatedTo;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getBase_NamedElement() {

-		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {

-			InternalEObject oldBase_NamedElement = (InternalEObject) base_NamedElement;

-			base_NamedElement = (NamedElement) eResolveProxy(oldBase_NamedElement);

-			if (base_NamedElement != oldBase_NamedElement) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

-				}

-			}

-		}

-		return base_NamedElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_NamedElement(NamedElement newBase_NamedElement) {

-		NamedElement oldBase_NamedElement = base_NamedElement;

-		base_NamedElement = newBase_NamedElement;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, AllocationsPackage.ALLOCATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

-		}

-	}

-

-} // AllocatedImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsFactoryImpl.java
deleted file mode 100644
index e0b8afd379d..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsFactoryImpl.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.internal.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.sysml.allocations.Allocate;

-import org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition;

-import org.eclipse.papyrus.sysml.allocations.Allocated;

-import org.eclipse.papyrus.sysml.allocations.AllocationsFactory;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class AllocationsFactoryImpl extends EFactoryImpl implements AllocationsFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static AllocationsPackage getPackage() {

-		return AllocationsPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static AllocationsFactory init() {

-		try {

-			AllocationsFactory theAllocationsFactory = (AllocationsFactory) EPackage.Registry.INSTANCE.getEFactory(AllocationsPackage.eNS_URI);

-			if (theAllocationsFactory != null) {

-				return theAllocationsFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new AllocationsFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocationsFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case AllocationsPackage.ALLOCATE:

-			return createAllocate();

-		case AllocationsPackage.ALLOCATED:

-			return createAllocated();

-		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION:

-			return createAllocateActivityPartition();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Allocate createAllocate() {

-		AllocateImpl allocate = new AllocateImpl();

-		return allocate;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocateActivityPartition createAllocateActivityPartition() {

-		AllocateActivityPartitionImpl allocateActivityPartition = new AllocateActivityPartitionImpl();

-		return allocateActivityPartition;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Allocated createAllocated() {

-		AllocatedImpl allocated = new AllocatedImpl();

-		return allocated;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocationsPackage getAllocationsPackage() {

-		return (AllocationsPackage) getEPackage();

-	}

-

-} // AllocationsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsPackageImpl.java
deleted file mode 100644
index fee2f037735..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/internal/impl/AllocationsPackageImpl.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.Allocate;

-import org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition;

-import org.eclipse.papyrus.sysml.allocations.Allocated;

-import org.eclipse.papyrus.sysml.allocations.AllocationsFactory;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class AllocationsPackageImpl extends EPackageImpl implements AllocationsPackage {

-

-	/**

-	 * <!-- 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 AllocationsPackage#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 AllocationsPackage init() {

-		if (isInited) {

-			return (AllocationsPackage) EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AllocationsPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theAllocationsPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theAllocationsPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theAllocationsPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(AllocationsPackage.eNS_URI, theAllocationsPackage);

-		return theAllocationsPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass allocateEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass allocatedEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass allocateActivityPartitionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.allocations.AllocationsPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private AllocationsPackageImpl() {

-		super(eNS_URI, AllocationsFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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

-		allocateEClass = createEClass(ALLOCATE);

-		createEReference(allocateEClass, ALLOCATE__BASE_ABSTRACTION);

-

-		allocatedEClass = createEClass(ALLOCATED);

-		createEReference(allocatedEClass, ALLOCATED__BASE_NAMED_ELEMENT);

-		createEReference(allocatedEClass, ALLOCATED__ALLOCATED_FROM);

-		createEReference(allocatedEClass, ALLOCATED__ALLOCATED_TO);

-

-		allocateActivityPartitionEClass = createEClass(ALLOCATE_ACTIVITY_PARTITION);

-		createEReference(allocateActivityPartitionEClass, ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getAllocate() {

-		return allocateEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getAllocate_Base_Abstraction() {

-		return (EReference) allocateEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getAllocateActivityPartition() {

-		return allocateActivityPartitionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getAllocateActivityPartition_Base_ActivityPartition() {

-		return (EReference) allocateActivityPartitionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getAllocated() {

-		return allocatedEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getAllocated_AllocatedFrom() {

-		return (EReference) allocatedEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getAllocated_AllocatedTo() {

-		return (EReference) allocatedEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getAllocated_Base_NamedElement() {

-		return (EReference) allocatedEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocationsFactory getAllocationsFactory() {

-		return (AllocationsFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * 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);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(allocateEClass, Allocate.class, "Allocate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAllocate_Base_Abstraction(), theUMLPackage.getAbstraction(), null, "base_Abstraction", null, 1, 1, Allocate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-

-		initEClass(allocatedEClass, Allocated.class, "Allocated", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAllocated_Base_NamedElement(), theUMLPackage.getNamedElement(), null, "base_NamedElement", null, 1, 1, Allocated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-		initEReference(getAllocated_AllocatedFrom(), theUMLPackage.getNamedElement(), null, "allocatedFrom", null, 0, -1, Allocated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getAllocated_AllocatedTo(), theUMLPackage.getNamedElement(), null, "allocatedTo", null, 0, -1, Allocated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-

-		initEClass(allocateActivityPartitionEClass, AllocateActivityPartition.class, "AllocateActivityPartition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAllocateActivityPartition_Base_ActivityPartition(), theUMLPackage.getActivityPartition(), null, "base_ActivityPartition", null, 1, 1, AllocateActivityPartition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-	}

-

-} // AllocationsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsAdapterFactory.java
deleted file mode 100644
index c6b0f45cc9f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsAdapterFactory.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.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.sysml.allocations.Allocate;

-import org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition;

-import org.eclipse.papyrus.sysml.allocations.Allocated;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-

-/**

- * <!-- 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.sysml.allocations.AllocationsPackage

- * @generated

- */

-public class AllocationsAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static AllocationsPackage modelPackage;

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AllocationsSwitch<Adapter> modelSwitch = new AllocationsSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseAllocate(Allocate object) {

-			return createAllocateAdapter();

-		}

-

-		@Override

-		public Adapter caseAllocated(Allocated object) {

-			return createAllocatedAdapter();

-		}

-

-		@Override

-		public Adapter caseAllocateActivityPartition(AllocateActivityPartition object) {

-			return createAllocateActivityPartitionAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocationsAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = AllocationsPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * 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.sysml.allocations.AllocateActivityPartition

-	 * <em>Allocate Activity Partition</em>}'.

-	 * <!-- begin-user-doc --> This

-	 * default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases

-	 * anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition

-	 * @generated

-	 */

-	public Adapter createAllocateActivityPartitionAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.allocations.Allocate <em>Allocate</em>}'.

-	 * <!-- begin-user-doc

-	 * --> This default implementation returns null so

-	 * that we can easily ignore cases; it's useful to ignore a case when

-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocate

-	 * @generated

-	 */

-	public Adapter createAllocateAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.allocations.Allocated

-	 * <em>Allocated</em>}'. <!-- begin-user-doc --> This default implementation

-	 * returns null so that we can easily ignore cases; it's useful to ignore a

-	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.allocations.Allocated

-	 * @generated

-	 */

-	public Adapter createAllocatedAdapter() {

-		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;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // AllocationsAdapterFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceFactoryImpl.java
deleted file mode 100644
index 09e5e1a3ebb..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.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.sysml.allocations.util.AllocationsResourceImpl

- * @generated

- */

-public class AllocationsResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocationsResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new AllocationsResourceImpl(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;

-	}

-

-} // AllocationsResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceImpl.java
deleted file mode 100644
index 9a9537bc31f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.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.sysml.allocations.util.AllocationsResourceFactoryImpl

- * @generated

- */

-public class AllocationsResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public AllocationsResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // AllocationsResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsSwitch.java
deleted file mode 100644
index edd0b54cb63..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsSwitch.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.sysml.allocations.Allocate;

-import org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition;

-import org.eclipse.papyrus.sysml.allocations.Allocated;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-

-/**

- * <!-- 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.sysml.allocations.AllocationsPackage

- * @generated

- */

-public class AllocationsSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static AllocationsPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocationsSwitch() {

-		if (modelPackage == null) {

-			modelPackage = AllocationsPackage.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;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Allocate</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Allocate</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAllocate(Allocate object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Allocate Activity Partition</em>'.

-	 * <!-- begin-user-doc --> This

-	 * implementation returns null; returning a non-null result will terminate

-	 * the switch. <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Allocate Activity Partition</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAllocateActivityPartition(AllocateActivityPartition object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Allocated</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Allocated</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAllocated(Allocated 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;

-	}

-

-	/**

-	 * 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 AllocationsPackage.ALLOCATE: {

-			Allocate allocate = (Allocate) theEObject;

-			T result = caseAllocate(allocate);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case AllocationsPackage.ALLOCATED: {

-			Allocated allocated = (Allocated) theEObject;

-			T result = caseAllocated(allocated);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case AllocationsPackage.ALLOCATE_ACTIVITY_PARTITION: {

-			AllocateActivityPartition allocateActivityPartition = (AllocateActivityPartition) theEObject;

-			T result = caseAllocateActivityPartition(allocateActivityPartition);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-} // AllocationsSwitch

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsXMLProcessor.java
deleted file mode 100644
index a50ca0dbcf6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/allocations/util/AllocationsXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.allocations.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.sysml.allocations.AllocationsPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class AllocationsXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AllocationsXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		AllocationsPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the AllocationsResourceFactoryImpl 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 AllocationsResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new AllocationsResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // AllocationsXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BindingConnector.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BindingConnector.java
deleted file mode 100644
index 2ae1df4e74b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BindingConnector.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Connector;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Binding Connector</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.BindingConnector#getBase_Connector <em>Base Connector</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBindingConnector()

- * @model

- * @generated

- */

-public interface BindingConnector 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.sysml.blocks.BlocksPackage#getBindingConnector_Base_Connector()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Connector getBase_Connector();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.BindingConnector#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);

-

-} // BindingConnector

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Block.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Block.java
deleted file mode 100644
index 9ec48fafda5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Block.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Block</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.Block#isEncapsulated <em>Is Encapsulated</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.Block#getBase_Class <em>Base Class</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBlock()

- * @model

- * @generated

- */

-public interface Block extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Is Encapsulated</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Is Encapsulated</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 Encapsulated</em>' attribute.

-	 * @see #setIsEncapsulated(boolean)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getBlock_IsEncapsulated()

-	 * @model unique="false" dataType="org.eclipse.uml2.types.Boolean" ordered="false"

-	 * @generated

-	 */

-	boolean isEncapsulated();

-

-	/**

-	 * 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.sysml.blocks.BlocksPackage#getBlock_Base_Class()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	org.eclipse.uml2.uml.Class getBase_Class();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.Block#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);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.Block#isEncapsulated <em>Is Encapsulated</em>}' attribute.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Is Encapsulated</em>' attribute.

-	 * @see #isEncapsulated()

-	 * @generated

-	 */

-	void setIsEncapsulated(boolean value);

-

-} // Block

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksFactory.java
deleted file mode 100644
index a93df4215a6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksFactory.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-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.sysml.blocks.BlocksPackage

- * @generated

- */

-public interface BlocksFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	BlocksFactory eINSTANCE = org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Binding Connector</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Binding Connector</em>'.

-	 * @generated

-	 */

-	BindingConnector createBindingConnector();

-

-	/**

-	 * Returns a new object of class '<em>Block</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Block</em>'.

-	 * @generated

-	 */

-	Block createBlock();

-

-	/**

-	 * Returns a new object of class '<em>Connector Property</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Connector Property</em>'.

-	 * @generated

-	 */

-	ConnectorProperty createConnectorProperty();

-

-	/**

-	 * Returns a new object of class '<em>Dimension</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Dimension</em>'.

-	 * @generated

-	 */

-	Dimension createDimension();

-

-	/**

-	 * Returns a new object of class '<em>Distributed Property</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Distributed Property</em>'.

-	 * @generated

-	 */

-	DistributedProperty createDistributedProperty();

-

-	/**

-	 * Returns a new object of class '<em>Nested Connector End</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Nested Connector End</em>'.

-	 * @generated

-	 */

-	NestedConnectorEnd createNestedConnectorEnd();

-

-	/**

-	 * Returns a new object of class '<em>Participant Property</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Participant Property</em>'.

-	 * @generated

-	 */

-	ParticipantProperty createParticipantProperty();

-

-	/**

-	 * Returns a new object of class '<em>Property Specific Type</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Property Specific Type</em>'.

-	 * @generated

-	 */

-	PropertySpecificType createPropertySpecificType();

-

-	/**

-	 * Returns a new object of class '<em>Unit</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Unit</em>'.

-	 * @generated

-	 */

-	Unit createUnit();

-

-	/**

-	 * Returns a new object of class '<em>Value Type</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Value Type</em>'.

-	 * @generated

-	 */

-	ValueType createValueType();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	BlocksPackage getBlocksPackage();

-

-} // BlocksFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksPackage.java
deleted file mode 100644
index 614b71481b8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/BlocksPackage.java
+++ /dev/null
@@ -1,1101 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains

- * accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksFactory

- * @model kind="package"

- * @generated

- */

-public interface BlocksPackage extends EPackage {

-

-	/**

-	 * <!-- 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.sysml.blocks.internal.impl.BlockImpl <em>Block</em>}' class.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBlock()

-		 * @generated

-		 */

-		EClass BLOCK = eINSTANCE.getBlock();

-

-		/**

-		 * The meta object literal for the '<em><b>Is Encapsulated</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute BLOCK__IS_ENCAPSULATED = eINSTANCE.getBlock_IsEncapsulated();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference BLOCK__BASE_CLASS = eINSTANCE.getBlock_Base_Class();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl

-		 * <em>Distributed Property</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDistributedProperty()

-		 * @generated

-		 */

-		EClass DISTRIBUTED_PROPERTY = eINSTANCE.getDistributedProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference DISTRIBUTED_PROPERTY__BASE_PROPERTY = eINSTANCE.getDistributedProperty_Base_Property();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl

-		 * <em>Dimension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDimension()

-		 * @generated

-		 */

-		EClass DIMENSION = eINSTANCE.getDimension();

-

-		/**

-		 * The meta object literal for the ' <em><b>Base Instance Specification</b></em>' reference feature. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference DIMENSION__BASE_INSTANCE_SPECIFICATION = eINSTANCE.getDimension_Base_InstanceSpecification();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl <em>Unit</em>}' class.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getUnit()

-		 * @generated

-		 */

-		EClass UNIT = eINSTANCE.getUnit();

-

-		/**

-		 * The meta object literal for the ' <em><b>Base Instance Specification</b></em>' reference feature. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference UNIT__BASE_INSTANCE_SPECIFICATION = eINSTANCE.getUnit_Base_InstanceSpecification();

-

-		/**

-		 * The meta object literal for the '<em><b>Dimension</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference UNIT__DIMENSION = eINSTANCE.getUnit_Dimension();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl <em>Value Type</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getValueType()

-		 * @generated

-		 */

-		EClass VALUE_TYPE = eINSTANCE.getValueType();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Data Type</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VALUE_TYPE__BASE_DATA_TYPE = eINSTANCE.getValueType_Base_DataType();

-

-		/**

-		 * The meta object literal for the '<em><b>Unit</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VALUE_TYPE__UNIT = eINSTANCE.getValueType_Unit();

-

-		/**

-		 * The meta object literal for the '<em><b>Dimension</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VALUE_TYPE__DIMENSION = eINSTANCE.getValueType_Dimension();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl

-		 * <em>Nested Connector End</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getNestedConnectorEnd()

-		 * @generated

-		 */

-		EClass NESTED_CONNECTOR_END = eINSTANCE.getNestedConnectorEnd();

-

-		/**

-		 * The meta object literal for the '<em><b>Property Path</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference NESTED_CONNECTOR_END__PROPERTY_PATH = eINSTANCE.getNestedConnectorEnd_PropertyPath();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Connector End</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference NESTED_CONNECTOR_END__BASE_CONNECTOR_END = eINSTANCE.getNestedConnectorEnd_Base_ConnectorEnd();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl

-		 * <em>Participant Property</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getParticipantProperty()

-		 * @generated

-		 */

-		EClass PARTICIPANT_PROPERTY = eINSTANCE.getParticipantProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PARTICIPANT_PROPERTY__BASE_PROPERTY = eINSTANCE.getParticipantProperty_Base_Property();

-

-		/**

-		 * The meta object literal for the '<em><b>End</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PARTICIPANT_PROPERTY__END = eINSTANCE.getParticipantProperty_End();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl <em>Connector Property</em>}'

-		 * class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getConnectorProperty()

-		 * @generated

-		 */

-		EClass CONNECTOR_PROPERTY = eINSTANCE.getConnectorProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONNECTOR_PROPERTY__BASE_PROPERTY = eINSTANCE.getConnectorProperty_Base_Property();

-

-		/**

-		 * The meta object literal for the '<em><b>Connector</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONNECTOR_PROPERTY__CONNECTOR = eINSTANCE.getConnectorProperty_Connector();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl <em>Binding Connector</em>}'

-		 * class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBindingConnector()

-		 * @generated

-		 */

-		EClass BINDING_CONNECTOR = eINSTANCE.getBindingConnector();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Connector</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference BINDING_CONNECTOR__BASE_CONNECTOR = eINSTANCE.getBindingConnector_Base_Connector();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl

-		 * <em>Property Specific Type</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl

-		 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getPropertySpecificType()

-		 * @generated

-		 */

-		EClass PROPERTY_SPECIFIC_TYPE = eINSTANCE.getPropertySpecificType();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Classifier</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER = eINSTANCE.getPropertySpecificType_Base_Classifier();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "blocks";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "Blocks";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	BlocksPackage eINSTANCE = org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl <em>Block</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBlock()

-	 * @generated

-	 */

-	int BLOCK = 0;

-

-	/**

-	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BLOCK__IS_ENCAPSULATED = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BLOCK__BASE_CLASS = 1;

-

-	/**

-	 * The number of structural features of the '<em>Block</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BLOCK_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Block</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BLOCK_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl <em>Distributed Property</em>}'

-	 * class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDistributedProperty()

-	 * @generated

-	 */

-	int DISTRIBUTED_PROPERTY = 1;

-

-	/**

-	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISTRIBUTED_PROPERTY__BASE_PROPERTY = 0;

-

-	/**

-	 * The number of structural features of the '<em>Distributed Property</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISTRIBUTED_PROPERTY_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Distributed Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISTRIBUTED_PROPERTY_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl <em>Dimension</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getDimension()

-	 * @generated

-	 */

-	int DIMENSION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Base Instance Specification</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DIMENSION__BASE_INSTANCE_SPECIFICATION = 0;

-

-	/**

-	 * The number of structural features of the '<em>Dimension</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DIMENSION_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Dimension</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DIMENSION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl <em>Unit</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getUnit()

-	 * @generated

-	 */

-	int UNIT = 3;

-

-	/**

-	 * The feature id for the '<em><b>Base Instance Specification</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int UNIT__BASE_INSTANCE_SPECIFICATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Dimension</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int UNIT__DIMENSION = 1;

-

-	/**

-	 * The number of structural features of the '<em>Unit</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int UNIT_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Unit</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int UNIT_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl

-	 * <em>Value Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getValueType()

-	 * @generated

-	 */

-	int VALUE_TYPE = 4;

-

-	/**

-	 * The feature id for the '<em><b>Base Data Type</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_TYPE__BASE_DATA_TYPE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Unit</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_TYPE__UNIT = 1;

-

-	/**

-	 * The feature id for the '<em><b>Dimension</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_TYPE__DIMENSION = 2;

-

-	/**

-	 * The number of structural features of the '<em>Value Type</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_TYPE_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>Value Type</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_TYPE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl <em>Nested Connector End</em>}' class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getNestedConnectorEnd()

-	 * @generated

-	 */

-	int NESTED_CONNECTOR_END = 5;

-

-	/**

-	 * The feature id for the '<em><b>Property Path</b></em>' reference list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NESTED_CONNECTOR_END__PROPERTY_PATH = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Connector End</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NESTED_CONNECTOR_END__BASE_CONNECTOR_END = 1;

-

-	/**

-	 * The number of structural features of the '<em>Nested Connector End</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NESTED_CONNECTOR_END_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Nested Connector End</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int NESTED_CONNECTOR_END_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl <em>Participant Property</em>}'

-	 * class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getParticipantProperty()

-	 * @generated

-	 */

-	int PARTICIPANT_PROPERTY = 6;

-

-	/**

-	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PARTICIPANT_PROPERTY__BASE_PROPERTY = 0;

-

-	/**

-	 * The feature id for the '<em><b>End</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PARTICIPANT_PROPERTY__END = 1;

-

-	/**

-	 * The number of structural features of the '<em>Participant Property</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PARTICIPANT_PROPERTY_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Participant Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PARTICIPANT_PROPERTY_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl <em>Connector Property</em>}' class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getConnectorProperty()

-	 * @generated

-	 */

-	int CONNECTOR_PROPERTY = 7;

-

-	/**

-	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONNECTOR_PROPERTY__BASE_PROPERTY = 0;

-

-	/**

-	 * The feature id for the '<em><b>Connector</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONNECTOR_PROPERTY__CONNECTOR = 1;

-

-	/**

-	 * The number of structural features of the '<em>Connector Property</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONNECTOR_PROPERTY_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Connector Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONNECTOR_PROPERTY_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl <em>Binding Connector</em>}' class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getBindingConnector()

-	 * @generated

-	 */

-	int BINDING_CONNECTOR = 8;

-

-	/**

-	 * The feature id for the '<em><b>Base Connector</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BINDING_CONNECTOR__BASE_CONNECTOR = 0;

-

-	/**

-	 * The number of structural features of the '<em>Binding Connector</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BINDING_CONNECTOR_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Binding Connector</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BINDING_CONNECTOR_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl <em>Property Specific Type</em>}'

-	 * class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl

-	 * @see org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl#getPropertySpecificType()

-	 * @generated

-	 */

-	int PROPERTY_SPECIFIC_TYPE = 9;

-

-	/**

-	 * The feature id for the '<em><b>Base Classifier</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER = 0;

-

-	/**

-	 * The number of structural features of the '<em>Property Specific Type</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROPERTY_SPECIFIC_TYPE_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Property Specific Type</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROPERTY_SPECIFIC_TYPE_OPERATION_COUNT = 0;

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.BindingConnector

-	 * <em>Binding Connector</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for class '<em>Binding Connector</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.BindingConnector

-	 * @generated

-	 */

-	EClass getBindingConnector();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.BindingConnector#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.sysml.blocks.BindingConnector#getBase_Connector()

-	 * @see #getBindingConnector()

-	 * @generated

-	 */

-	EReference getBindingConnector_Base_Connector();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.Block <em>Block</em>}'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Block</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.Block

-	 * @generated

-	 */

-	EClass getBlock();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.Block#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.sysml.blocks.Block#getBase_Class()

-	 * @see #getBlock()

-	 * @generated

-	 */

-	EReference getBlock_Base_Class();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.blocks.Block#isEncapsulated <em>Is Encapsulated</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Is Encapsulated</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.Block#isEncapsulated()

-	 * @see #getBlock()

-	 * @generated

-	 */

-	EAttribute getBlock_IsEncapsulated();

-

-	/**

-	 * 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

-	 */

-	BlocksFactory getBlocksFactory();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty

-	 * <em>Connector Property</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for class '<em>Connector Property</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ConnectorProperty

-	 * @generated

-	 */

-	EClass getConnectorProperty();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#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.sysml.blocks.ConnectorProperty#getBase_Property()

-	 * @see #getConnectorProperty()

-	 * @generated

-	 */

-	EReference getConnectorProperty_Base_Property();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector <em>Connector</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Connector</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector()

-	 * @see #getConnectorProperty()

-	 * @generated

-	 */

-	EReference getConnectorProperty_Connector();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.Dimension <em>Dimension</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Dimension</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.Dimension

-	 * @generated

-	 */

-	EClass getDimension();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.Dimension#getBase_InstanceSpecification

-	 * <em>Base Instance Specification</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Instance Specification</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.Dimension#getBase_InstanceSpecification()

-	 * @see #getDimension()

-	 * @generated

-	 */

-	EReference getDimension_Base_InstanceSpecification();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty <em>Distributed Property</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Distributed Property</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.DistributedProperty

-	 * @generated

-	 */

-	EClass getDistributedProperty();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty#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.sysml.blocks.DistributedProperty#getBase_Property()

-	 * @see #getDistributedProperty()

-	 * @generated

-	 */

-	EReference getDistributedProperty_Base_Property();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd <em>Nested Connector End</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Nested Connector End</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd

-	 * @generated

-	 */

-	EClass getNestedConnectorEnd();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd

-	 * <em>Base Connector End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Connector End</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd()

-	 * @see #getNestedConnectorEnd()

-	 * @generated

-	 */

-	EReference getNestedConnectorEnd_Base_ConnectorEnd();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getPropertyPath

-	 * <em>Property Path</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Property Path</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getPropertyPath()

-	 * @see #getNestedConnectorEnd()

-	 * @generated

-	 */

-	EReference getNestedConnectorEnd_PropertyPath();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty <em>Participant Property</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Participant Property</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ParticipantProperty

-	 * @generated

-	 */

-	EClass getParticipantProperty();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#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.sysml.blocks.ParticipantProperty#getBase_Property()

-	 * @see #getParticipantProperty()

-	 * @generated

-	 */

-	EReference getParticipantProperty_Base_Property();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd <em>End</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>End</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd()

-	 * @see #getParticipantProperty()

-	 * @generated

-	 */

-	EReference getParticipantProperty_End();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType <em>Property Specific Type</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Property Specific Type</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.PropertySpecificType

-	 * @generated

-	 */

-	EClass getPropertySpecificType();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier

-	 * <em>Base Classifier</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Classifier</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier()

-	 * @see #getPropertySpecificType()

-	 * @generated

-	 */

-	EReference getPropertySpecificType_Base_Classifier();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.blocks.Unit <em>Unit</em>}'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.Unit

-	 * @generated

-	 */

-	EClass getUnit();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.Unit#getBase_InstanceSpecification

-	 * <em>Base Instance Specification</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Instance Specification</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.Unit#getBase_InstanceSpecification()

-	 * @see #getUnit()

-	 * @generated

-	 */

-	EReference getUnit_Base_InstanceSpecification();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.Unit#getDimension <em>Dimension</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Dimension</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.Unit#getDimension()

-	 * @see #getUnit()

-	 * @generated

-	 */

-	EReference getUnit_Dimension();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.blocks.ValueType <em>Value Type</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Value Type</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ValueType

-	 * @generated

-	 */

-	EClass getValueType();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getBase_DataType <em>Base Data Type</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Data Type</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ValueType#getBase_DataType()

-	 * @see #getValueType()

-	 * @generated

-	 */

-	EReference getValueType_Base_DataType();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getDimension <em>Dimension</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Dimension</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ValueType#getDimension()

-	 * @see #getValueType()

-	 * @generated

-	 */

-	EReference getValueType_Dimension();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getUnit <em>Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Unit</em>'.

-	 * @see org.eclipse.papyrus.sysml.blocks.ValueType#getUnit()

-	 * @see #getValueType()

-	 * @generated

-	 */

-	EReference getValueType_Unit();

-

-} // BlocksPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ConnectorProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ConnectorProperty.java
deleted file mode 100644
index 254d67bffe0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ConnectorProperty.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Connector Property</b></em> '. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getBase_Property <em>Base Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector <em>Connector</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getConnectorProperty()

- * @model

- * @generated

- */

-public interface ConnectorProperty 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.sysml.blocks.BlocksPackage#getConnectorProperty_Base_Property()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Property getBase_Property();

-

-	/**

-	 * Returns the value of the '<em><b>Connector</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>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>Connector</em>' reference.

-	 * @see #setConnector(Connector)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getConnectorProperty_Connector()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Connector getConnector();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#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);

-

-	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty#getConnector

-	 * <em>Connector</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Connector</em>' reference.

-	 * @see #getConnector()

-	 * @generated

-	 */

-	void setConnector(Connector value);

-

-} // ConnectorProperty

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Dimension.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Dimension.java
deleted file mode 100644
index e736af5ab84..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Dimension.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.InstanceSpecification;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Dimension</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.Dimension#getBase_InstanceSpecification <em>Base Instance Specification</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getDimension()

- * @model

- * @generated

- */

-public interface Dimension extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Instance Specification</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Instance Specification</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 Instance Specification</em>' reference.

-	 * @see #setBase_InstanceSpecification(InstanceSpecification)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getDimension_Base_InstanceSpecification()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	InstanceSpecification getBase_InstanceSpecification();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.Dimension#getBase_InstanceSpecification <em>Base Instance Specification</em>}'

-	 * reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Instance Specification</em>' reference.

-	 * @see #getBase_InstanceSpecification()

-	 * @generated

-	 */

-	void setBase_InstanceSpecification(InstanceSpecification value);

-

-} // Dimension

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/DistributedProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/DistributedProperty.java
deleted file mode 100644
index 362b393e8fc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/DistributedProperty.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Distributed Property</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty#getBase_Property <em>Base Property</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getDistributedProperty()

- * @model

- * @generated

- */

-public interface DistributedProperty 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.sysml.blocks.BlocksPackage#getDistributedProperty_Base_Property()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Property getBase_Property();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty#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);

-

-} // DistributedProperty

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/NestedConnectorEnd.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/NestedConnectorEnd.java
deleted file mode 100644
index 3b3576d1d8b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/NestedConnectorEnd.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Nested Connector End</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getPropertyPath <em>Property Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd <em>Base Connector End</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getNestedConnectorEnd()

- * @model

- * @generated

- */

-public interface NestedConnectorEnd extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Connector End</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Connector End</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 End</em>' reference.

-	 * @see #setBase_ConnectorEnd(ConnectorEnd)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getNestedConnectorEnd_Base_ConnectorEnd()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	ConnectorEnd getBase_ConnectorEnd();

-

-	/**

-	 * Returns the value of the '<em><b>Property Path</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.uml2.uml.Property}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Property Path</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Property Path</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getNestedConnectorEnd_PropertyPath()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<Property> getPropertyPath();

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>' from the ' <em><b>Property Path</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

-	 * @param type

-	 *            The '<em><b>Type</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>', or <code>null</code>.

-	 * @see #getPropertyPath()

-	 * @generated

-	 */

-	Property getPropertyPath(String name, Type type);

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>' from the ' <em><b>Property Path</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

-	 * @param type

-	 *            The '<em><b>Type</b></em>' of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

-	 * @param ignoreCase

-	 *            Whether to ignore case in {@link java.lang.String} comparisons.

-	 * @param eClass

-	 *            The Ecore class of the {@link org.eclipse.uml2.uml.Property} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.Property} with the specified '<em><b>Name</b></em>', and '<em><b>Type</b></em>', or <code>null</code>.

-	 * @see #getPropertyPath()

-	 * @generated

-	 */

-	Property getPropertyPath(String name, Type type, boolean ignoreCase, EClass eClass);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd#getBase_ConnectorEnd <em>Base Connector End</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Connector End</em>' reference.

-	 * @see #getBase_ConnectorEnd()

-	 * @generated

-	 */

-	void setBase_ConnectorEnd(ConnectorEnd value);

-

-} // NestedConnectorEnd

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ParticipantProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ParticipantProperty.java
deleted file mode 100644
index 83106a96421..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ParticipantProperty.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Participant Property</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getBase_Property <em>Base Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd <em>End</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getParticipantProperty()

- * @model

- * @generated

- */

-public interface ParticipantProperty 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.sysml.blocks.BlocksPackage#getParticipantProperty_Base_Property()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Property getBase_Property();

-

-	/**

-	 * Returns the value of the '<em><b>End</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>End</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>End</em>' reference.

-	 * @see #setEnd(Property)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getParticipantProperty_End()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Property getEnd();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#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);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty#getEnd <em>End</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>End</em>' reference.

-	 * @see #getEnd()

-	 * @generated

-	 */

-	void setEnd(Property value);

-

-} // ParticipantProperty

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/PropertySpecificType.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/PropertySpecificType.java
deleted file mode 100644
index 6d1959b02e1..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/PropertySpecificType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Classifier;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Property Specific Type</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier <em>Base Classifier</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getPropertySpecificType()

- * @model

- * @generated

- */

-public interface PropertySpecificType extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Classifier</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Classifier</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 Classifier</em>' reference.

-	 * @see #setBase_Classifier(Classifier)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getPropertySpecificType_Base_Classifier()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Classifier getBase_Classifier();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType#getBase_Classifier <em>Base Classifier</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Classifier</em>' reference.

-	 * @see #getBase_Classifier()

-	 * @generated

-	 */

-	void setBase_Classifier(Classifier value);

-

-} // PropertySpecificType

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Unit.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Unit.java
deleted file mode 100644
index b2188b60077..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/Unit.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.InstanceSpecification;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Unit</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.Unit#getBase_InstanceSpecification <em>Base Instance Specification</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.Unit#getDimension <em>Dimension</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getUnit()

- * @model

- * @generated

- */

-public interface Unit extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Instance Specification</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Instance Specification</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 Instance Specification</em>' reference.

-	 * @see #setBase_InstanceSpecification(InstanceSpecification)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getUnit_Base_InstanceSpecification()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	InstanceSpecification getBase_InstanceSpecification();

-

-	/**

-	 * Returns the value of the '<em><b>Dimension</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Dimension</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Dimension</em>' reference.

-	 * @see #setDimension(Dimension)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getUnit_Dimension()

-	 * @model ordered="false"

-	 * @generated

-	 */

-	Dimension getDimension();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.Unit#getBase_InstanceSpecification <em>Base Instance Specification</em>}'

-	 * reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Instance Specification</em>' reference.

-	 * @see #getBase_InstanceSpecification()

-	 * @generated

-	 */

-	void setBase_InstanceSpecification(InstanceSpecification value);

-

-	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.blocks.Unit#getDimension

-	 * <em>Dimension</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Dimension</em>' reference.

-	 * @see #getDimension()

-	 * @generated

-	 */

-	void setDimension(Dimension value);

-

-} // Unit

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ValueType.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ValueType.java
deleted file mode 100644
index aeaecc594da..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/ValueType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.DataType;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Value Type</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.ValueType#getBase_DataType <em>Base Data Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.ValueType#getUnit <em>Unit</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.ValueType#getDimension <em>Dimension</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType()

- * @model

- * @generated

- */

-public interface ValueType extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Data Type</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Data Type</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Base Data Type</em>' reference.

-	 * @see #setBase_DataType(DataType)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType_Base_DataType()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	DataType getBase_DataType();

-

-	/**

-	 * Returns the value of the '<em><b>Dimension</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Dimension</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Dimension</em>' reference.

-	 * @see #setDimension(Dimension)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType_Dimension()

-	 * @model ordered="false"

-	 * @generated

-	 */

-	Dimension getDimension();

-

-	/**

-	 * Returns the value of the '<em><b>Unit</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unit</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Unit</em>' reference.

-	 * @see #setUnit(Unit)

-	 * @see org.eclipse.papyrus.sysml.blocks.BlocksPackage#getValueType_Unit()

-	 * @model ordered="false"

-	 * @generated

-	 */

-	Unit getUnit();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getBase_DataType <em>Base Data Type</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Data Type</em>' reference.

-	 * @see #getBase_DataType()

-	 * @generated

-	 */

-	void setBase_DataType(DataType value);

-

-	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.blocks.ValueType#getDimension

-	 * <em>Dimension</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Dimension</em>' reference.

-	 * @see #getDimension()

-	 * @generated

-	 */

-	void setDimension(Dimension value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.blocks.ValueType#getUnit <em>Unit</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Unit</em>' reference.

-	 * @see #getUnit()

-	 * @generated

-	 */

-	void setUnit(Unit value);

-

-} // ValueType

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BindingConnectorImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BindingConnectorImpl.java
deleted file mode 100644
index 52b19f83dad..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BindingConnectorImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BindingConnector;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.uml2.uml.Connector;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Binding Connector</b></em> '. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BindingConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class BindingConnectorImpl extends MinimalEObjectImpl.Container implements BindingConnector {

-

-	/**

-	 * 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 BindingConnectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Connector basicGetBase_Connector() {

-		return base_Connector;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.BINDING_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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR:

-			return base_Connector != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR:

-			setBase_Connector((Connector) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.BINDING_CONNECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR:

-			setBase_Connector((Connector) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));

-				}

-			}

-		}

-		return base_Connector;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Connector(Connector newBase_Connector) {

-		Connector oldBase_Connector = base_Connector;

-		base_Connector = newBase_Connector;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.BINDING_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));

-		}

-	}

-

-} // BindingConnectorImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlockImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlockImpl.java
deleted file mode 100644
index 5d8bf8c6844..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlockImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Block</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl#isEncapsulated <em>Is Encapsulated</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl#getBase_Class <em>Base Class</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class BlockImpl extends MinimalEObjectImpl.Container implements Block {

-

-	/**

-	 * The default value of the '{@link #isEncapsulated() <em>Is Encapsulated</em>}' attribute.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #isEncapsulated()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IS_ENCAPSULATED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isEncapsulated() <em>Is Encapsulated</em>}' attribute.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #isEncapsulated()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean isEncapsulated = IS_ENCAPSULATED_EDEFAULT;

-

-	/**

-	 * 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 BlockImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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 Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

-			return isEncapsulated();

-		case BlocksPackage.BLOCK__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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

-			return isEncapsulated != IS_ENCAPSULATED_EDEFAULT;

-		case BlocksPackage.BLOCK__BASE_CLASS:

-			return base_Class != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

-			setIsEncapsulated((Boolean) newValue);

-			return;

-		case BlocksPackage.BLOCK__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.BLOCK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isEncapsulated() {

-		return isEncapsulated;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.BLOCK__IS_ENCAPSULATED:

-			setIsEncapsulated(IS_ENCAPSULATED_EDEFAULT);

-			return;

-		case BlocksPackage.BLOCK__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, BlocksPackage.BLOCK__BASE_CLASS, oldBase_Class, base_Class));

-				}

-			}

-		}

-		return base_Class;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, BlocksPackage.BLOCK__BASE_CLASS, oldBase_Class, base_Class));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIsEncapsulated(boolean newIsEncapsulated) {

-		boolean oldIsEncapsulated = isEncapsulated;

-		isEncapsulated = newIsEncapsulated;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.BLOCK__IS_ENCAPSULATED, oldIsEncapsulated, isEncapsulated));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (isEncapsulated: ");

-		result.append(isEncapsulated);

-		result.append(')');

-		return result.toString();

-	}

-

-} // BlockImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksFactoryImpl.java
deleted file mode 100644
index 71cdc735789..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksFactoryImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BindingConnector;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.blocks.BlocksFactory;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.ConnectorProperty;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.papyrus.sysml.blocks.DistributedProperty;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.papyrus.sysml.blocks.ParticipantProperty;

-import org.eclipse.papyrus.sysml.blocks.PropertySpecificType;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class BlocksFactoryImpl extends EFactoryImpl implements BlocksFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static BlocksPackage getPackage() {

-		return BlocksPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static BlocksFactory init() {

-		try {

-			BlocksFactory theBlocksFactory = (BlocksFactory) EPackage.Registry.INSTANCE.getEFactory(BlocksPackage.eNS_URI);

-			if (theBlocksFactory != null) {

-				return theBlocksFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new BlocksFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlocksFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case BlocksPackage.BLOCK:

-			return createBlock();

-		case BlocksPackage.DISTRIBUTED_PROPERTY:

-			return createDistributedProperty();

-		case BlocksPackage.DIMENSION:

-			return createDimension();

-		case BlocksPackage.UNIT:

-			return createUnit();

-		case BlocksPackage.VALUE_TYPE:

-			return createValueType();

-		case BlocksPackage.NESTED_CONNECTOR_END:

-			return createNestedConnectorEnd();

-		case BlocksPackage.PARTICIPANT_PROPERTY:

-			return createParticipantProperty();

-		case BlocksPackage.CONNECTOR_PROPERTY:

-			return createConnectorProperty();

-		case BlocksPackage.BINDING_CONNECTOR:

-			return createBindingConnector();

-		case BlocksPackage.PROPERTY_SPECIFIC_TYPE:

-			return createPropertySpecificType();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BindingConnector createBindingConnector() {

-		BindingConnectorImpl bindingConnector = new BindingConnectorImpl();

-		return bindingConnector;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Block createBlock() {

-		BlockImpl block = new BlockImpl();

-		return block;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConnectorProperty createConnectorProperty() {

-		ConnectorPropertyImpl connectorProperty = new ConnectorPropertyImpl();

-		return connectorProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Dimension createDimension() {

-		DimensionImpl dimension = new DimensionImpl();

-		return dimension;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DistributedProperty createDistributedProperty() {

-		DistributedPropertyImpl distributedProperty = new DistributedPropertyImpl();

-		return distributedProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NestedConnectorEnd createNestedConnectorEnd() {

-		NestedConnectorEndImpl nestedConnectorEnd = new NestedConnectorEndImpl();

-		return nestedConnectorEnd;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ParticipantProperty createParticipantProperty() {

-		ParticipantPropertyImpl participantProperty = new ParticipantPropertyImpl();

-		return participantProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PropertySpecificType createPropertySpecificType() {

-		PropertySpecificTypeImpl propertySpecificType = new PropertySpecificTypeImpl();

-		return propertySpecificType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Unit createUnit() {

-		UnitImpl unit = new UnitImpl();

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ValueType createValueType() {

-		ValueTypeImpl valueType = new ValueTypeImpl();

-		return valueType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlocksPackage getBlocksPackage() {

-		return (BlocksPackage) getEPackage();

-	}

-

-} // BlocksFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksPackageImpl.java
deleted file mode 100644
index fb3f74fecdd..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/BlocksPackageImpl.java
+++ /dev/null
@@ -1,636 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BindingConnector;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.blocks.BlocksFactory;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.ConnectorProperty;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.papyrus.sysml.blocks.DistributedProperty;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.papyrus.sysml.blocks.ParticipantProperty;

-import org.eclipse.papyrus.sysml.blocks.PropertySpecificType;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class BlocksPackageImpl extends EPackageImpl implements BlocksPackage {

-

-	/**

-	 * <!-- 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 BlocksPackage#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 BlocksPackage init() {

-		if (isInited) {

-			return (BlocksPackage) EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BlocksPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theBlocksPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theBlocksPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theBlocksPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(BlocksPackage.eNS_URI, theBlocksPackage);

-		return theBlocksPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass blockEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass distributedPropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass dimensionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass unitEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass valueTypeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass nestedConnectorEndEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass participantPropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass connectorPropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass bindingConnectorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass propertySpecificTypeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.blocks.BlocksPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private BlocksPackageImpl() {

-		super(eNS_URI, BlocksFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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

-		blockEClass = createEClass(BLOCK);

-		createEAttribute(blockEClass, BLOCK__IS_ENCAPSULATED);

-		createEReference(blockEClass, BLOCK__BASE_CLASS);

-

-		distributedPropertyEClass = createEClass(DISTRIBUTED_PROPERTY);

-		createEReference(distributedPropertyEClass, DISTRIBUTED_PROPERTY__BASE_PROPERTY);

-

-		dimensionEClass = createEClass(DIMENSION);

-		createEReference(dimensionEClass, DIMENSION__BASE_INSTANCE_SPECIFICATION);

-

-		unitEClass = createEClass(UNIT);

-		createEReference(unitEClass, UNIT__BASE_INSTANCE_SPECIFICATION);

-		createEReference(unitEClass, UNIT__DIMENSION);

-

-		valueTypeEClass = createEClass(VALUE_TYPE);

-		createEReference(valueTypeEClass, VALUE_TYPE__BASE_DATA_TYPE);

-		createEReference(valueTypeEClass, VALUE_TYPE__UNIT);

-		createEReference(valueTypeEClass, VALUE_TYPE__DIMENSION);

-

-		nestedConnectorEndEClass = createEClass(NESTED_CONNECTOR_END);

-		createEReference(nestedConnectorEndEClass, NESTED_CONNECTOR_END__PROPERTY_PATH);

-		createEReference(nestedConnectorEndEClass, NESTED_CONNECTOR_END__BASE_CONNECTOR_END);

-

-		participantPropertyEClass = createEClass(PARTICIPANT_PROPERTY);

-		createEReference(participantPropertyEClass, PARTICIPANT_PROPERTY__BASE_PROPERTY);

-		createEReference(participantPropertyEClass, PARTICIPANT_PROPERTY__END);

-

-		connectorPropertyEClass = createEClass(CONNECTOR_PROPERTY);

-		createEReference(connectorPropertyEClass, CONNECTOR_PROPERTY__BASE_PROPERTY);

-		createEReference(connectorPropertyEClass, CONNECTOR_PROPERTY__CONNECTOR);

-

-		bindingConnectorEClass = createEClass(BINDING_CONNECTOR);

-		createEReference(bindingConnectorEClass, BINDING_CONNECTOR__BASE_CONNECTOR);

-

-		propertySpecificTypeEClass = createEClass(PROPERTY_SPECIFIC_TYPE);

-		createEReference(propertySpecificTypeEClass, PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getBindingConnector() {

-		return bindingConnectorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getBindingConnector_Base_Connector() {

-		return (EReference) bindingConnectorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getBlock() {

-		return blockEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getBlock_Base_Class() {

-		return (EReference) blockEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getBlock_IsEncapsulated() {

-		return (EAttribute) blockEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlocksFactory getBlocksFactory() {

-		return (BlocksFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConnectorProperty() {

-		return connectorPropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConnectorProperty_Base_Property() {

-		return (EReference) connectorPropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConnectorProperty_Connector() {

-		return (EReference) connectorPropertyEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getDimension() {

-		return dimensionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getDimension_Base_InstanceSpecification() {

-		return (EReference) dimensionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getDistributedProperty() {

-		return distributedPropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getDistributedProperty_Base_Property() {

-		return (EReference) distributedPropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getNestedConnectorEnd() {

-		return nestedConnectorEndEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getNestedConnectorEnd_Base_ConnectorEnd() {

-		return (EReference) nestedConnectorEndEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getNestedConnectorEnd_PropertyPath() {

-		return (EReference) nestedConnectorEndEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getParticipantProperty() {

-		return participantPropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getParticipantProperty_Base_Property() {

-		return (EReference) participantPropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getParticipantProperty_End() {

-		return (EReference) participantPropertyEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getPropertySpecificType() {

-		return propertySpecificTypeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getPropertySpecificType_Base_Classifier() {

-		return (EReference) propertySpecificTypeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getUnit() {

-		return unitEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getUnit_Base_InstanceSpecification() {

-		return (EReference) unitEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getUnit_Dimension() {

-		return (EReference) unitEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getValueType() {

-		return valueTypeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getValueType_Base_DataType() {

-		return (EReference) valueTypeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getValueType_Dimension() {

-		return (EReference) valueTypeEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getValueType_Unit() {

-		return (EReference) valueTypeEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * 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);

-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(blockEClass, Block.class, "Block", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getBlock_IsEncapsulated(), theTypesPackage.getBoolean(), "isEncapsulated", null, 0, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getBlock_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(distributedPropertyEClass, DistributedProperty.class, "DistributedProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getDistributedProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, DistributedProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getDimension_Base_InstanceSpecification(), theUMLPackage.getInstanceSpecification(), null, "base_InstanceSpecification", null, 1, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(unitEClass, Unit.class, "Unit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getUnit_Base_InstanceSpecification(), theUMLPackage.getInstanceSpecification(), null, "base_InstanceSpecification", null, 1, 1, Unit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getUnit_Dimension(), this.getDimension(), null, "dimension", null, 0, 1, Unit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(valueTypeEClass, ValueType.class, "ValueType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getValueType_Base_DataType(), theUMLPackage.getDataType(), null, "base_DataType", null, 1, 1, ValueType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getValueType_Unit(), this.getUnit(), null, "unit", null, 0, 1, ValueType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getValueType_Dimension(), this.getDimension(), null, "dimension", null, 0, 1, ValueType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(nestedConnectorEndEClass, NestedConnectorEnd.class, "NestedConnectorEnd", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getNestedConnectorEnd_PropertyPath(), theUMLPackage.getProperty(), null, "propertyPath", null, 1, -1, NestedConnectorEnd.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getNestedConnectorEnd_Base_ConnectorEnd(), theUMLPackage.getConnectorEnd(), null, "base_ConnectorEnd", null, 1, 1, NestedConnectorEnd.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(participantPropertyEClass, ParticipantProperty.class, "ParticipantProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getParticipantProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ParticipantProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getParticipantProperty_End(), theUMLPackage.getProperty(), null, "end", null, 1, 1, ParticipantProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-

-		initEClass(connectorPropertyEClass, ConnectorProperty.class, "ConnectorProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConnectorProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ConnectorProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-		initEReference(getConnectorProperty_Connector(), theUMLPackage.getConnector(), null, "connector", null, 1, 1, ConnectorProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-

-		initEClass(bindingConnectorEClass, BindingConnector.class, "BindingConnector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getBindingConnector_Base_Connector(), theUMLPackage.getConnector(), null, "base_Connector", null, 1, 1, BindingConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-

-		initEClass(propertySpecificTypeEClass, PropertySpecificType.class, "PropertySpecificType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPropertySpecificType_Base_Classifier(), theUMLPackage.getClassifier(), null, "base_Classifier", null, 1, 1, PropertySpecificType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-	}

-

-} // BlocksPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ConnectorPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ConnectorPropertyImpl.java
deleted file mode 100644
index 7dfd7ba0db9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ConnectorPropertyImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.ConnectorProperty;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Connector Property</b></em> '. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl#getBase_Property <em>Base Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ConnectorPropertyImpl#getConnector <em>Connector</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConnectorPropertyImpl extends MinimalEObjectImpl.Container implements ConnectorProperty {

-

-	/**

-	 * 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;

-

-	/**

-	 * The cached value of the '{@link #getConnector() <em>Connector</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getConnector()

-	 * @generated

-	 * @ordered

-	 */

-	protected Connector connector;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConnectorPropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property basicGetBase_Property() {

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Connector basicGetConnector() {

-		return connector;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

-			if (resolve) {

-				return getBase_Property();

-			}

-			return basicGetBase_Property();

-		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

-			if (resolve) {

-				return getConnector();

-			}

-			return basicGetConnector();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

-			return base_Property != null;

-		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

-			return connector != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) newValue);

-			return;

-		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

-			setConnector((Connector) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.CONNECTOR_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) null);

-			return;

-		case BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR:

-			setConnector((Connector) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-				}

-			}

-		}

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Connector getConnector() {

-		if (connector != null && connector.eIsProxy()) {

-			InternalEObject oldConnector = (InternalEObject) connector;

-			connector = (Connector) eResolveProxy(oldConnector);

-			if (connector != oldConnector) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR, oldConnector, connector));

-				}

-			}

-		}

-		return connector;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Property(Property newBase_Property) {

-		Property oldBase_Property = base_Property;

-		base_Property = newBase_Property;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.CONNECTOR_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setConnector(Connector newConnector) {

-		Connector oldConnector = connector;

-		connector = newConnector;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.CONNECTOR_PROPERTY__CONNECTOR, oldConnector, connector));

-		}

-	}

-

-} // ConnectorPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DimensionImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DimensionImpl.java
deleted file mode 100644
index a4a5a84cf33..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DimensionImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.uml2.uml.InstanceSpecification;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Dimension</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DimensionImpl#getBase_InstanceSpecification <em>Base Instance Specification</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimension {

-

-	/**

-	 * The cached value of the '{@link #getBase_InstanceSpecification() <em>Base Instance Specification</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getBase_InstanceSpecification()

-	 * @generated

-	 * @ordered

-	 */

-	protected InstanceSpecification base_InstanceSpecification;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DimensionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InstanceSpecification basicGetBase_InstanceSpecification() {

-		return base_InstanceSpecification;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

-			if (resolve) {

-				return getBase_InstanceSpecification();

-			}

-			return basicGetBase_InstanceSpecification();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

-			return base_InstanceSpecification != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.DIMENSION;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InstanceSpecification getBase_InstanceSpecification() {

-		if (base_InstanceSpecification != null && base_InstanceSpecification.eIsProxy()) {

-			InternalEObject oldBase_InstanceSpecification = (InternalEObject) base_InstanceSpecification;

-			base_InstanceSpecification = (InstanceSpecification) eResolveProxy(oldBase_InstanceSpecification);

-			if (base_InstanceSpecification != oldBase_InstanceSpecification) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

-				}

-			}

-		}

-		return base_InstanceSpecification;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_InstanceSpecification(InstanceSpecification newBase_InstanceSpecification) {

-		InstanceSpecification oldBase_InstanceSpecification = base_InstanceSpecification;

-		base_InstanceSpecification = newBase_InstanceSpecification;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.DIMENSION__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

-		}

-	}

-

-} // DimensionImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DistributedPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DistributedPropertyImpl.java
deleted file mode 100644
index 249b81bf907..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/DistributedPropertyImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.DistributedProperty;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Distributed Property</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.DistributedPropertyImpl#getBase_Property <em>Base Property</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class DistributedPropertyImpl extends MinimalEObjectImpl.Container implements DistributedProperty {

-

-	/**

-	 * 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 DistributedPropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property basicGetBase_Property() {

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.DISTRIBUTED_PROPERTY__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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY:

-			return base_Property != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.DISTRIBUTED_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-				}

-			}

-		}

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Property(Property newBase_Property) {

-		Property oldBase_Property = base_Property;

-		base_Property = newBase_Property;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.DISTRIBUTED_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-		}

-	}

-

-} // DistributedPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/NestedConnectorEndImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/NestedConnectorEndImpl.java
deleted file mode 100644
index 3fc755d91a3..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/NestedConnectorEndImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Nested Connector End</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl#getPropertyPath <em>Property Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.NestedConnectorEndImpl#getBase_ConnectorEnd <em>Base Connector End</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class NestedConnectorEndImpl extends MinimalEObjectImpl.Container implements NestedConnectorEnd {

-

-	/**

-	 * The cached value of the '{@link #getPropertyPath() <em>Property Path</em>}' reference list.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getPropertyPath()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Property> propertyPath;

-

-	/**

-	 * The cached value of the '{@link #getBase_ConnectorEnd() <em>Base Connector End</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_ConnectorEnd()

-	 * @generated

-	 * @ordered

-	 */

-	protected ConnectorEnd base_ConnectorEnd;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected NestedConnectorEndImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConnectorEnd basicGetBase_ConnectorEnd() {

-		return base_ConnectorEnd;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

-			return getPropertyPath();

-		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

-			if (resolve) {

-				return getBase_ConnectorEnd();

-			}

-			return basicGetBase_ConnectorEnd();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

-			return propertyPath != null && !propertyPath.isEmpty();

-		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

-			return base_ConnectorEnd != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

-			getPropertyPath().clear();

-			getPropertyPath().addAll((Collection<? extends Property>) newValue);

-			return;

-		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

-			setBase_ConnectorEnd((ConnectorEnd) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.NESTED_CONNECTOR_END;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH:

-			getPropertyPath().clear();

-			return;

-		case BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END:

-			setBase_ConnectorEnd((ConnectorEnd) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConnectorEnd getBase_ConnectorEnd() {

-		if (base_ConnectorEnd != null && base_ConnectorEnd.eIsProxy()) {

-			InternalEObject oldBase_ConnectorEnd = (InternalEObject) base_ConnectorEnd;

-			base_ConnectorEnd = (ConnectorEnd) eResolveProxy(oldBase_ConnectorEnd);

-			if (base_ConnectorEnd != oldBase_ConnectorEnd) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, oldBase_ConnectorEnd, base_ConnectorEnd));

-				}

-			}

-		}

-		return base_ConnectorEnd;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Property> getPropertyPath() {

-		if (propertyPath == null) {

-			propertyPath = new EObjectResolvingEList<Property>(Property.class, this, BlocksPackage.NESTED_CONNECTOR_END__PROPERTY_PATH);

-		}

-		return propertyPath;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property getPropertyPath(String name, Type type) {

-		return getPropertyPath(name, type, false, null);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property getPropertyPath(String name, Type type, boolean ignoreCase, EClass eClass) {

-		propertyPathLoop: for (Property propertyPath : getPropertyPath()) {

-			if (eClass != null && !eClass.isInstance(propertyPath)) {

-				continue propertyPathLoop;

-			}

-			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(propertyPath.getName()) : name.equals(propertyPath.getName()))) {

-				continue propertyPathLoop;

-			}

-			if (type != null && !type.equals(propertyPath.getType())) {

-				continue propertyPathLoop;

-			}

-			return propertyPath;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_ConnectorEnd(ConnectorEnd newBase_ConnectorEnd) {

-		ConnectorEnd oldBase_ConnectorEnd = base_ConnectorEnd;

-		base_ConnectorEnd = newBase_ConnectorEnd;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, oldBase_ConnectorEnd, base_ConnectorEnd));

-		}

-	}

-

-} // NestedConnectorEndImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ParticipantPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ParticipantPropertyImpl.java
deleted file mode 100644
index 7301290b477..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ParticipantPropertyImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.ParticipantProperty;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Participant Property</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl#getBase_Property <em>Base Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ParticipantPropertyImpl#getEnd <em>End</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ParticipantPropertyImpl extends MinimalEObjectImpl.Container implements ParticipantProperty {

-

-	/**

-	 * 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;

-

-	/**

-	 * The cached value of the '{@link #getEnd() <em>End</em>}' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getEnd()

-	 * @generated

-	 * @ordered

-	 */

-	protected Property end;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ParticipantPropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property basicGetBase_Property() {

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property basicGetEnd() {

-		return end;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

-			if (resolve) {

-				return getBase_Property();

-			}

-			return basicGetBase_Property();

-		case BlocksPackage.PARTICIPANT_PROPERTY__END:

-			if (resolve) {

-				return getEnd();

-			}

-			return basicGetEnd();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

-			return base_Property != null;

-		case BlocksPackage.PARTICIPANT_PROPERTY__END:

-			return end != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) newValue);

-			return;

-		case BlocksPackage.PARTICIPANT_PROPERTY__END:

-			setEnd((Property) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.PARTICIPANT_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) null);

-			return;

-		case BlocksPackage.PARTICIPANT_PROPERTY__END:

-			setEnd((Property) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-				}

-			}

-		}

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property getEnd() {

-		if (end != null && end.eIsProxy()) {

-			InternalEObject oldEnd = (InternalEObject) end;

-			end = (Property) eResolveProxy(oldEnd);

-			if (end != oldEnd) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.PARTICIPANT_PROPERTY__END, oldEnd, end));

-				}

-			}

-		}

-		return end;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Property(Property newBase_Property) {

-		Property oldBase_Property = base_Property;

-		base_Property = newBase_Property;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.PARTICIPANT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setEnd(Property newEnd) {

-		Property oldEnd = end;

-		end = newEnd;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.PARTICIPANT_PROPERTY__END, oldEnd, end));

-		}

-	}

-

-} // ParticipantPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/PropertySpecificTypeImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/PropertySpecificTypeImpl.java
deleted file mode 100644
index b8d9adb4683..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/PropertySpecificTypeImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.PropertySpecificType;

-import org.eclipse.uml2.uml.Classifier;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Property Specific Type</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.PropertySpecificTypeImpl#getBase_Classifier <em>Base Classifier</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PropertySpecificTypeImpl extends MinimalEObjectImpl.Container implements PropertySpecificType {

-

-	/**

-	 * The cached value of the '{@link #getBase_Classifier() <em>Base Classifier</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Classifier()

-	 * @generated

-	 * @ordered

-	 */

-	protected Classifier base_Classifier;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PropertySpecificTypeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Classifier basicGetBase_Classifier() {

-		return base_Classifier;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

-			if (resolve) {

-				return getBase_Classifier();

-			}

-			return basicGetBase_Classifier();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

-			return base_Classifier != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

-			setBase_Classifier((Classifier) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.PROPERTY_SPECIFIC_TYPE;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER:

-			setBase_Classifier((Classifier) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Classifier getBase_Classifier() {

-		if (base_Classifier != null && base_Classifier.eIsProxy()) {

-			InternalEObject oldBase_Classifier = (InternalEObject) base_Classifier;

-			base_Classifier = (Classifier) eResolveProxy(oldBase_Classifier);

-			if (base_Classifier != oldBase_Classifier) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, oldBase_Classifier, base_Classifier));

-				}

-			}

-		}

-		return base_Classifier;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Classifier(Classifier newBase_Classifier) {

-		Classifier oldBase_Classifier = base_Classifier;

-		base_Classifier = newBase_Classifier;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, oldBase_Classifier, base_Classifier));

-		}

-	}

-

-} // PropertySpecificTypeImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/UnitImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/UnitImpl.java
deleted file mode 100644
index 71961f77080..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/UnitImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.uml2.uml.InstanceSpecification;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Unit</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl#getBase_InstanceSpecification <em>Base Instance Specification</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.UnitImpl#getDimension <em>Dimension</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class UnitImpl extends MinimalEObjectImpl.Container implements Unit {

-

-	/**

-	 * The cached value of the '{@link #getBase_InstanceSpecification() <em>Base Instance Specification</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getBase_InstanceSpecification()

-	 * @generated

-	 * @ordered

-	 */

-	protected InstanceSpecification base_InstanceSpecification;

-

-	/**

-	 * The cached value of the '{@link #getDimension() <em>Dimension</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getDimension()

-	 * @generated

-	 * @ordered

-	 */

-	protected Dimension dimension;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected UnitImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InstanceSpecification basicGetBase_InstanceSpecification() {

-		return base_InstanceSpecification;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Dimension basicGetDimension() {

-		return dimension;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

-			if (resolve) {

-				return getBase_InstanceSpecification();

-			}

-			return basicGetBase_InstanceSpecification();

-		case BlocksPackage.UNIT__DIMENSION:

-			if (resolve) {

-				return getDimension();

-			}

-			return basicGetDimension();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

-			return base_InstanceSpecification != null;

-		case BlocksPackage.UNIT__DIMENSION:

-			return dimension != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification) newValue);

-			return;

-		case BlocksPackage.UNIT__DIMENSION:

-			setDimension((Dimension) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.UNIT;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION:

-			setBase_InstanceSpecification((InstanceSpecification) null);

-			return;

-		case BlocksPackage.UNIT__DIMENSION:

-			setDimension((Dimension) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InstanceSpecification getBase_InstanceSpecification() {

-		if (base_InstanceSpecification != null && base_InstanceSpecification.eIsProxy()) {

-			InternalEObject oldBase_InstanceSpecification = (InternalEObject) base_InstanceSpecification;

-			base_InstanceSpecification = (InstanceSpecification) eResolveProxy(oldBase_InstanceSpecification);

-			if (base_InstanceSpecification != oldBase_InstanceSpecification) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

-				}

-			}

-		}

-		return base_InstanceSpecification;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Dimension getDimension() {

-		if (dimension != null && dimension.eIsProxy()) {

-			InternalEObject oldDimension = (InternalEObject) dimension;

-			dimension = (Dimension) eResolveProxy(oldDimension);

-			if (dimension != oldDimension) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.UNIT__DIMENSION, oldDimension, dimension));

-				}

-			}

-		}

-		return dimension;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_InstanceSpecification(InstanceSpecification newBase_InstanceSpecification) {

-		InstanceSpecification oldBase_InstanceSpecification = base_InstanceSpecification;

-		base_InstanceSpecification = newBase_InstanceSpecification;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.UNIT__BASE_INSTANCE_SPECIFICATION, oldBase_InstanceSpecification, base_InstanceSpecification));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDimension(Dimension newDimension) {

-		Dimension oldDimension = dimension;

-		dimension = newDimension;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.UNIT__DIMENSION, oldDimension, dimension));

-		}

-	}

-

-} // UnitImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ValueTypeImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ValueTypeImpl.java
deleted file mode 100644
index 4843cab3122..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/internal/impl/ValueTypeImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.internal.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.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-import org.eclipse.uml2.uml.DataType;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Value Type</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl#getBase_DataType <em>Base Data Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl#getUnit <em>Unit</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.blocks.internal.impl.ValueTypeImpl#getDimension <em>Dimension</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ValueTypeImpl extends MinimalEObjectImpl.Container implements ValueType {

-

-	/**

-	 * The cached value of the '{@link #getBase_DataType() <em>Base Data Type</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_DataType()

-	 * @generated

-	 * @ordered

-	 */

-	protected DataType base_DataType;

-

-	/**

-	 * The cached value of the '{@link #getUnit() <em>Unit</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getUnit()

-	 * @generated

-	 * @ordered

-	 */

-	protected Unit unit;

-

-	/**

-	 * The cached value of the '{@link #getDimension() <em>Dimension</em>}' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getDimension()

-	 * @generated

-	 * @ordered

-	 */

-	protected Dimension dimension;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ValueTypeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DataType basicGetBase_DataType() {

-		return base_DataType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Dimension basicGetDimension() {

-		return dimension;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Unit basicGetUnit() {

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

-			if (resolve) {

-				return getBase_DataType();

-			}

-			return basicGetBase_DataType();

-		case BlocksPackage.VALUE_TYPE__UNIT:

-			if (resolve) {

-				return getUnit();

-			}

-			return basicGetUnit();

-		case BlocksPackage.VALUE_TYPE__DIMENSION:

-			if (resolve) {

-				return getDimension();

-			}

-			return basicGetDimension();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

-			return base_DataType != null;

-		case BlocksPackage.VALUE_TYPE__UNIT:

-			return unit != null;

-		case BlocksPackage.VALUE_TYPE__DIMENSION:

-			return dimension != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

-			setBase_DataType((DataType) newValue);

-			return;

-		case BlocksPackage.VALUE_TYPE__UNIT:

-			setUnit((Unit) newValue);

-			return;

-		case BlocksPackage.VALUE_TYPE__DIMENSION:

-			setDimension((Dimension) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return BlocksPackage.Literals.VALUE_TYPE;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE:

-			setBase_DataType((DataType) null);

-			return;

-		case BlocksPackage.VALUE_TYPE__UNIT:

-			setUnit((Unit) null);

-			return;

-		case BlocksPackage.VALUE_TYPE__DIMENSION:

-			setDimension((Dimension) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DataType getBase_DataType() {

-		if (base_DataType != null && base_DataType.eIsProxy()) {

-			InternalEObject oldBase_DataType = (InternalEObject) base_DataType;

-			base_DataType = (DataType) eResolveProxy(oldBase_DataType);

-			if (base_DataType != oldBase_DataType) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE, oldBase_DataType, base_DataType));

-				}

-			}

-		}

-		return base_DataType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Dimension getDimension() {

-		if (dimension != null && dimension.eIsProxy()) {

-			InternalEObject oldDimension = (InternalEObject) dimension;

-			dimension = (Dimension) eResolveProxy(oldDimension);

-			if (dimension != oldDimension) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.VALUE_TYPE__DIMENSION, oldDimension, dimension));

-				}

-			}

-		}

-		return dimension;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Unit getUnit() {

-		if (unit != null && unit.eIsProxy()) {

-			InternalEObject oldUnit = (InternalEObject) unit;

-			unit = (Unit) eResolveProxy(oldUnit);

-			if (unit != oldUnit) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BlocksPackage.VALUE_TYPE__UNIT, oldUnit, unit));

-				}

-			}

-		}

-		return unit;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_DataType(DataType newBase_DataType) {

-		DataType oldBase_DataType = base_DataType;

-		base_DataType = newBase_DataType;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.VALUE_TYPE__BASE_DATA_TYPE, oldBase_DataType, base_DataType));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDimension(Dimension newDimension) {

-		Dimension oldDimension = dimension;

-		dimension = newDimension;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.VALUE_TYPE__DIMENSION, oldDimension, dimension));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setUnit(Unit newUnit) {

-		Unit oldUnit = unit;

-		unit = newUnit;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, BlocksPackage.VALUE_TYPE__UNIT, oldUnit, unit));

-		}

-	}

-

-} // ValueTypeImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksAdapterFactory.java
deleted file mode 100644
index 6ae8cdf0bc0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksAdapterFactory.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.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.sysml.blocks.BindingConnector;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.ConnectorProperty;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.papyrus.sysml.blocks.DistributedProperty;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.papyrus.sysml.blocks.ParticipantProperty;

-import org.eclipse.papyrus.sysml.blocks.PropertySpecificType;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-

-/**

- * <!-- 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.sysml.blocks.BlocksPackage

- * @generated

- */

-public class BlocksAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static BlocksPackage modelPackage;

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected BlocksSwitch<Adapter> modelSwitch = new BlocksSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseBlock(Block object) {

-			return createBlockAdapter();

-		}

-

-		@Override

-		public Adapter caseDistributedProperty(DistributedProperty object) {

-			return createDistributedPropertyAdapter();

-		}

-

-		@Override

-		public Adapter caseDimension(Dimension object) {

-			return createDimensionAdapter();

-		}

-

-		@Override

-		public Adapter caseUnit(Unit object) {

-			return createUnitAdapter();

-		}

-

-		@Override

-		public Adapter caseValueType(ValueType object) {

-			return createValueTypeAdapter();

-		}

-

-		@Override

-		public Adapter caseNestedConnectorEnd(NestedConnectorEnd object) {

-			return createNestedConnectorEndAdapter();

-		}

-

-		@Override

-		public Adapter caseParticipantProperty(ParticipantProperty object) {

-			return createParticipantPropertyAdapter();

-		}

-

-		@Override

-		public Adapter caseConnectorProperty(ConnectorProperty object) {

-			return createConnectorPropertyAdapter();

-		}

-

-		@Override

-		public Adapter caseBindingConnector(BindingConnector object) {

-			return createBindingConnectorAdapter();

-		}

-

-		@Override

-		public Adapter casePropertySpecificType(PropertySpecificType object) {

-			return createPropertySpecificTypeAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlocksAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = BlocksPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * 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.sysml.blocks.BindingConnector <em>Binding 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.sysml.blocks.BindingConnector

-	 * @generated

-	 */

-	public Adapter createBindingConnectorAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.blocks.Block <em>Block</em>}'. <!--

-	 * begin-user-doc --> This default implementation returns null so that we

-	 * can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.Block

-	 * @generated

-	 */

-	public Adapter createBlockAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty <em>Connector Property</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.ConnectorProperty

-	 * @generated

-	 */

-	public Adapter createConnectorPropertyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.blocks.Dimension <em>Dimension</em>}'.

-	 * <!-- begin-user-doc --> This default implementation returns null so that

-	 * we can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.Dimension

-	 * @generated

-	 */

-	public Adapter createDimensionAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.blocks.DistributedProperty <em>Distributed Property</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.DistributedProperty

-	 * @generated

-	 */

-	public Adapter createDistributedPropertyAdapter() {

-		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;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd <em>Nested Connector End</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd

-	 * @generated

-	 */

-	public Adapter createNestedConnectorEndAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty <em>Participant Property</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.ParticipantProperty

-	 * @generated

-	 */

-	public Adapter createParticipantPropertyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType <em>Property Specific Type</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.PropertySpecificType

-	 * @generated

-	 */

-	public Adapter createPropertySpecificTypeAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.blocks.Unit <em>Unit</em>}'. <!--

-	 * begin-user-doc --> This default implementation returns null so that we

-	 * can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.Unit

-	 * @generated

-	 */

-	public Adapter createUnitAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.blocks.ValueType <em>Value Type</em>}'.

-	 * <!-- begin-user-doc --> This default implementation returns null so that

-	 * we can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.ValueType

-	 * @generated

-	 */

-	public Adapter createValueTypeAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // BlocksAdapterFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceFactoryImpl.java
deleted file mode 100644
index 5a962900af0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.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.sysml.blocks.util.BlocksResourceImpl

- * @generated

- */

-public class BlocksResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlocksResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new BlocksResourceImpl(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;

-	}

-

-} // BlocksResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceImpl.java
deleted file mode 100644
index 87abe63419f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.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.sysml.blocks.util.BlocksResourceFactoryImpl

- * @generated

- */

-public class BlocksResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public BlocksResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // BlocksResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksSwitch.java
deleted file mode 100644
index 156cdb357f5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksSwitch.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.sysml.blocks.BindingConnector;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.ConnectorProperty;

-import org.eclipse.papyrus.sysml.blocks.Dimension;

-import org.eclipse.papyrus.sysml.blocks.DistributedProperty;

-import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;

-import org.eclipse.papyrus.sysml.blocks.ParticipantProperty;

-import org.eclipse.papyrus.sysml.blocks.PropertySpecificType;

-import org.eclipse.papyrus.sysml.blocks.Unit;

-import org.eclipse.papyrus.sysml.blocks.ValueType;

-

-/**

- * <!-- 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.sysml.blocks.BlocksPackage

- * @generated

- */

-public class BlocksSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static BlocksPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlocksSwitch() {

-		if (modelPackage == null) {

-			modelPackage = BlocksPackage.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;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Binding 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>Binding Connector</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBindingConnector(BindingConnector object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Block</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Block</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBlock(Block object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Connector Property</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Connector Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConnectorProperty(ConnectorProperty object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Dimension</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            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

-	 */

-	public T caseDimension(Dimension object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Distributed Property</em>'.

-	 * <!-- begin-user-doc --> This

-	 * implementation returns null; returning a non-null result will terminate

-	 * the switch. <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Distributed Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDistributedProperty(DistributedProperty object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Nested Connector End</em>'.

-	 * <!-- begin-user-doc --> This

-	 * implementation returns null; returning a non-null result will terminate

-	 * the switch. <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Nested Connector End</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseNestedConnectorEnd(NestedConnectorEnd object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Participant Property</em>'.

-	 * <!-- begin-user-doc --> This

-	 * implementation returns null; returning a non-null result will terminate

-	 * the switch. <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Participant Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseParticipantProperty(ParticipantProperty object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Property Specific Type</em>'.

-	 * <!-- begin-user-doc --> This

-	 * implementation returns null; returning a non-null result will terminate

-	 * the switch. <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Property Specific Type</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T casePropertySpecificType(PropertySpecificType object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of ' <em>Unit</em>'. <!-- begin-user-doc --> This implementation returns null;

-	 * returning a non-null result will terminate the switch. <!-- end-user-doc

-	 * -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of ' <em>Unit</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseUnit(Unit object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Value Type</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Value Type</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseValueType(ValueType 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;

-	}

-

-	/**

-	 * 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 BlocksPackage.BLOCK: {

-			Block block = (Block) theEObject;

-			T result = caseBlock(block);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.DISTRIBUTED_PROPERTY: {

-			DistributedProperty distributedProperty = (DistributedProperty) theEObject;

-			T result = caseDistributedProperty(distributedProperty);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.DIMENSION: {

-			Dimension dimension = (Dimension) theEObject;

-			T result = caseDimension(dimension);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.UNIT: {

-			Unit unit = (Unit) theEObject;

-			T result = caseUnit(unit);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.VALUE_TYPE: {

-			ValueType valueType = (ValueType) theEObject;

-			T result = caseValueType(valueType);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.NESTED_CONNECTOR_END: {

-			NestedConnectorEnd nestedConnectorEnd = (NestedConnectorEnd) theEObject;

-			T result = caseNestedConnectorEnd(nestedConnectorEnd);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.PARTICIPANT_PROPERTY: {

-			ParticipantProperty participantProperty = (ParticipantProperty) theEObject;

-			T result = caseParticipantProperty(participantProperty);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.CONNECTOR_PROPERTY: {

-			ConnectorProperty connectorProperty = (ConnectorProperty) theEObject;

-			T result = caseConnectorProperty(connectorProperty);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.BINDING_CONNECTOR: {

-			BindingConnector bindingConnector = (BindingConnector) theEObject;

-			T result = caseBindingConnector(bindingConnector);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case BlocksPackage.PROPERTY_SPECIFIC_TYPE: {

-			PropertySpecificType propertySpecificType = (PropertySpecificType) theEObject;

-			T result = casePropertySpecificType(propertySpecificType);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-} // BlocksSwitch

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksXMLProcessor.java
deleted file mode 100644
index eb30b3fa200..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/blocks/util/BlocksXMLProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.blocks.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.sysml.blocks.BlocksPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class BlocksXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BlocksXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		BlocksPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the BlocksResourceFactoryImpl 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 BlocksResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new BlocksResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // BlocksXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintBlock.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintBlock.java
deleted file mode 100644
index d9c75fac405..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintBlock.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints;

-

-import org.eclipse.papyrus.sysml.blocks.Block;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Constraint Block</b></em>'. <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage#getConstraintBlock()

- * @model

- * @generated

- */

-public interface ConstraintBlock extends Block {

-} // ConstraintBlock

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintProperty.java
deleted file mode 100644
index 350d0190078..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintProperty.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Constraint Property</b></em> '. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty#getBase_Property <em>Base Property</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage#getConstraintProperty()

- * @model

- * @generated

- */

-public interface ConstraintProperty 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.sysml.constraints.ConstraintsPackage#getConstraintProperty_Base_Property()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Property getBase_Property();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty#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);

-

-} // ConstraintProperty

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsFactory.java
deleted file mode 100644
index 73abc20d691..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a

- * create method for each non-abstract class of the model. <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.constraints.ConstraintsPackage

- * @generated

- */

-public interface ConstraintsFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ConstraintsFactory eINSTANCE = org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Constraint Block</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Constraint Block</em>'.

-	 * @generated

-	 */

-	ConstraintBlock createConstraintBlock();

-

-	/**

-	 * Returns a new object of class '<em>Constraint Property</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Constraint Property</em>'.

-	 * @generated

-	 */

-	ConstraintProperty createConstraintProperty();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ConstraintsPackage getConstraintsPackage();

-

-} // ConstraintsFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsPackage.java
deleted file mode 100644
index 4691bc26b0b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/ConstraintsPackage.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-

-/**

- * <!-- 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.sysml.constraints.ConstraintsFactory

- * @model kind="package"

- * @generated

- */

-public interface ConstraintsPackage extends EPackage {

-

-	/**

-	 * <!-- 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.sysml.constraints.internal.impl.ConstraintBlockImpl <em>Constraint Block</em>}'

-		 * class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintBlockImpl

-		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintBlock()

-		 * @generated

-		 */

-		EClass CONSTRAINT_BLOCK = eINSTANCE.getConstraintBlock();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl

-		 * <em>Constraint Property</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl

-		 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintProperty()

-		 * @generated

-		 */

-		EClass CONSTRAINT_PROPERTY = eINSTANCE.getConstraintProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONSTRAINT_PROPERTY__BASE_PROPERTY = eINSTANCE.getConstraintProperty_Base_Property();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "constraints";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "Constraints";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ConstraintsPackage eINSTANCE = org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintBlockImpl <em>Constraint Block</em>}' class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintBlockImpl

-	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintBlock()

-	 * @generated

-	 */

-	int CONSTRAINT_BLOCK = 0;

-

-	/**

-	 * The feature id for the '<em><b>Is Encapsulated</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_BLOCK__IS_ENCAPSULATED = BlocksPackage.BLOCK__IS_ENCAPSULATED;

-

-	/**

-	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_BLOCK__BASE_CLASS = BlocksPackage.BLOCK__BASE_CLASS;

-

-	/**

-	 * The number of structural features of the '<em>Constraint Block</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_BLOCK_FEATURE_COUNT = BlocksPackage.BLOCK_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Constraint Block</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_BLOCK_OPERATION_COUNT = BlocksPackage.BLOCK_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl <em>Constraint Property</em>}'

-	 * class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl

-	 * @see org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl#getConstraintProperty()

-	 * @generated

-	 */

-	int CONSTRAINT_PROPERTY = 1;

-

-	/**

-	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_PROPERTY__BASE_PROPERTY = 0;

-

-	/**

-	 * The number of structural features of the '<em>Constraint Property</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_PROPERTY_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Constraint Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_PROPERTY_OPERATION_COUNT = 0;

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock

-	 * <em>Constraint Block</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for class '<em>Constraint Block</em>'.

-	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintBlock

-	 * @generated

-	 */

-	EClass getConstraintBlock();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty <em>Constraint Property</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Constraint Property</em>'.

-	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintProperty

-	 * @generated

-	 */

-	EClass getConstraintProperty();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty#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.sysml.constraints.ConstraintProperty#getBase_Property()

-	 * @see #getConstraintProperty()

-	 * @generated

-	 */

-	EReference getConstraintProperty_Base_Property();

-

-	/**

-	 * Returns the factory that creates the instances of the model. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	ConstraintsFactory getConstraintsFactory();

-

-} // ConstraintsPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintBlockImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintBlockImpl.java
deleted file mode 100644
index 0188057f884..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintBlockImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlockImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Constraint Block</b></em>'. <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class ConstraintBlockImpl extends BlockImpl implements ConstraintBlock {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintBlockImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.CONSTRAINT_BLOCK;

-	}

-

-} // ConstraintBlockImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintPropertyImpl.java
deleted file mode 100644
index 0aa5cc418ba..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintPropertyImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.internal.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.sysml.constraints.ConstraintProperty;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Constraint Property</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintPropertyImpl#getBase_Property <em>Base Property</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConstraintPropertyImpl extends MinimalEObjectImpl.Container implements ConstraintProperty {

-

-	/**

-	 * 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 ConstraintPropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property basicGetBase_Property() {

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ConstraintsPackage.CONSTRAINT_PROPERTY__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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY:

-			return base_Property != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.CONSTRAINT_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-				}

-			}

-		}

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Property(Property newBase_Property) {

-		Property oldBase_Property = base_Property;

-		base_Property = newBase_Property;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.CONSTRAINT_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-		}

-	}

-

-} // ConstraintPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsFactoryImpl.java
deleted file mode 100644
index 68cbd0f1be1..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsFactoryImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.internal.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.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ConstraintsPackage getPackage() {

-		return ConstraintsPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ConstraintsFactory init() {

-		try {

-			ConstraintsFactory theConstraintsFactory = (ConstraintsFactory) EPackage.Registry.INSTANCE.getEFactory(ConstraintsPackage.eNS_URI);

-			if (theConstraintsFactory != null) {

-				return theConstraintsFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ConstraintsFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case ConstraintsPackage.CONSTRAINT_BLOCK:

-			return createConstraintBlock();

-		case ConstraintsPackage.CONSTRAINT_PROPERTY:

-			return createConstraintProperty();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintBlock createConstraintBlock() {

-		ConstraintBlockImpl constraintBlock = new ConstraintBlockImpl();

-		return constraintBlock;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintProperty createConstraintProperty() {

-		ConstraintPropertyImpl constraintProperty = new ConstraintPropertyImpl();

-		return constraintProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsPackage getConstraintsPackage() {

-		return (ConstraintsPackage) getEPackage();

-	}

-

-} // ConstraintsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsPackageImpl.java
deleted file mode 100644
index 89a8f9ea5f0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/internal/impl/ConstraintsPackageImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsPackage {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link ConstraintsPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static ConstraintsPackage init() {

-		if (isInited) {

-			return (ConstraintsPackage) EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConstraintsPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theConstraintsPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theConstraintsPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theConstraintsPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ConstraintsPackage.eNS_URI, theConstraintsPackage);

-		return theConstraintsPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass constraintBlockEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass constraintPropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.constraints.ConstraintsPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ConstraintsPackageImpl() {

-		super(eNS_URI, ConstraintsFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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

-		constraintBlockEClass = createEClass(CONSTRAINT_BLOCK);

-

-		constraintPropertyEClass = createEClass(CONSTRAINT_PROPERTY);

-		createEReference(constraintPropertyEClass, CONSTRAINT_PROPERTY__BASE_PROPERTY);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConstraintBlock() {

-		return constraintBlockEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConstraintProperty() {

-		return constraintPropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConstraintProperty_Base_Property() {

-		return (EReference) constraintPropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsFactory getConstraintsFactory() {

-		return (ConstraintsFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * 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

-		BlocksPackage theBlocksPackage = (BlocksPackage) EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		constraintBlockEClass.getESuperTypes().add(theBlocksPackage.getBlock());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(constraintBlockEClass, ConstraintBlock.class, "ConstraintBlock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(constraintPropertyEClass, ConstraintProperty.class, "ConstraintProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConstraintProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ConstraintProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-	}

-

-} // ConstraintsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsAdapterFactory.java
deleted file mode 100644
index 84356821915..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsAdapterFactory.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-

-/**

- * <!-- 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.sysml.constraints.ConstraintsPackage

- * @generated

- */

-public class ConstraintsAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ConstraintsPackage modelPackage;

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintsSwitch<Adapter> modelSwitch = new ConstraintsSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseConstraintBlock(ConstraintBlock object) {

-			return createConstraintBlockAdapter();

-		}

-

-		@Override

-		public Adapter caseConstraintProperty(ConstraintProperty object) {

-			return createConstraintPropertyAdapter();

-		}

-

-		@Override

-		public Adapter caseBlock(Block object) {

-			return createBlockAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ConstraintsPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * 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.sysml.blocks.Block <em>Block</em>}'. <!--

-	 * begin-user-doc --> This default implementation returns null so that we

-	 * can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.blocks.Block

-	 * @generated

-	 */

-	public Adapter createBlockAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock <em>Constraint Block</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintBlock

-	 * @generated

-	 */

-	public Adapter createConstraintBlockAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty <em>Constraint Property</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.constraints.ConstraintProperty

-	 * @generated

-	 */

-	public Adapter createConstraintPropertyAdapter() {

-		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;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // ConstraintsAdapterFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceFactoryImpl.java
deleted file mode 100644
index 687fd9c276c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.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.sysml.constraints.util.ConstraintsResourceImpl

- * @generated

- */

-public class ConstraintsResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new ConstraintsResourceImpl(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;

-	}

-

-} // ConstraintsResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceImpl.java
deleted file mode 100644
index 0e9be1f291e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.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.sysml.constraints.util.ConstraintsResourceFactoryImpl

- * @generated

- */

-public class ConstraintsResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public ConstraintsResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // ConstraintsResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsSwitch.java
deleted file mode 100644
index 2dc10fca777..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsSwitch.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

-import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-

-/**

- * <!-- 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.sysml.constraints.ConstraintsPackage

- * @generated

- */

-public class ConstraintsSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ConstraintsPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ConstraintsPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Block</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Block</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBlock(Block object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Constraint Block</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Constraint Block</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConstraintBlock(ConstraintBlock object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Constraint Property</em>'.

-	 * <!-- begin-user-doc --> This

-	 * implementation returns null; returning a non-null result will terminate

-	 * the switch. <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Constraint Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConstraintProperty(ConstraintProperty 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;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case ConstraintsPackage.CONSTRAINT_BLOCK: {

-			ConstraintBlock constraintBlock = (ConstraintBlock) theEObject;

-			T result = caseConstraintBlock(constraintBlock);

-			if (result == null) {

-				result = caseBlock(constraintBlock);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ConstraintsPackage.CONSTRAINT_PROPERTY: {

-			ConstraintProperty constraintProperty = (ConstraintProperty) theEObject;

-			T result = caseConstraintProperty(constraintProperty);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-} // ConstraintsSwitch

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsXMLProcessor.java
deleted file mode 100644
index 966f70fe144..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/constraints/util/ConstraintsXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.constraints.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.sysml.constraints.ConstraintsPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		ConstraintsPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the ConstraintsResourceFactoryImpl 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 ConstraintsResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new ConstraintsResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // ConstraintsXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsFactory.java
deleted file mode 100644
index eb7f89c17e6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.interactions;

-

-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.sysml.interactions.InteractionsPackage

- * @generated

- */

-public interface InteractionsFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	InteractionsFactory eINSTANCE = org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsFactoryImpl.init();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	InteractionsPackage getInteractionsPackage();

-

-} // InteractionsFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsPackage.java
deleted file mode 100644
index 8c787838c94..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/InteractionsPackage.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.interactions;

-

-import org.eclipse.emf.ecore.EDataType;

-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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.interactions.InteractionsFactory

- * @model kind="package"

- * @generated

- */

-public interface InteractionsPackage extends EPackage {

-

-	/**

-	 * <!-- 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 '<em>Dummy</em>' data type. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see java.lang.String

-		 * @see org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl#getDummy()

-		 * @generated

-		 */

-		EDataType DUMMY = eINSTANCE.getDummy();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "interactions";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Interactions";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "Interactions";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	InteractionsPackage eINSTANCE = org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl.init();

-

-	/**

-	 * The meta object id for the '<em>Dummy</em>' data type. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see java.lang.String

-	 * @see org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl#getDummy()

-	 * @generated

-	 */

-	int DUMMY = 0;

-

-	/**

-	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for data type '<em>Dummy</em>'.

-	 * @see java.lang.String

-	 * @model instanceClass="java.lang.String"

-	 * @generated

-	 */

-	EDataType getDummy();

-

-	/**

-	 * 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

-	 */

-	InteractionsFactory getInteractionsFactory();

-

-} // InteractionsPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsFactoryImpl.java
deleted file mode 100644
index ead420c56aa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsFactoryImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.interactions.internal.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.sysml.interactions.InteractionsFactory;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class InteractionsFactoryImpl extends EFactoryImpl implements InteractionsFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static InteractionsPackage getPackage() {

-		return InteractionsPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static InteractionsFactory init() {

-		try {

-			InteractionsFactory theInteractionsFactory = (InteractionsFactory) EPackage.Registry.INSTANCE.getEFactory(InteractionsPackage.eNS_URI);

-			if (theInteractionsFactory != null) {

-				return theInteractionsFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new InteractionsFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InteractionsFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

-		return super.convertToString(eDataType, instanceValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case InteractionsPackage.DUMMY:

-			return convertDummyToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String) super.createFromString(eDataType, initialValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case InteractionsPackage.DUMMY:

-			return createDummyFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InteractionsPackage getInteractionsPackage() {

-		return (InteractionsPackage) getEPackage();

-	}

-

-} // InteractionsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsPackageImpl.java
deleted file mode 100644
index 7ba7936d676..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/internal/impl/InteractionsPackageImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.interactions.internal.impl;

-

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsFactory;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class InteractionsPackageImpl extends EPackageImpl implements InteractionsPackage {

-

-	/**

-	 * <!-- 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 InteractionsPackage#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 InteractionsPackage init() {

-		if (isInited) {

-			return (InteractionsPackage) EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InteractionsPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theInteractionsPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theInteractionsPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theInteractionsPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(InteractionsPackage.eNS_URI, theInteractionsPackage);

-		return theInteractionsPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EDataType dummyEDataType = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.interactions.InteractionsPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private InteractionsPackageImpl() {

-		super(eNS_URI, InteractionsFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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 data types

-		dummyEDataType = createEDataType(DUMMY);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EDataType getDummy() {

-		return dummyEDataType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InteractionsFactory getInteractionsFactory() {

-		return (InteractionsFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * 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);

-

-		// Initialize data types

-		initEDataType(dummyEDataType, String.class, "Dummy", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

-	}

-

-} // InteractionsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceFactoryImpl.java
deleted file mode 100644
index 91ed3d5fe5b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceFactoryImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.interactions.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.sysml.interactions.util.InteractionsResourceImpl

- * @generated

- */

-public class InteractionsResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InteractionsResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new InteractionsResourceImpl(uri);

-		return result;

-	}

-

-} // InteractionsResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceImpl.java
deleted file mode 100644
index 431b9d01bad..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.interactions.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.sysml.interactions.util.InteractionsResourceFactoryImpl

- * @generated

- */

-public class InteractionsResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public InteractionsResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // InteractionsResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsXMLProcessor.java
deleted file mode 100644
index 39a48567ccb..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/interactions/util/InteractionsXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.interactions.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.sysml.interactions.InteractionsPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class InteractionsXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InteractionsXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		InteractionsPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the InteractionsResourceFactoryImpl 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 InteractionsResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new InteractionsResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // InteractionsXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlFactoryImpl.java
deleted file mode 100644
index 2eabd4fe430..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlFactoryImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.internal.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.sysml.SysmlFactory;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class SysmlFactoryImpl extends EFactoryImpl implements SysmlFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static SysmlPackage getPackage() {

-		return SysmlPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static SysmlFactory init() {

-		try {

-			SysmlFactory theSysmlFactory = (SysmlFactory) EPackage.Registry.INSTANCE.getEFactory(SysmlPackage.eNS_URI);

-			if (theSysmlFactory != null) {

-				return theSysmlFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new SysmlFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SysmlFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

-		return super.convertToString(eDataType, instanceValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case SysmlPackage.DUMMY:

-			return convertDummyToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String) super.createFromString(eDataType, initialValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case SysmlPackage.DUMMY:

-			return createDummyFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SysmlPackage getSysmlPackage() {

-		return (SysmlPackage) getEPackage();

-	}

-

-} // SysmlFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlPackageImpl.java
deleted file mode 100644
index 999835470a5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/internal/impl/SysmlPackageImpl.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.internal.impl;

-

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlFactory;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class SysmlPackageImpl extends EPackageImpl implements SysmlPackage {

-

-	/**

-	 * <!-- 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 SysmlPackage#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 SysmlPackage init() {

-		if (isInited) {

-			return (SysmlPackage) EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SysmlPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theSysmlPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(SysmlPackage.eNS_URI, theSysmlPackage);

-		return theSysmlPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EDataType dummyEDataType = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.SysmlPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private SysmlPackageImpl() {

-		super(eNS_URI, SysmlFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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 data types

-		dummyEDataType = createEDataType(DUMMY);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EDataType getDummy() {

-		return dummyEDataType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SysmlFactory getSysmlFactory() {

-		return (SysmlFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * 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

-		ModelelementsPackage theModelelementsPackage = (ModelelementsPackage) EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI);

-		BlocksPackage theBlocksPackage = (BlocksPackage) EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);

-		PortandflowsPackage thePortandflowsPackage = (PortandflowsPackage) EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI);

-		ConstraintsPackage theConstraintsPackage = (ConstraintsPackage) EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);

-		ActivitiesPackage theActivitiesPackage = (ActivitiesPackage) EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI);

-		AllocationsPackage theAllocationsPackage = (AllocationsPackage) EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI);

-		RequirementsPackage theRequirementsPackage = (RequirementsPackage) EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

-		InteractionsPackage theInteractionsPackage = (InteractionsPackage) EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI);

-		StatemachinesPackage theStatemachinesPackage = (StatemachinesPackage) EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI);

-		UsecasesPackage theUsecasesPackage = (UsecasesPackage) EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI);

-

-		// Add subpackages

-		getESubpackages().add(theModelelementsPackage);

-		getESubpackages().add(theBlocksPackage);

-		getESubpackages().add(thePortandflowsPackage);

-		getESubpackages().add(theConstraintsPackage);

-		getESubpackages().add(theActivitiesPackage);

-		getESubpackages().add(theAllocationsPackage);

-		getESubpackages().add(theRequirementsPackage);

-		getESubpackages().add(theInteractionsPackage);

-		getESubpackages().add(theStatemachinesPackage);

-		getESubpackages().add(theUsecasesPackage);

-

-		// Initialize data types

-		initEDataType(dummyEDataType, String.class, "Dummy", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // SysmlPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Conform.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Conform.java
deleted file mode 100644
index d3f2074e506..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Conform.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Dependency;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Conform</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency <em>Base Dependency</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getConform()

- * @model

- * @generated

- */

-public interface Conform extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Dependency</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Dependency</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 Dependency</em>' reference.

-	 * @see #setBase_Dependency(Dependency)

-	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getConform_Base_Dependency()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Dependency getBase_Dependency();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency <em>Base Dependency</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Dependency</em>' reference.

-	 * @see #getBase_Dependency()

-	 * @generated

-	 */

-	void setBase_Dependency(Dependency value);

-

-} // Conform

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsFactory.java
deleted file mode 100644
index 8e788985acc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsFactory.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements;

-

-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.sysml.modelelements.ModelelementsPackage

- * @generated

- */

-public interface ModelelementsFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ModelelementsFactory eINSTANCE = org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Conform</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Conform</em>'.

-	 * @generated

-	 */

-	Conform createConform();

-

-	/**

-	 * Returns a new object of class '<em>Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Problem</em>'.

-	 * @generated

-	 */

-	Problem createProblem();

-

-	/**

-	 * Returns a new object of class '<em>Rationale</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Rationale</em>'.

-	 * @generated

-	 */

-	Rationale createRationale();

-

-	/**

-	 * Returns a new object of class '<em>View</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>View</em>'.

-	 * @generated

-	 */

-	View createView();

-

-	/**

-	 * Returns a new object of class '<em>View Point</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>View Point</em>'.

-	 * @generated

-	 */

-	ViewPoint createViewPoint();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ModelelementsPackage getModelelementsPackage();

-

-} // ModelelementsFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsPackage.java
deleted file mode 100644
index 37f068ce5f5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ModelelementsPackage.java
+++ /dev/null
@@ -1,660 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains

- * accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc --> <!-- begin-model-doc --> The supplier/target must be an

- * element stereotyped by <<ViewPoint>> The client/source must be an element

- * stereotyped by <<View>> <!-- end-model-doc -->

- *

- * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsFactory

- * @model kind="package"

- * @generated

- */

-public interface ModelelementsPackage extends EPackage {

-

-	/**

-	 * <!-- 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.sysml.modelelements.internal.impl.ConformImpl

-		 * <em>Conform</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getConform()

-		 * @generated

-		 */

-		EClass CONFORM = eINSTANCE.getConform();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Dependency</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONFORM__BASE_DEPENDENCY = eINSTANCE.getConform_Base_Dependency();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl <em>View</em>}' class.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getView()

-		 * @generated

-		 */

-		EClass VIEW = eINSTANCE.getView();

-

-		/**

-		 * The meta object literal for the '<em><b>View Point</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIEW__VIEW_POINT = eINSTANCE.getView_ViewPoint();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIEW__BASE_PACKAGE = eINSTANCE.getView_Base_Package();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl <em>View Point</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getViewPoint()

-		 * @generated

-		 */

-		EClass VIEW_POINT = eINSTANCE.getViewPoint();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIEW_POINT__BASE_CLASS = eINSTANCE.getViewPoint_Base_Class();

-

-		/**

-		 * The meta object literal for the '<em><b>Stake Holders</b></em>' attribute list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIEW_POINT__STAKE_HOLDERS = eINSTANCE.getViewPoint_StakeHolders();

-

-		/**

-		 * The meta object literal for the '<em><b>Purpose</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIEW_POINT__PURPOSE = eINSTANCE.getViewPoint_Purpose();

-

-		/**

-		 * The meta object literal for the '<em><b>Concerns</b></em>' attribute list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIEW_POINT__CONCERNS = eINSTANCE.getViewPoint_Concerns();

-

-		/**

-		 * The meta object literal for the '<em><b>Languages</b></em>' attribute list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIEW_POINT__LANGUAGES = eINSTANCE.getViewPoint_Languages();

-

-		/**

-		 * The meta object literal for the '<em><b>Methods</b></em>' attribute list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIEW_POINT__METHODS = eINSTANCE.getViewPoint_Methods();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl

-		 * <em>Rationale</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getRationale()

-		 * @generated

-		 */

-		EClass RATIONALE = eINSTANCE.getRationale();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Comment</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference RATIONALE__BASE_COMMENT = eINSTANCE.getRationale_Base_Comment();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl

-		 * <em>Problem</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl

-		 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getProblem()

-		 * @generated

-		 */

-		EClass PROBLEM = eINSTANCE.getProblem();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Comment</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PROBLEM__BASE_COMMENT = eINSTANCE.getProblem_Base_Comment();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "modelelements";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "ModelElements";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ModelelementsPackage eINSTANCE = org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl <em>Conform</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getConform()

-	 * @generated

-	 */

-	int CONFORM = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Dependency</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFORM__BASE_DEPENDENCY = 0;

-

-	/**

-	 * The number of structural features of the '<em>Conform</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFORM_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Conform</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFORM_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl <em>View</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getView()

-	 * @generated

-	 */

-	int VIEW = 1;

-

-	/**

-	 * The feature id for the '<em><b>View Point</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW__VIEW_POINT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Package</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW__BASE_PACKAGE = 1;

-

-	/**

-	 * The number of structural features of the '<em>View</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>View</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl

-	 * <em>View Point</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getViewPoint()

-	 * @generated

-	 */

-	int VIEW_POINT = 2;

-

-	/**

-	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT__BASE_CLASS = 0;

-

-	/**

-	 * The feature id for the '<em><b>Stake Holders</b></em>' attribute list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT__STAKE_HOLDERS = 1;

-

-	/**

-	 * The feature id for the '<em><b>Purpose</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT__PURPOSE = 2;

-

-	/**

-	 * The feature id for the '<em><b>Concerns</b></em>' attribute list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT__CONCERNS = 3;

-

-	/**

-	 * The feature id for the '<em><b>Languages</b></em>' attribute list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT__LANGUAGES = 4;

-

-	/**

-	 * The feature id for the '<em><b>Methods</b></em>' attribute list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT__METHODS = 5;

-

-	/**

-	 * The number of structural features of the '<em>View Point</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT_FEATURE_COUNT = 6;

-

-	/**

-	 * The number of operations of the '<em>View Point</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_POINT_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl <em>Rationale</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getRationale()

-	 * @generated

-	 */

-	int RATIONALE = 3;

-

-	/**

-	 * The feature id for the '<em><b>Base Comment</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATIONALE__BASE_COMMENT = 0;

-

-	/**

-	 * The number of structural features of the '<em>Rationale</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATIONALE_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Rationale</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RATIONALE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl <em>Problem</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl

-	 * @see org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl#getProblem()

-	 * @generated

-	 */

-	int PROBLEM = 4;

-

-	/**

-	 * The feature id for the '<em><b>Base Comment</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__BASE_COMMENT = 0;

-

-	/**

-	 * The number of structural features of the '<em>Problem</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM_OPERATION_COUNT = 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.Conform <em>Conform</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Conform</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.Conform

-	 * @generated

-	 */

-	EClass getConform();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency <em>Base Dependency</em>} '.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Dependency</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.Conform#getBase_Dependency()

-	 * @see #getConform()

-	 * @generated

-	 */

-	EReference getConform_Base_Dependency();

-

-	/**

-	 * 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

-	 */

-	ModelelementsFactory getModelelementsFactory();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.Problem <em>Problem</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Problem</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.Problem

-	 * @generated

-	 */

-	EClass getProblem();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.Problem#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.sysml.modelelements.Problem#getBase_Comment()

-	 * @see #getProblem()

-	 * @generated

-	 */

-	EReference getProblem_Base_Comment();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.Rationale <em>Rationale</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Rationale</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.Rationale

-	 * @generated

-	 */

-	EClass getRationale();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.Rationale#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.sysml.modelelements.Rationale#getBase_Comment()

-	 * @see #getRationale()

-	 * @generated

-	 */

-	EReference getRationale_Base_Comment();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.modelelements.View <em>View</em>}'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>View</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.View

-	 * @generated

-	 */

-	EClass getView();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.View#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.sysml.modelelements.View#getBase_Package()

-	 * @see #getView()

-	 * @generated

-	 */

-	EReference getView_Base_Package();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.View#getViewPoint <em>View Point</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>View Point</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.View#getViewPoint()

-	 * @see #getView()

-	 * @generated

-	 */

-	EReference getView_ViewPoint();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint <em>View Point</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>View Point</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint

-	 * @generated

-	 */

-	EClass getViewPoint();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#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.sysml.modelelements.ViewPoint#getBase_Class()

-	 * @see #getViewPoint()

-	 * @generated

-	 */

-	EReference getViewPoint_Base_Class();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getConcerns <em>Concerns</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Concerns</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getConcerns()

-	 * @see #getViewPoint()

-	 * @generated

-	 */

-	EAttribute getViewPoint_Concerns();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getLanguages <em>Languages</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Languages</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getLanguages()

-	 * @see #getViewPoint()

-	 * @generated

-	 */

-	EAttribute getViewPoint_Languages();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getMethods <em>Methods</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Methods</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getMethods()

-	 * @see #getViewPoint()

-	 * @generated

-	 */

-	EAttribute getViewPoint_Methods();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getPurpose <em>Purpose</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Purpose</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getPurpose()

-	 * @see #getViewPoint()

-	 * @generated

-	 */

-	EAttribute getViewPoint_Purpose();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getStakeHolders

-	 * <em>Stake Holders</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Stake Holders</em>'.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint#getStakeHolders()

-	 * @see #getViewPoint()

-	 * @generated

-	 */

-	EAttribute getViewPoint_StakeHolders();

-

-} // ModelelementsPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Problem.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Problem.java
deleted file mode 100644
index 0886b22403b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Problem.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Comment;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Problem</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.Problem#getBase_Comment <em>Base Comment</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getProblem()

- * @model

- * @generated

- */

-public interface Problem 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.sysml.modelelements.ModelelementsPackage#getProblem_Base_Comment()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Comment getBase_Comment();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.Problem#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);

-

-} // Problem

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Rationale.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Rationale.java
deleted file mode 100644
index 89fc1d29931..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/Rationale.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Comment;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Rationale</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.Rationale#getBase_Comment <em>Base Comment</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getRationale()

- * @model

- * @generated

- */

-public interface Rationale 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.sysml.modelelements.ModelelementsPackage#getRationale_Base_Comment()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Comment getBase_Comment();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.Rationale#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);

-

-} // Rationale

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/View.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/View.java
deleted file mode 100644
index 88aab4c1f40..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/View.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>View</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.View#getViewPoint <em>View Point</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.View#getBase_Package <em>Base Package</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getView()

- * @model

- * @generated

- */

-public interface View 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.sysml.modelelements.ModelelementsPackage#getView_Base_Package()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	org.eclipse.uml2.uml.Package getBase_Package();

-

-	/**

-	 * Returns the value of the '<em><b>View Point</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>View Point</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>View Point</em>' reference.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getView_ViewPoint()

-	 * @model required="true" transient="true" changeable="false"

-	 *        volatile="true" derived="true" ordered="false"

-	 * @generated

-	 */

-	ViewPoint getViewPoint();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.View#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);

-

-} // View

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ViewPoint.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ViewPoint.java
deleted file mode 100644
index a6793404a0a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/ViewPoint.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>View Point</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getBase_Class <em>Base Class</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getStakeHolders <em>Stake Holders</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getPurpose <em>Purpose</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getConcerns <em>Concerns</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getLanguages <em>Languages</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getMethods <em>Methods</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint()

- * @model

- * @generated

- */

-public interface ViewPoint 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.sysml.modelelements.ModelelementsPackage#getViewPoint_Base_Class()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	org.eclipse.uml2.uml.Class getBase_Class();

-

-	/**

-	 * Returns the value of the '<em><b>Concerns</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc

-	 * -->

-	 * <p>

-	 * If the meaning of the '<em>Concerns</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Concerns</em>' attribute list.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Concerns()

-	 * @model unique="false" dataType="org.eclipse.uml2.types.String" ordered="false"

-	 * @generated

-	 */

-	EList<String> getConcerns();

-

-	/**

-	 * Returns the value of the '<em><b>Languages</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc

-	 * -->

-	 * <p>

-	 * If the meaning of the '<em>Languages</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Languages</em>' attribute list.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Languages()

-	 * @model unique="false" dataType="org.eclipse.uml2.types.String" ordered="false"

-	 * @generated

-	 */

-	EList<String> getLanguages();

-

-	/**

-	 * Returns the value of the '<em><b>Methods</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc

-	 * -->

-	 * <p>

-	 * If the meaning of the '<em>Methods</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Methods</em>' attribute list.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Methods()

-	 * @model unique="false" dataType="org.eclipse.uml2.types.String" ordered="false"

-	 * @generated

-	 */

-	EList<String> getMethods();

-

-	/**

-	 * Returns the value of the '<em><b>Purpose</b></em>' attribute. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Purpose</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Purpose</em>' attribute.

-	 * @see #setPurpose(String)

-	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_Purpose()

-	 * @model unique="false" ordered="false"

-	 * @generated

-	 */

-	String getPurpose();

-

-	/**

-	 * Returns the value of the '<em><b>Stake Holders</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Stake Holders</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Stake Holders</em>' attribute list.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage#getViewPoint_StakeHolders()

-	 * @model unique="false" ordered="false"

-	 * @generated

-	 */

-	EList<String> getStakeHolders();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#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);

-

-	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint#getPurpose

-	 * <em>Purpose</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Purpose</em>' attribute.

-	 * @see #getPurpose()

-	 * @generated

-	 */

-	void setPurpose(String value);

-

-} // ViewPoint

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ConformImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ConformImpl.java
deleted file mode 100644
index 6983c98d0ff..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ConformImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.internal.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.sysml.modelelements.Conform;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.uml2.uml.Dependency;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Conform</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ConformImpl#getBase_Dependency <em>Base Dependency</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConformImpl extends MinimalEObjectImpl.Container implements Conform {

-

-	/**

-	 * The cached value of the '{@link #getBase_Dependency() <em>Base Dependency</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Dependency()

-	 * @generated

-	 * @ordered

-	 */

-	protected Dependency base_Dependency;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConformImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Dependency basicGetBase_Dependency() {

-		return base_Dependency;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

-			if (resolve) {

-				return getBase_Dependency();

-			}

-			return basicGetBase_Dependency();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

-			return base_Dependency != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

-			setBase_Dependency((Dependency) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ModelelementsPackage.Literals.CONFORM;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.CONFORM__BASE_DEPENDENCY:

-			setBase_Dependency((Dependency) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Dependency getBase_Dependency() {

-		if (base_Dependency != null && base_Dependency.eIsProxy()) {

-			InternalEObject oldBase_Dependency = (InternalEObject) base_Dependency;

-			base_Dependency = (Dependency) eResolveProxy(oldBase_Dependency);

-			if (base_Dependency != oldBase_Dependency) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelelementsPackage.CONFORM__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

-				}

-			}

-		}

-		return base_Dependency;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Dependency(Dependency newBase_Dependency) {

-		Dependency oldBase_Dependency = base_Dependency;

-		base_Dependency = newBase_Dependency;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.CONFORM__BASE_DEPENDENCY, oldBase_Dependency, base_Dependency));

-		}

-	}

-

-} // ConformImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsFactoryImpl.java
deleted file mode 100644
index 891d877f9fa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsFactoryImpl.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.internal.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.sysml.modelelements.Conform;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsFactory;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.Problem;

-import org.eclipse.papyrus.sysml.modelelements.Rationale;

-import org.eclipse.papyrus.sysml.modelelements.View;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ModelelementsFactoryImpl extends EFactoryImpl implements ModelelementsFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ModelelementsPackage getPackage() {

-		return ModelelementsPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ModelelementsFactory init() {

-		try {

-			ModelelementsFactory theModelelementsFactory = (ModelelementsFactory) EPackage.Registry.INSTANCE.getEFactory(ModelelementsPackage.eNS_URI);

-			if (theModelelementsFactory != null) {

-				return theModelelementsFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ModelelementsFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case ModelelementsPackage.CONFORM:

-			return createConform();

-		case ModelelementsPackage.VIEW:

-			return createView();

-		case ModelelementsPackage.VIEW_POINT:

-			return createViewPoint();

-		case ModelelementsPackage.RATIONALE:

-			return createRationale();

-		case ModelelementsPackage.PROBLEM:

-			return createProblem();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Conform createConform() {

-		ConformImpl conform = new ConformImpl();

-		return conform;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Problem createProblem() {

-		ProblemImpl problem = new ProblemImpl();

-		return problem;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Rationale createRationale() {

-		RationaleImpl rationale = new RationaleImpl();

-		return rationale;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public View createView() {

-		ViewImpl view = new ViewImpl();

-		return view;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ViewPoint createViewPoint() {

-		ViewPointImpl viewPoint = new ViewPointImpl();

-		return viewPoint;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsPackage getModelelementsPackage() {

-		return (ModelelementsPackage) getEPackage();

-	}

-

-} // ModelelementsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsPackageImpl.java
deleted file mode 100644
index 336383b9b4b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ModelelementsPackageImpl.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.internal.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.Conform;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsFactory;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.Problem;

-import org.eclipse.papyrus.sysml.modelelements.Rationale;

-import org.eclipse.papyrus.sysml.modelelements.View;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class ModelelementsPackageImpl extends EPackageImpl implements ModelelementsPackage {

-

-	/**

-	 * <!-- 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 ModelelementsPackage#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 ModelelementsPackage init() {

-		if (isInited) {

-			return (ModelelementsPackage) EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ModelelementsPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theModelelementsPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theModelelementsPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theModelelementsPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ModelelementsPackage.eNS_URI, theModelelementsPackage);

-		return theModelelementsPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass conformEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass viewEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass viewPointEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass rationaleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass problemEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.modelelements.ModelelementsPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ModelelementsPackageImpl() {

-		super(eNS_URI, ModelelementsFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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

-		conformEClass = createEClass(CONFORM);

-		createEReference(conformEClass, CONFORM__BASE_DEPENDENCY);

-

-		viewEClass = createEClass(VIEW);

-		createEReference(viewEClass, VIEW__VIEW_POINT);

-		createEReference(viewEClass, VIEW__BASE_PACKAGE);

-

-		viewPointEClass = createEClass(VIEW_POINT);

-		createEReference(viewPointEClass, VIEW_POINT__BASE_CLASS);

-		createEAttribute(viewPointEClass, VIEW_POINT__STAKE_HOLDERS);

-		createEAttribute(viewPointEClass, VIEW_POINT__PURPOSE);

-		createEAttribute(viewPointEClass, VIEW_POINT__CONCERNS);

-		createEAttribute(viewPointEClass, VIEW_POINT__LANGUAGES);

-		createEAttribute(viewPointEClass, VIEW_POINT__METHODS);

-

-		rationaleEClass = createEClass(RATIONALE);

-		createEReference(rationaleEClass, RATIONALE__BASE_COMMENT);

-

-		problemEClass = createEClass(PROBLEM);

-		createEReference(problemEClass, PROBLEM__BASE_COMMENT);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConform() {

-		return conformEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConform_Base_Dependency() {

-		return (EReference) conformEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsFactory getModelelementsFactory() {

-		return (ModelelementsFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getProblem() {

-		return problemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getProblem_Base_Comment() {

-		return (EReference) problemEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getRationale() {

-		return rationaleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRationale_Base_Comment() {

-		return (EReference) rationaleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getView() {

-		return viewEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getView_Base_Package() {

-		return (EReference) viewEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getView_ViewPoint() {

-		return (EReference) viewEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getViewPoint() {

-		return viewPointEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getViewPoint_Base_Class() {

-		return (EReference) viewPointEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getViewPoint_Concerns() {

-		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getViewPoint_Languages() {

-		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getViewPoint_Methods() {

-		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getViewPoint_Purpose() {

-		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getViewPoint_StakeHolders() {

-		return (EAttribute) viewPointEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * 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);

-		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(conformEClass, Conform.class, "Conform", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConform_Base_Dependency(), theUMLPackage.getDependency(), null, "base_Dependency", null, 1, 1, Conform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-

-		initEClass(viewEClass, View.class, "View", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getView_ViewPoint(), this.getViewPoint(), null, "viewPoint", null, 1, 1, View.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getView_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 1, 1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(viewPointEClass, ViewPoint.class, "ViewPoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getViewPoint_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, ViewPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getViewPoint_StakeHolders(), theTypesPackage.getString(), "stakeHolders", null, 0, -1, ViewPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getViewPoint_Purpose(), theTypesPackage.getString(), "purpose", null, 0, 1, ViewPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getViewPoint_Concerns(), theTypesPackage.getString(), "concerns", null, 0, -1, ViewPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getViewPoint_Languages(), theTypesPackage.getString(), "languages", null, 0, -1, ViewPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getViewPoint_Methods(), theTypesPackage.getString(), "methods", null, 0, -1, ViewPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEClass(rationaleEClass, Rationale.class, "Rationale", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRationale_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 1, 1, Rationale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-

-		initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getProblem_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 1, 1, Problem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-	}

-

-} // ModelelementsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ProblemImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ProblemImpl.java
deleted file mode 100644
index c395b57ab58..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ProblemImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.internal.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.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.Problem;

-import org.eclipse.uml2.uml.Comment;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Problem</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ProblemImpl#getBase_Comment <em>Base Comment</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem {

-

-	/**

-	 * 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 ProblemImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Comment basicGetBase_Comment() {

-		return base_Comment;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ModelelementsPackage.PROBLEM__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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.PROBLEM__BASE_COMMENT:

-			return base_Comment != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ModelelementsPackage.PROBLEM__BASE_COMMENT:

-			setBase_Comment((Comment) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ModelelementsPackage.Literals.PROBLEM;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.PROBLEM__BASE_COMMENT:

-			setBase_Comment((Comment) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ModelelementsPackage.PROBLEM__BASE_COMMENT, oldBase_Comment, base_Comment));

-				}

-			}

-		}

-		return base_Comment;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Comment(Comment newBase_Comment) {

-		Comment oldBase_Comment = base_Comment;

-		base_Comment = newBase_Comment;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.PROBLEM__BASE_COMMENT, oldBase_Comment, base_Comment));

-		}

-	}

-

-} // ProblemImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/RationaleImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/RationaleImpl.java
deleted file mode 100644
index 0264a46e5cc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/RationaleImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.internal.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.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.Rationale;

-import org.eclipse.uml2.uml.Comment;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Rationale</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.RationaleImpl#getBase_Comment <em>Base Comment</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class RationaleImpl extends MinimalEObjectImpl.Container implements Rationale {

-

-	/**

-	 * 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 RationaleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Comment basicGetBase_Comment() {

-		return base_Comment;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ModelelementsPackage.RATIONALE__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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.RATIONALE__BASE_COMMENT:

-			return base_Comment != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ModelelementsPackage.RATIONALE__BASE_COMMENT:

-			setBase_Comment((Comment) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ModelelementsPackage.Literals.RATIONALE;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.RATIONALE__BASE_COMMENT:

-			setBase_Comment((Comment) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ModelelementsPackage.RATIONALE__BASE_COMMENT, oldBase_Comment, base_Comment));

-				}

-			}

-		}

-		return base_Comment;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Comment(Comment newBase_Comment) {

-		Comment oldBase_Comment = base_Comment;

-		base_Comment = newBase_Comment;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.RATIONALE__BASE_COMMENT, oldBase_Comment, base_Comment));

-		}

-	}

-

-} // RationaleImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewImpl.java
deleted file mode 100644
index 4eb890c8921..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.internal.impl;

-

-import java.util.Iterator;

-

-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.sysml.modelelements.Conform;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.View;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>View</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl#getViewPoint <em>View Point</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewImpl#getBase_Package <em>Base Package</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ViewImpl extends MinimalEObjectImpl.Container implements View {

-

-	/**

-	 * 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 ViewImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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 NOT

-	 */

-	public ViewPoint basicGetViewPoint() {

-		// ViewPoint is related to View via a Conform dependency

-		ViewPoint viewPoint = null;

-		Conform conform = null;

-

-		if (getBase_Package() != null) {

-			// Find Conform link

-			Iterator<Dependency> itDep = getBase_Package().getClientDependencies().iterator();

-			while (itDep.hasNext() && (conform == null)) {

-				Dependency currentDependency = itDep.next();

-				conform = UMLUtil.getStereotypeApplication(currentDependency, Conform.class);

-			}

-

-			// Find ViewPoint

-			if (conform != null) {

-				Iterator<Element> itElt = conform.getBase_Dependency().getTargets().iterator();

-				while (itElt.hasNext()) {

-					Element currentElt = itElt.next();

-					viewPoint = UMLUtil.getStereotypeApplication(currentElt, ViewPoint.class);

-				}

-			}

-		}

-		return viewPoint;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW__VIEW_POINT:

-			if (resolve) {

-				return getViewPoint();

-			}

-			return basicGetViewPoint();

-		case ModelelementsPackage.VIEW__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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW__VIEW_POINT:

-			return basicGetViewPoint() != null;

-		case ModelelementsPackage.VIEW__BASE_PACKAGE:

-			return base_Package != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW__BASE_PACKAGE:

-			setBase_Package((org.eclipse.uml2.uml.Package) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ModelelementsPackage.Literals.VIEW;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW__BASE_PACKAGE:

-			setBase_Package((org.eclipse.uml2.uml.Package) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ModelelementsPackage.VIEW__BASE_PACKAGE, oldBase_Package, base_Package));

-				}

-			}

-		}

-		return base_Package;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ViewPoint getViewPoint() {

-		ViewPoint viewPoint = basicGetViewPoint();

-		return viewPoint != null && viewPoint.eIsProxy() ? (ViewPoint) eResolveProxy((InternalEObject) viewPoint) : viewPoint;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ModelelementsPackage.VIEW__BASE_PACKAGE, oldBase_Package, base_Package));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public void setViewPoint(ViewPoint newViewPoint) {

-		// TODO: implement this method to set the 'View Point' reference

-		// Ensure that you remove @generated or mark it @generated NOT

-

-		// The exception makes the model opening to fail...

-		// throw new UnsupportedOperationException();

-	}

-

-} // ViewImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewPointImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewPointImpl.java
deleted file mode 100644
index bfd621d72e0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/internal/impl/ViewPointImpl.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.internal.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>View Point</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl#getBase_Class <em>Base Class</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl#getStakeHolders <em>Stake Holders</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl#getPurpose <em>Purpose</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl#getConcerns <em>Concerns</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl#getLanguages <em>Languages</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.modelelements.internal.impl.ViewPointImpl#getMethods <em>Methods</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ViewPointImpl extends MinimalEObjectImpl.Container implements ViewPoint {

-

-	/**

-	 * 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;

-

-	/**

-	 * The cached value of the '{@link #getStakeHolders() <em>Stake Holders</em>}' attribute list.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getStakeHolders()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> stakeHolders;

-

-	/**

-	 * The default value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getPurpose()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PURPOSE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getPurpose() <em>Purpose</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getPurpose()

-	 * @generated

-	 * @ordered

-	 */

-	protected String purpose = PURPOSE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' attribute list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getConcerns()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> concerns;

-

-	/**

-	 * The cached value of the '{@link #getLanguages() <em>Languages</em>}' attribute list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getLanguages()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> languages;

-

-	/**

-	 * The cached value of the '{@link #getMethods() <em>Methods</em>}' attribute list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getMethods()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> methods;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewPointImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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 Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

-			if (resolve) {

-				return getBase_Class();

-			}

-			return basicGetBase_Class();

-		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

-			return getStakeHolders();

-		case ModelelementsPackage.VIEW_POINT__PURPOSE:

-			return getPurpose();

-		case ModelelementsPackage.VIEW_POINT__CONCERNS:

-			return getConcerns();

-		case ModelelementsPackage.VIEW_POINT__LANGUAGES:

-			return getLanguages();

-		case ModelelementsPackage.VIEW_POINT__METHODS:

-			return getMethods();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

-			return base_Class != null;

-		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

-			return stakeHolders != null && !stakeHolders.isEmpty();

-		case ModelelementsPackage.VIEW_POINT__PURPOSE:

-			return PURPOSE_EDEFAULT == null ? purpose != null : !PURPOSE_EDEFAULT.equals(purpose);

-		case ModelelementsPackage.VIEW_POINT__CONCERNS:

-			return concerns != null && !concerns.isEmpty();

-		case ModelelementsPackage.VIEW_POINT__LANGUAGES:

-			return languages != null && !languages.isEmpty();

-		case ModelelementsPackage.VIEW_POINT__METHODS:

-			return methods != null && !methods.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class) newValue);

-			return;

-		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

-			getStakeHolders().clear();

-			getStakeHolders().addAll((Collection<? extends String>) newValue);

-			return;

-		case ModelelementsPackage.VIEW_POINT__PURPOSE:

-			setPurpose((String) newValue);

-			return;

-		case ModelelementsPackage.VIEW_POINT__CONCERNS:

-			getConcerns().clear();

-			getConcerns().addAll((Collection<? extends String>) newValue);

-			return;

-		case ModelelementsPackage.VIEW_POINT__LANGUAGES:

-			getLanguages().clear();

-			getLanguages().addAll((Collection<? extends String>) newValue);

-			return;

-		case ModelelementsPackage.VIEW_POINT__METHODS:

-			getMethods().clear();

-			getMethods().addAll((Collection<? extends String>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ModelelementsPackage.Literals.VIEW_POINT;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ModelelementsPackage.VIEW_POINT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class) null);

-			return;

-		case ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS:

-			getStakeHolders().clear();

-			return;

-		case ModelelementsPackage.VIEW_POINT__PURPOSE:

-			setPurpose(PURPOSE_EDEFAULT);

-			return;

-		case ModelelementsPackage.VIEW_POINT__CONCERNS:

-			getConcerns().clear();

-			return;

-		case ModelelementsPackage.VIEW_POINT__LANGUAGES:

-			getLanguages().clear();

-			return;

-		case ModelelementsPackage.VIEW_POINT__METHODS:

-			getMethods().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ModelelementsPackage.VIEW_POINT__BASE_CLASS, oldBase_Class, base_Class));

-				}

-			}

-		}

-		return base_Class;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getConcerns() {

-		if (concerns == null) {

-			concerns = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__CONCERNS);

-		}

-		return concerns;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getLanguages() {

-		if (languages == null) {

-			languages = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__LANGUAGES);

-		}

-		return languages;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getMethods() {

-		if (methods == null) {

-			methods = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__METHODS);

-		}

-		return methods;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getPurpose() {

-		return purpose;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getStakeHolders() {

-		if (stakeHolders == null) {

-			stakeHolders = new EDataTypeEList<String>(String.class, this, ModelelementsPackage.VIEW_POINT__STAKE_HOLDERS);

-		}

-		return stakeHolders;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, ModelelementsPackage.VIEW_POINT__BASE_CLASS, oldBase_Class, base_Class));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setPurpose(String newPurpose) {

-		String oldPurpose = purpose;

-		purpose = newPurpose;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ModelelementsPackage.VIEW_POINT__PURPOSE, oldPurpose, purpose));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (stakeHolders: ");

-		result.append(stakeHolders);

-		result.append(", purpose: ");

-		result.append(purpose);

-		result.append(", concerns: ");

-		result.append(concerns);

-		result.append(", languages: ");

-		result.append(languages);

-		result.append(", methods: ");

-		result.append(methods);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ViewPointImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsAdapterFactory.java
deleted file mode 100644
index db3de31f6d9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsAdapterFactory.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.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.sysml.modelelements.Conform;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.Problem;

-import org.eclipse.papyrus.sysml.modelelements.Rationale;

-import org.eclipse.papyrus.sysml.modelelements.View;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-

-/**

- * <!-- 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.sysml.modelelements.ModelelementsPackage

- * @generated

- */

-public class ModelelementsAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ModelelementsPackage modelPackage;

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ModelelementsSwitch<Adapter> modelSwitch = new ModelelementsSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseConform(Conform object) {

-			return createConformAdapter();

-		}

-

-		@Override

-		public Adapter caseView(View object) {

-			return createViewAdapter();

-		}

-

-		@Override

-		public Adapter caseViewPoint(ViewPoint object) {

-			return createViewPointAdapter();

-		}

-

-		@Override

-		public Adapter caseRationale(Rationale object) {

-			return createRationaleAdapter();

-		}

-

-		@Override

-		public Adapter caseProblem(Problem object) {

-			return createProblemAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ModelelementsPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * 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.sysml.modelelements.Conform <em>Conform</em>}'.

-	 * <!-- begin-user-doc

-	 * --> This default implementation returns null so

-	 * that we can easily ignore cases; it's useful to ignore a case when

-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.modelelements.Conform

-	 * @generated

-	 */

-	public Adapter createConformAdapter() {

-		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;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.modelelements.Problem <em>Problem</em>}'.

-	 * <!-- begin-user-doc

-	 * --> This default implementation returns null so

-	 * that we can easily ignore cases; it's useful to ignore a case when

-	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.modelelements.Problem

-	 * @generated

-	 */

-	public Adapter createProblemAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.modelelements.Rationale

-	 * <em>Rationale</em>}'. <!-- begin-user-doc --> This default implementation

-	 * returns null so that we can easily ignore cases; it's useful to ignore a

-	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.modelelements.Rationale

-	 * @generated

-	 */

-	public Adapter createRationaleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.modelelements.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.papyrus.sysml.modelelements.View

-	 * @generated

-	 */

-	public Adapter createViewAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.modelelements.ViewPoint <em>View Point</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.modelelements.ViewPoint

-	 * @generated

-	 */

-	public Adapter createViewPointAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // ModelelementsAdapterFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceFactoryImpl.java
deleted file mode 100644
index b6c4b0176fa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.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.sysml.modelelements.util.ModelelementsResourceImpl

- * @generated

- */

-public class ModelelementsResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new ModelelementsResourceImpl(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;

-	}

-

-} // ModelelementsResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceImpl.java
deleted file mode 100644
index c2aa7e2addc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.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.sysml.modelelements.util.ModelelementsResourceFactoryImpl

- * @generated

- */

-public class ModelelementsResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public ModelelementsResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // ModelelementsResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsSwitch.java
deleted file mode 100644
index 96d7f1e23c0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsSwitch.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.sysml.modelelements.Conform;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.Problem;

-import org.eclipse.papyrus.sysml.modelelements.Rationale;

-import org.eclipse.papyrus.sysml.modelelements.View;

-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

-

-/**

- * <!-- 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.sysml.modelelements.ModelelementsPackage

- * @generated

- */

-public class ModelelementsSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ModelelementsPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ModelelementsPackage.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;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Conform</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Conform</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConform(Conform object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Problem</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Problem</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseProblem(Problem object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Rationale</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Rationale</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseRationale(Rationale 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>View Point</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate 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 Point</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseViewPoint(ViewPoint 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;

-	}

-

-	/**

-	 * 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 ModelelementsPackage.CONFORM: {

-			Conform conform = (Conform) theEObject;

-			T result = caseConform(conform);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ModelelementsPackage.VIEW: {

-			View view = (View) theEObject;

-			T result = caseView(view);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ModelelementsPackage.VIEW_POINT: {

-			ViewPoint viewPoint = (ViewPoint) theEObject;

-			T result = caseViewPoint(viewPoint);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ModelelementsPackage.RATIONALE: {

-			Rationale rationale = (Rationale) theEObject;

-			T result = caseRationale(rationale);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ModelelementsPackage.PROBLEM: {

-			Problem problem = (Problem) theEObject;

-			T result = caseProblem(problem);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-} // ModelelementsSwitch

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsXMLProcessor.java
deleted file mode 100644
index c16786068d9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/modelelements/util/ModelelementsXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.modelelements.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.sysml.modelelements.ModelelementsPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class ModelelementsXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelelementsXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		ModelelementsPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the ModelelementsResourceFactoryImpl 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 ModelelementsResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new ModelelementsResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // ModelelementsXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowDirection.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowDirection.java
deleted file mode 100644
index 2d76ba31686..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowDirection.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows;

-

-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>Flow Direction</b></em>', and utility methods for working with

- * them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowDirection()

- * @model

- * @generated

- */

-public enum FlowDirection implements Enumerator {

-	/**

-	 * The '<em><b>In</b></em>' literal object.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #IN_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	IN(0, "in", "in"),

-

-	/**

-	 * The '<em><b>Out</b></em>' literal object.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #OUT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	OUT(1, "out", "out"),

-

-	/**

-	 * The '<em><b>Inout</b></em>' literal object.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #INOUT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	INOUT(2, "inout", "inout");

-

-	/**

-	 * The '<em><b>In</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int IN_VALUE = 0;

-

-	/**

-	 * The '<em><b>Out</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * 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

-	 * @ordered

-	 */

-	public static final int OUT_VALUE = 1;

-

-	/**

-	 * The '<em><b>Inout</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Inout</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #INOUT

-	 * @model name="inout"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int INOUT_VALUE = 2;

-

-	/**

-	 * An array of all the '<em><b>Flow Direction</b></em>' enumerators. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final FlowDirection[] VALUES_ARRAY = new FlowDirection[] { IN, OUT, INOUT, };

-

-	/**

-	 * A public read-only list of all the '<em><b>Flow Direction</b></em>' enumerators.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<FlowDirection> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Flow Direction</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static FlowDirection get(int value) {

-		switch (value) {

-		case IN_VALUE:

-			return IN;

-		case OUT_VALUE:

-			return OUT;

-		case INOUT_VALUE:

-			return INOUT;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Flow Direction</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static FlowDirection get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			FlowDirection result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Flow Direction</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static FlowDirection getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			FlowDirection result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		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 FlowDirection(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getLiteral() {

-		return literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public int getValue() {

-		return value;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // FlowDirection

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowPort.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowPort.java
deleted file mode 100644
index 7b4591eef14..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowPort.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Image;

-import org.eclipse.uml2.uml.Port;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Flow Port</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getBase_Port <em>Base Port</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic <em>Is Atomic</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isConjugated <em>Is Conjugated</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection <em>Direction</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort()

- * @model

- * @generated

- */

-public interface FlowPort 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.sysml.portandflows.PortandflowsPackage#getFlowPort_Base_Port()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Port getBase_Port();

-

-	/**

-	 * Returns the value of the '<em><b>Direction</b></em>' attribute.

-	 * The default value is <code>"inout"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.sysml.portandflows.FlowDirection}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Direction</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Direction</em>' attribute.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

-	 * @see #setDirection(FlowDirection)

-	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort_Direction()

-	 * @model default="inout" unique="false" required="true" ordered="false"

-	 * @generated

-	 */

-	FlowDirection getDirection();

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @model kind="operation" required="true" ordered="false"

-	 * @generated

-	 */

-	Image getIcon();

-

-	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowPort#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 Atomic</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Is Atomic</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 Atomic</em>' attribute.

-	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort_IsAtomic()

-	 * @model default="false" unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" transient="true" changeable="false"

-	 *        volatile="true" derived="true" ordered="false"

-	 * @generated

-	 */

-	boolean isAtomic();

-

-	/**

-	 * Returns the value of the '<em><b>Is Conjugated</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Is Conjugated</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 Conjugated</em>' attribute.

-	 * @see #setIsConjugated(boolean)

-	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowPort_IsConjugated()

-	 * @model unique="false" dataType="org.eclipse.uml2.types.Boolean" ordered="false"

-	 * @generated

-	 */

-	boolean isConjugated();

-

-	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection

-	 * <em>Direction</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Direction</em>' attribute.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

-	 * @see #getDirection()

-	 * @generated

-	 */

-	void setDirection(FlowDirection value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isConjugated <em>Is Conjugated</em>}' attribute.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Is Conjugated</em>' attribute.

-	 * @see #isConjugated()

-	 * @generated

-	 */

-	void setIsConjugated(boolean value);

-

-} // FlowPort

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowProperty.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowProperty.java
deleted file mode 100644
index 84d7aec942b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowProperty.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Image;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Flow Property</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getBase_Property <em>Base Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection <em>Direction</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowProperty()

- * @model

- * @generated

- */

-public interface FlowProperty 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.sysml.portandflows.PortandflowsPackage#getFlowProperty_Base_Property()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Property getBase_Property();

-

-	/**

-	 * Returns the value of the '<em><b>Direction</b></em>' attribute.

-	 * The default value is <code>"inout"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.sysml.portandflows.FlowDirection}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Direction</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Direction</em>' attribute.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

-	 * @see #setDirection(FlowDirection)

-	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowProperty_Direction()

-	 * @model default="inout" unique="false" required="true" ordered="false"

-	 * @generated

-	 */

-	FlowDirection getDirection();

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @model kind="operation" required="true" ordered="false"

-	 * @generated

-	 */

-	Image getIcon();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#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);

-

-	/**

-	 * Sets the value of the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection

-	 * <em>Direction</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Direction</em>' attribute.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

-	 * @see #getDirection()

-	 * @generated

-	 */

-	void setDirection(FlowDirection value);

-

-} // FlowProperty

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowSpecification.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowSpecification.java
deleted file mode 100644
index 1981161ce02..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/FlowSpecification.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Interface;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Flow Specification</b></em> '. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification#getBase_Interface <em>Base Interface</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getFlowSpecification()

- * @model

- * @generated

- */

-public interface FlowSpecification extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Interface</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * 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.sysml.portandflows.PortandflowsPackage#getFlowSpecification_Base_Interface()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Interface getBase_Interface();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification#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()

-	 * @generated

-	 */

-	void setBase_Interface(Interface value);

-

-} // FlowSpecification

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/ItemFlow.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/ItemFlow.java
deleted file mode 100644
index 57f95deb6fc..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/ItemFlow.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.InformationFlow;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Item Flow</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getBase_InformationFlow <em>Base Information Flow</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty <em>Item Property</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getItemFlow()

- * @model

- * @generated

- */

-public interface ItemFlow extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Information Flow</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Information Flow</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 Information Flow</em>' reference.

-	 * @see #setBase_InformationFlow(InformationFlow)

-	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getItemFlow_Base_InformationFlow()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	InformationFlow getBase_InformationFlow();

-

-	/**

-	 * Returns the value of the '<em><b>Item Property</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Item 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>Item Property</em>' reference.

-	 * @see #setItemProperty(Property)

-	 * @see org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage#getItemFlow_ItemProperty()

-	 * @model ordered="false"

-	 * @generated

-	 */

-	Property getItemProperty();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getBase_InformationFlow <em>Base Information Flow</em>}'

-	 * reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Information Flow</em>' reference.

-	 * @see #getBase_InformationFlow()

-	 * @generated

-	 */

-	void setBase_InformationFlow(InformationFlow value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty <em>Item Property</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Item Property</em>' reference.

-	 * @see #getItemProperty()

-	 * @generated

-	 */

-	void setItemProperty(Property value);

-

-} // ItemFlow

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsFactory.java
deleted file mode 100644
index 1e5bd0e8f54..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows;

-

-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.sysml.portandflows.PortandflowsPackage

- * @generated

- */

-public interface PortandflowsFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	PortandflowsFactory eINSTANCE = org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Flow Port</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Flow Port</em>'.

-	 * @generated

-	 */

-	FlowPort createFlowPort();

-

-	/**

-	 * Returns a new object of class '<em>Flow Property</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Flow Property</em>'.

-	 * @generated

-	 */

-	FlowProperty createFlowProperty();

-

-	/**

-	 * Returns a new object of class '<em>Flow Specification</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Flow Specification</em>'.

-	 * @generated

-	 */

-	FlowSpecification createFlowSpecification();

-

-	/**

-	 * Returns a new object of class '<em>Item Flow</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Item Flow</em>'.

-	 * @generated

-	 */

-	ItemFlow createItemFlow();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	PortandflowsPackage getPortandflowsPackage();

-

-} // PortandflowsFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsPackage.java
deleted file mode 100644
index 74bb4c28ec0..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/PortandflowsPackage.java
+++ /dev/null
@@ -1,652 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows;

-

-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;

-

-/**

- * <!-- 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.sysml.portandflows.PortandflowsFactory

- * @model kind="package"

- * @generated

- */

-public interface PortandflowsPackage extends EPackage {

-

-	/**

-	 * <!-- 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.sysml.portandflows.internal.impl.FlowPortImpl

-		 * <em>Flow Port</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowPort()

-		 * @generated

-		 */

-		EClass FLOW_PORT = eINSTANCE.getFlowPort();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Port</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FLOW_PORT__BASE_PORT = eINSTANCE.getFlowPort_Base_Port();

-

-		/**

-		 * The meta object literal for the '<em><b>Is Atomic</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FLOW_PORT__IS_ATOMIC = eINSTANCE.getFlowPort_IsAtomic();

-

-		/**

-		 * The meta object literal for the '<em><b>Is Conjugated</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FLOW_PORT__IS_CONJUGATED = eINSTANCE.getFlowPort_IsConjugated();

-

-		/**

-		 * The meta object literal for the '<em><b>Direction</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FLOW_PORT__DIRECTION = eINSTANCE.getFlowPort_Direction();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Icon</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EOperation FLOW_PORT___GET_ICON = eINSTANCE.getFlowPort__GetIcon();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl <em>Flow Property</em>}'

-		 * class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowProperty()

-		 * @generated

-		 */

-		EClass FLOW_PROPERTY = eINSTANCE.getFlowProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FLOW_PROPERTY__BASE_PROPERTY = eINSTANCE.getFlowProperty_Base_Property();

-

-		/**

-		 * The meta object literal for the '<em><b>Direction</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FLOW_PROPERTY__DIRECTION = eINSTANCE.getFlowProperty_Direction();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Icon</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EOperation FLOW_PROPERTY___GET_ICON = eINSTANCE.getFlowProperty__GetIcon();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl

-		 * <em>Flow Specification</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowSpecification()

-		 * @generated

-		 */

-		EClass FLOW_SPECIFICATION = eINSTANCE.getFlowSpecification();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Interface</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FLOW_SPECIFICATION__BASE_INTERFACE = eINSTANCE.getFlowSpecification_Base_Interface();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl

-		 * <em>Item Flow</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getItemFlow()

-		 * @generated

-		 */

-		EClass ITEM_FLOW = eINSTANCE.getItemFlow();

-

-		/**

-		 * The meta object literal for the ' <em><b>Base Information Flow</b></em>' reference feature. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ITEM_FLOW__BASE_INFORMATION_FLOW = eINSTANCE.getItemFlow_Base_InformationFlow();

-

-		/**

-		 * The meta object literal for the '<em><b>Item Property</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ITEM_FLOW__ITEM_PROPERTY = eINSTANCE.getItemFlow_ItemProperty();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.portandflows.FlowDirection <em>Flow Direction</em>}' enum.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

-		 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowDirection()

-		 * @generated

-		 */

-		EEnum FLOW_DIRECTION = eINSTANCE.getFlowDirection();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "portandflows";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "PortAndFlows";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	PortandflowsPackage eINSTANCE = org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl <em>Flow Port</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowPort()

-	 * @generated

-	 */

-	int FLOW_PORT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Port</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PORT__BASE_PORT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Is Atomic</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PORT__IS_ATOMIC = 1;

-

-	/**

-	 * The feature id for the '<em><b>Is Conjugated</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PORT__IS_CONJUGATED = 2;

-

-	/**

-	 * The feature id for the '<em><b>Direction</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PORT__DIRECTION = 3;

-

-	/**

-	 * The number of structural features of the '<em>Flow Port</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PORT_FEATURE_COUNT = 4;

-

-	/**

-	 * The operation id for the '<em>Get Icon</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PORT___GET_ICON = 0;

-

-	/**

-	 * The number of operations of the '<em>Flow Port</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PORT_OPERATION_COUNT = 1;

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl

-	 * <em>Flow Property</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowProperty()

-	 * @generated

-	 */

-	int FLOW_PROPERTY = 1;

-

-	/**

-	 * The feature id for the '<em><b>Base Property</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PROPERTY__BASE_PROPERTY = 0;

-

-	/**

-	 * The feature id for the '<em><b>Direction</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PROPERTY__DIRECTION = 1;

-

-	/**

-	 * The number of structural features of the '<em>Flow Property</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PROPERTY_FEATURE_COUNT = 2;

-

-	/**

-	 * The operation id for the '<em>Get Icon</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PROPERTY___GET_ICON = 0;

-

-	/**

-	 * The number of operations of the '<em>Flow Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_PROPERTY_OPERATION_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl <em>Flow Specification</em>}'

-	 * class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowSpecification()

-	 * @generated

-	 */

-	int FLOW_SPECIFICATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Base Interface</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_SPECIFICATION__BASE_INTERFACE = 0;

-

-	/**

-	 * The number of structural features of the '<em>Flow Specification</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_SPECIFICATION_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Flow Specification</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FLOW_SPECIFICATION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl <em>Item Flow</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getItemFlow()

-	 * @generated

-	 */

-	int ITEM_FLOW = 3;

-

-	/**

-	 * The feature id for the '<em><b>Base Information Flow</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ITEM_FLOW__BASE_INFORMATION_FLOW = 0;

-

-	/**

-	 * The feature id for the '<em><b>Item Property</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ITEM_FLOW__ITEM_PROPERTY = 1;

-

-	/**

-	 * The number of structural features of the '<em>Item Flow</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ITEM_FLOW_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Item Flow</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ITEM_FLOW_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.portandflows.FlowDirection

-	 * <em>Flow Direction</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

-	 * @see org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl#getFlowDirection()

-	 * @generated

-	 */

-	int FLOW_DIRECTION = 4;

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.sysml.portandflows.FlowDirection <em>Flow Direction</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for enum '<em>Flow Direction</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowDirection

-	 * @generated

-	 */

-	EEnum getFlowDirection();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort <em>Flow Port</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Flow Port</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort

-	 * @generated

-	 */

-	EClass getFlowPort();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#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.sysml.portandflows.FlowPort#getBase_Port()

-	 * @see #getFlowPort()

-	 * @generated

-	 */

-	EReference getFlowPort_Base_Port();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection <em>Direction</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Direction</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#getDirection()

-	 * @see #getFlowPort()

-	 * @generated

-	 */

-	EAttribute getFlowPort_Direction();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon() <em>Get Icon</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the '<em>Get Icon</em>' operation.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon()

-	 * @generated

-	 */

-	EOperation getFlowPort__GetIcon();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic <em>Is Atomic</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Is Atomic</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic()

-	 * @see #getFlowPort()

-	 * @generated

-	 */

-	EAttribute getFlowPort_IsAtomic();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isConjugated <em>Is Conjugated</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Is Conjugated</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#isConjugated()

-	 * @see #getFlowPort()

-	 * @generated

-	 */

-	EAttribute getFlowPort_IsConjugated();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty <em>Flow Property</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Flow Property</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty

-	 * @generated

-	 */

-	EClass getFlowProperty();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#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.sysml.portandflows.FlowProperty#getBase_Property()

-	 * @see #getFlowProperty()

-	 * @generated

-	 */

-	EReference getFlowProperty_Base_Property();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection <em>Direction</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Direction</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty#getDirection()

-	 * @see #getFlowProperty()

-	 * @generated

-	 */

-	EAttribute getFlowProperty_Direction();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon() <em>Get Icon</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the '<em>Get Icon</em>' operation.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon()

-	 * @generated

-	 */

-	EOperation getFlowProperty__GetIcon();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification

-	 * <em>Flow Specification</em>} '. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for class '<em>Flow Specification</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowSpecification

-	 * @generated

-	 */

-	EClass getFlowSpecification();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification#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.sysml.portandflows.FlowSpecification#getBase_Interface()

-	 * @see #getFlowSpecification()

-	 * @generated

-	 */

-	EReference getFlowSpecification_Base_Interface();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow <em>Item Flow</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Item Flow</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow

-	 * @generated

-	 */

-	EClass getItemFlow();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getBase_InformationFlow

-	 * <em>Base Information Flow</em>}'.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Information Flow</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow#getBase_InformationFlow()

-	 * @see #getItemFlow()

-	 * @generated

-	 */

-	EReference getItemFlow_Base_InformationFlow();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty <em>Item Property</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Item Property</em>'.

-	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow#getItemProperty()

-	 * @see #getItemFlow()

-	 * @generated

-	 */

-	EReference getItemFlow_ItemProperty();

-

-	/**

-	 * 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

-	 */

-	PortandflowsFactory getPortandflowsFactory();

-

-} // PortandflowsPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPortImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPortImpl.java
deleted file mode 100644
index a3d774957b9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPortImpl.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.internal.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.uml2.uml.Image;

-import org.eclipse.uml2.uml.Interface;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Flow Port</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl#getBase_Port <em>Base Port</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl#isAtomic <em>Is Atomic</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl#isConjugated <em>Is Conjugated</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPortImpl#getDirection <em>Direction</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FlowPortImpl extends MinimalEObjectImpl.Container implements FlowPort {

-

-	/**

-	 * 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 #isAtomic() <em>Is Atomic</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #isAtomic()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IS_ATOMIC_EDEFAULT = false;

-

-	/**

-	 * The default value of the '{@link #isConjugated() <em>Is Conjugated</em>}' attribute.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #isConjugated()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IS_CONJUGATED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isConjugated() <em>Is Conjugated</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #isConjugated()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean isConjugated = IS_CONJUGATED_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getDirection() <em>Direction</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getDirection()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final FlowDirection DIRECTION_EDEFAULT = FlowDirection.INOUT;

-

-	/**

-	 * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getDirection()

-	 * @generated

-	 * @ordered

-	 */

-	protected FlowDirection direction = DIRECTION_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FlowPortImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Port basicGetBase_Port() {

-		return base_Port;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

-			if (resolve) {

-				return getBase_Port();

-			}

-			return basicGetBase_Port();

-		case PortandflowsPackage.FLOW_PORT__IS_ATOMIC:

-			return isAtomic();

-		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

-			return isConjugated();

-		case PortandflowsPackage.FLOW_PORT__DIRECTION:

-			return getDirection();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

-			return base_Port != null;

-		case PortandflowsPackage.FLOW_PORT__IS_ATOMIC:

-			return isAtomic() != IS_ATOMIC_EDEFAULT;

-		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

-			return isConjugated != IS_CONJUGATED_EDEFAULT;

-		case PortandflowsPackage.FLOW_PORT__DIRECTION:

-			return direction != DIRECTION_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case PortandflowsPackage.FLOW_PORT___GET_ICON:

-			return getIcon();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

-			setBase_Port((Port) newValue);

-			return;

-		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

-			setIsConjugated((Boolean) newValue);

-			return;

-		case PortandflowsPackage.FLOW_PORT__DIRECTION:

-			setDirection((FlowDirection) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return PortandflowsPackage.Literals.FLOW_PORT;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PORT__BASE_PORT:

-			setBase_Port((Port) null);

-			return;

-		case PortandflowsPackage.FLOW_PORT__IS_CONJUGATED:

-			setIsConjugated(IS_CONJUGATED_EDEFAULT);

-			return;

-		case PortandflowsPackage.FLOW_PORT__DIRECTION:

-			setDirection(DIRECTION_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, PortandflowsPackage.FLOW_PORT__BASE_PORT, oldBase_Port, base_Port));

-				}

-			}

-		}

-		return base_Port;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowDirection getDirection() {

-		return direction;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> Images registered in Profile are : 0 - FlowPort

-	 * (default, similar to INOUT) 1 - FlowPort IN 2 - FlowPort OUT 3 - FlowPort

-	 * INOUT 4 - FlowPort NA (Non Atomic) <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public Image getIcon() {

-

-		Image ImageNotFound = null;

-

-		if (getBase_Port() != null) {

-

-			Stereotype st = UMLUtil.getStereotype(this);

-

-			Image image = st.getIcons().get(0);

-

-			if (isAtomic()) {

-				if (getDirection() == FlowDirection.IN) {

-					image = st.getIcons().get(1);

-				} else if (getDirection() == FlowDirection.OUT) {

-					image = st.getIcons().get(2);

-				} else if (getDirection() == FlowDirection.INOUT) {

-					image = st.getIcons().get(3);

-				}

-

-			} else {

-				image = st.getIcons().get(4);

-			}

-

-			return image;

-

-		} else {

-			return ImageNotFound;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Port(Port newBase_Port) {

-		Port oldBase_Port = base_Port;

-		base_Port = newBase_Port;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PORT__BASE_PORT, oldBase_Port, base_Port));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public boolean isAtomic() {

-		// The FlowPort is Atomic if it is not typed by a FlowSpecification

-		Boolean isAtomic = true;

-		FlowSpecification flowSpec = null;

-

-		if (getBase_Port() != null) {

-			// Find FlowPort type

-			Type type = getBase_Port().getType();

-			if ((type != null) && (type instanceof Interface)) {

-				flowSpec = UMLUtil.getStereotypeApplication(type, FlowSpecification.class);

-			}

-

-			if (flowSpec != null) {

-				isAtomic = false;

-			}

-		}

-		return isAtomic;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isConjugated() {

-		return isConjugated;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDirection(FlowDirection newDirection) {

-		FlowDirection oldDirection = direction;

-		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PORT__DIRECTION, oldDirection, direction));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public void setIsAtomic(boolean newIsAtomic) {

-		// TODO: implement this method to set the 'Is Atomic' attribute

-		// Ensure that you remove @generated or mark it @generated NOT

-		// throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIsConjugated(boolean newIsConjugated) {

-		boolean oldIsConjugated = isConjugated;

-		isConjugated = newIsConjugated;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PORT__IS_CONJUGATED, oldIsConjugated, isConjugated));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (isConjugated: ");

-		result.append(isConjugated);

-		result.append(", direction: ");

-		result.append(direction);

-		result.append(')');

-		return result.toString();

-	}

-

-} // FlowPortImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPropertyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPropertyImpl.java
deleted file mode 100644
index 1aa4d7ad499..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowPropertyImpl.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.internal.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.uml2.uml.Image;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Flow Property</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl#getBase_Property <em>Base Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowPropertyImpl#getDirection <em>Direction</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FlowPropertyImpl extends MinimalEObjectImpl.Container implements FlowProperty {

-

-	/**

-	 * 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;

-

-	/**

-	 * The default value of the '{@link #getDirection() <em>Direction</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getDirection()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final FlowDirection DIRECTION_EDEFAULT = FlowDirection.INOUT;

-

-	/**

-	 * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getDirection()

-	 * @generated

-	 * @ordered

-	 */

-	protected FlowDirection direction = DIRECTION_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FlowPropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property basicGetBase_Property() {

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

-			if (resolve) {

-				return getBase_Property();

-			}

-			return basicGetBase_Property();

-		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

-			return getDirection();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

-			return base_Property != null;

-		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

-			return direction != DIRECTION_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-		case PortandflowsPackage.FLOW_PROPERTY___GET_ICON:

-			return getIcon();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) newValue);

-			return;

-		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

-			setDirection((FlowDirection) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return PortandflowsPackage.Literals.FLOW_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY:

-			setBase_Property((Property) null);

-			return;

-		case PortandflowsPackage.FLOW_PROPERTY__DIRECTION:

-			setDirection(DIRECTION_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-				}

-			}

-		}

-		return base_Property;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowDirection getDirection() {

-		return direction;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> Images registered in Profile are : 0 - FlowPort

-	 * (default, similar to INOUT) 1 - FlowPort IN 2 - FlowPort OUT 3 - FlowPort

-	 * INOUT <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public Image getIcon() {

-

-		Image ImageNotFound = null;

-

-		if (getBase_Property() != null) {

-			Stereotype st = UMLUtil.getStereotype(this);

-

-			Image image = st.getIcons().get(0);

-

-			if (getDirection() == FlowDirection.IN) {

-				image = st.getIcons().get(1);

-			} else if (getDirection() == FlowDirection.OUT) {

-				image = st.getIcons().get(2);

-			} else if (getDirection() == FlowDirection.INOUT) {

-				image = st.getIcons().get(3);

-			}

-

-			return image;

-

-		} else {

-			return ImageNotFound;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Property(Property newBase_Property) {

-		Property oldBase_Property = base_Property;

-		base_Property = newBase_Property;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDirection(FlowDirection newDirection) {

-		FlowDirection oldDirection = direction;

-		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_PROPERTY__DIRECTION, oldDirection, direction));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (direction: ");

-		result.append(direction);

-		result.append(')');

-		return result.toString();

-	}

-

-} // FlowPropertyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowSpecificationImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowSpecificationImpl.java
deleted file mode 100644
index 23c6ca60595..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/FlowSpecificationImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.internal.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.sysml.portandflows.FlowSpecification;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.uml2.uml.Interface;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Flow Specification</b></em> '. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.FlowSpecificationImpl#getBase_Interface <em>Base Interface</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FlowSpecificationImpl extends MinimalEObjectImpl.Container implements FlowSpecification {

-

-	/**

-	 * The cached value of the '{@link #getBase_Interface() <em>Base Interface</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Interface()

-	 * @generated

-	 * @ordered

-	 */

-	protected Interface base_Interface;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FlowSpecificationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Interface basicGetBase_Interface() {

-		return base_Interface;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

-			if (resolve) {

-				return getBase_Interface();

-			}

-			return basicGetBase_Interface();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

-			return base_Interface != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

-			setBase_Interface((Interface) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return PortandflowsPackage.Literals.FLOW_SPECIFICATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE:

-			setBase_Interface((Interface) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Interface getBase_Interface() {

-		if (base_Interface != null && base_Interface.eIsProxy()) {

-			InternalEObject oldBase_Interface = (InternalEObject) base_Interface;

-			base_Interface = (Interface) eResolveProxy(oldBase_Interface);

-			if (base_Interface != oldBase_Interface) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE, oldBase_Interface, base_Interface));

-				}

-			}

-		}

-		return base_Interface;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Interface(Interface newBase_Interface) {

-		Interface oldBase_Interface = base_Interface;

-		base_Interface = newBase_Interface;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.FLOW_SPECIFICATION__BASE_INTERFACE, oldBase_Interface, base_Interface));

-		}

-	}

-

-} // FlowSpecificationImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/ItemFlowImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/ItemFlowImpl.java
deleted file mode 100644
index 7e3c455b2e4..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/ItemFlowImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.internal.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.sysml.portandflows.ItemFlow;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.uml2.uml.InformationFlow;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Item Flow</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl#getBase_InformationFlow <em>Base Information Flow</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.portandflows.internal.impl.ItemFlowImpl#getItemProperty <em>Item Property</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ItemFlowImpl extends MinimalEObjectImpl.Container implements ItemFlow {

-

-	/**

-	 * The cached value of the '{@link #getBase_InformationFlow() <em>Base Information Flow</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_InformationFlow()

-	 * @generated

-	 * @ordered

-	 */

-	protected InformationFlow base_InformationFlow;

-

-	/**

-	 * The cached value of the '{@link #getItemProperty() <em>Item Property</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getItemProperty()

-	 * @generated

-	 * @ordered

-	 */

-	protected Property itemProperty;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ItemFlowImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InformationFlow basicGetBase_InformationFlow() {

-		return base_InformationFlow;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property basicGetItemProperty() {

-		return itemProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

-			if (resolve) {

-				return getBase_InformationFlow();

-			}

-			return basicGetBase_InformationFlow();

-		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

-			if (resolve) {

-				return getItemProperty();

-			}

-			return basicGetItemProperty();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

-			return base_InformationFlow != null;

-		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

-			return itemProperty != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

-			setBase_InformationFlow((InformationFlow) newValue);

-			return;

-		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

-			setItemProperty((Property) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return PortandflowsPackage.Literals.ITEM_FLOW;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW:

-			setBase_InformationFlow((InformationFlow) null);

-			return;

-		case PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY:

-			setItemProperty((Property) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InformationFlow getBase_InformationFlow() {

-		if (base_InformationFlow != null && base_InformationFlow.eIsProxy()) {

-			InternalEObject oldBase_InformationFlow = (InternalEObject) base_InformationFlow;

-			base_InformationFlow = (InformationFlow) eResolveProxy(oldBase_InformationFlow);

-			if (base_InformationFlow != oldBase_InformationFlow) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW, oldBase_InformationFlow, base_InformationFlow));

-				}

-			}

-		}

-		return base_InformationFlow;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Property getItemProperty() {

-		if (itemProperty != null && itemProperty.eIsProxy()) {

-			InternalEObject oldItemProperty = (InternalEObject) itemProperty;

-			itemProperty = (Property) eResolveProxy(oldItemProperty);

-			if (itemProperty != oldItemProperty) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY, oldItemProperty, itemProperty));

-				}

-			}

-		}

-		return itemProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_InformationFlow(InformationFlow newBase_InformationFlow) {

-		InformationFlow oldBase_InformationFlow = base_InformationFlow;

-		base_InformationFlow = newBase_InformationFlow;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.ITEM_FLOW__BASE_INFORMATION_FLOW, oldBase_InformationFlow, base_InformationFlow));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setItemProperty(Property newItemProperty) {

-		Property oldItemProperty = itemProperty;

-		itemProperty = newItemProperty;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, PortandflowsPackage.ITEM_FLOW__ITEM_PROPERTY, oldItemProperty, itemProperty));

-		}

-	}

-

-} // ItemFlowImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsFactoryImpl.java
deleted file mode 100644
index 0c1fc984331..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsFactoryImpl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.internal.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.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;

-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;

-import org.eclipse.papyrus.sysml.portandflows.ItemFlow;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsFactory;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class PortandflowsFactoryImpl extends EFactoryImpl implements PortandflowsFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static PortandflowsPackage getPackage() {

-		return PortandflowsPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static PortandflowsFactory init() {

-		try {

-			PortandflowsFactory thePortandflowsFactory = (PortandflowsFactory) EPackage.Registry.INSTANCE.getEFactory(PortandflowsPackage.eNS_URI);

-			if (thePortandflowsFactory != null) {

-				return thePortandflowsFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new PortandflowsFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertFlowDirectionToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case PortandflowsPackage.FLOW_DIRECTION:

-			return convertFlowDirectionToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case PortandflowsPackage.FLOW_PORT:

-			return createFlowPort();

-		case PortandflowsPackage.FLOW_PROPERTY:

-			return createFlowProperty();

-		case PortandflowsPackage.FLOW_SPECIFICATION:

-			return createFlowSpecification();

-		case PortandflowsPackage.ITEM_FLOW:

-			return createItemFlow();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowDirection createFlowDirectionFromString(EDataType eDataType, String initialValue) {

-		FlowDirection result = FlowDirection.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 FlowPort createFlowPort() {

-		FlowPortImpl flowPort = new FlowPortImpl();

-		return flowPort;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowProperty createFlowProperty() {

-		FlowPropertyImpl flowProperty = new FlowPropertyImpl();

-		return flowProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FlowSpecification createFlowSpecification() {

-		FlowSpecificationImpl flowSpecification = new FlowSpecificationImpl();

-		return flowSpecification;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case PortandflowsPackage.FLOW_DIRECTION:

-			return createFlowDirectionFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ItemFlow createItemFlow() {

-		ItemFlowImpl itemFlow = new ItemFlowImpl();

-		return itemFlow;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsPackage getPortandflowsPackage() {

-		return (PortandflowsPackage) getEPackage();

-	}

-

-} // PortandflowsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsPackageImpl.java
deleted file mode 100644
index 19044518771..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/internal/impl/PortandflowsPackageImpl.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.internal.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;

-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;

-import org.eclipse.papyrus.sysml.portandflows.ItemFlow;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsFactory;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class PortandflowsPackageImpl extends EPackageImpl implements PortandflowsPackage {

-

-	/**

-	 * <!-- 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 PortandflowsPackage#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 PortandflowsPackage init() {

-		if (isInited) {

-			return (PortandflowsPackage) EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PortandflowsPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		thePortandflowsPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		thePortandflowsPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		thePortandflowsPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(PortandflowsPackage.eNS_URI, thePortandflowsPackage);

-		return thePortandflowsPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass flowPortEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass flowPropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass flowSpecificationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass itemFlowEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EEnum flowDirectionEEnum = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.portandflows.PortandflowsPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private PortandflowsPackageImpl() {

-		super(eNS_URI, PortandflowsFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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

-		flowPortEClass = createEClass(FLOW_PORT);

-		createEReference(flowPortEClass, FLOW_PORT__BASE_PORT);

-		createEAttribute(flowPortEClass, FLOW_PORT__IS_ATOMIC);

-		createEAttribute(flowPortEClass, FLOW_PORT__IS_CONJUGATED);

-		createEAttribute(flowPortEClass, FLOW_PORT__DIRECTION);

-		createEOperation(flowPortEClass, FLOW_PORT___GET_ICON);

-

-		flowPropertyEClass = createEClass(FLOW_PROPERTY);

-		createEReference(flowPropertyEClass, FLOW_PROPERTY__BASE_PROPERTY);

-		createEAttribute(flowPropertyEClass, FLOW_PROPERTY__DIRECTION);

-		createEOperation(flowPropertyEClass, FLOW_PROPERTY___GET_ICON);

-

-		flowSpecificationEClass = createEClass(FLOW_SPECIFICATION);

-		createEReference(flowSpecificationEClass, FLOW_SPECIFICATION__BASE_INTERFACE);

-

-		itemFlowEClass = createEClass(ITEM_FLOW);

-		createEReference(itemFlowEClass, ITEM_FLOW__BASE_INFORMATION_FLOW);

-		createEReference(itemFlowEClass, ITEM_FLOW__ITEM_PROPERTY);

-

-		// Create enums

-		flowDirectionEEnum = createEEnum(FLOW_DIRECTION);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EEnum getFlowDirection() {

-		return flowDirectionEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getFlowPort() {

-		return flowPortEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getFlowPort_Base_Port() {

-		return (EReference) flowPortEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getFlowPort_Direction() {

-		return (EAttribute) flowPortEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EOperation getFlowPort__GetIcon() {

-		return flowPortEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getFlowPort_IsAtomic() {

-		return (EAttribute) flowPortEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getFlowPort_IsConjugated() {

-		return (EAttribute) flowPortEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getFlowProperty() {

-		return flowPropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getFlowProperty_Base_Property() {

-		return (EReference) flowPropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getFlowProperty_Direction() {

-		return (EAttribute) flowPropertyEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EOperation getFlowProperty__GetIcon() {

-		return flowPropertyEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getFlowSpecification() {

-		return flowSpecificationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getFlowSpecification_Base_Interface() {

-		return (EReference) flowSpecificationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getItemFlow() {

-		return itemFlowEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getItemFlow_Base_InformationFlow() {

-		return (EReference) itemFlowEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getItemFlow_ItemProperty() {

-		return (EReference) itemFlowEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsFactory getPortandflowsFactory() {

-		return (PortandflowsFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * 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);

-		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(flowPortEClass, FlowPort.class, "FlowPort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFlowPort_Base_Port(), theUMLPackage.getPort(), null, "base_Port", null, 1, 1, FlowPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getFlowPort_IsAtomic(), theTypesPackage.getBoolean(), "isAtomic", "false", 1, 1, FlowPort.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getFlowPort_IsConjugated(), theTypesPackage.getBoolean(), "isConjugated", null, 0, 1, FlowPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getFlowPort_Direction(), this.getFlowDirection(), "direction", "inout", 1, 1, FlowPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEOperation(getFlowPort__GetIcon(), theUMLPackage.getImage(), "getIcon", 1, 1, IS_UNIQUE, !IS_ORDERED);

-

-		initEClass(flowPropertyEClass, FlowProperty.class, "FlowProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFlowProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, FlowProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-		initEAttribute(getFlowProperty_Direction(), this.getFlowDirection(), "direction", "inout", 1, 1, FlowProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		initEOperation(getFlowProperty__GetIcon(), theUMLPackage.getImage(), "getIcon", 1, 1, IS_UNIQUE, !IS_ORDERED);

-

-		initEClass(flowSpecificationEClass, FlowSpecification.class, "FlowSpecification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFlowSpecification_Base_Interface(), theUMLPackage.getInterface(), null, "base_Interface", null, 1, 1, FlowSpecification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-

-		initEClass(itemFlowEClass, ItemFlow.class, "ItemFlow", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getItemFlow_Base_InformationFlow(), theUMLPackage.getInformationFlow(), null, "base_InformationFlow", null, 1, 1, ItemFlow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE,

-				!IS_DERIVED, !IS_ORDERED);

-		initEReference(getItemFlow_ItemProperty(), theUMLPackage.getProperty(), null, "itemProperty", null, 0, 1, ItemFlow.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(flowDirectionEEnum, FlowDirection.class, "FlowDirection");

-		addEEnumLiteral(flowDirectionEEnum, FlowDirection.IN);

-		addEEnumLiteral(flowDirectionEEnum, FlowDirection.OUT);

-		addEEnumLiteral(flowDirectionEEnum, FlowDirection.INOUT);

-	}

-

-} // PortandflowsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsAdapterFactory.java
deleted file mode 100644
index c9a78507dfb..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsAdapterFactory.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.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.sysml.portandflows.FlowPort;

-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;

-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;

-import org.eclipse.papyrus.sysml.portandflows.ItemFlow;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-

-/**

- * <!-- 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.sysml.portandflows.PortandflowsPackage

- * @generated

- */

-public class PortandflowsAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static PortandflowsPackage modelPackage;

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PortandflowsSwitch<Adapter> modelSwitch = new PortandflowsSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseFlowPort(FlowPort object) {

-			return createFlowPortAdapter();

-		}

-

-		@Override

-		public Adapter caseFlowProperty(FlowProperty object) {

-			return createFlowPropertyAdapter();

-		}

-

-		@Override

-		public Adapter caseFlowSpecification(FlowSpecification object) {

-			return createFlowSpecificationAdapter();

-		}

-

-		@Override

-		public Adapter caseItemFlow(ItemFlow object) {

-			return createItemFlowAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = PortandflowsPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * 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 the default case.

-	 * <!-- begin-user-doc --> This

-	 * default implementation returns null. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.portandflows.FlowPort

-	 * <em>Flow 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.sysml.portandflows.FlowPort

-	 * @generated

-	 */

-	public Adapter createFlowPortAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty <em>Flow Property</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty

-	 * @generated

-	 */

-	public Adapter createFlowPropertyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification <em>Flow Specification</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.portandflows.FlowSpecification

-	 * @generated

-	 */

-	public Adapter createFlowSpecificationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow

-	 * <em>Item Flow</em>}'. <!-- begin-user-doc --> This default implementation

-	 * returns null so that we can easily ignore cases; it's useful to ignore a

-	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.portandflows.ItemFlow

-	 * @generated

-	 */

-	public Adapter createItemFlowAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // PortandflowsAdapterFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceFactoryImpl.java
deleted file mode 100644
index 4c10fd326ff..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.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.sysml.portandflows.util.PortandflowsResourceImpl

- * @generated

- */

-public class PortandflowsResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new PortandflowsResourceImpl(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;

-	}

-

-} // PortandflowsResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceImpl.java
deleted file mode 100644
index 7014ac0ed82..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.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.sysml.portandflows.util.PortandflowsResourceFactoryImpl

- * @generated

- */

-public class PortandflowsResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public PortandflowsResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // PortandflowsResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsSwitch.java
deleted file mode 100644
index 5132c613247..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsSwitch.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;

-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;

-import org.eclipse.papyrus.sysml.portandflows.ItemFlow;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-

-/**

- * <!-- 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.sysml.portandflows.PortandflowsPackage

- * @generated

- */

-public class PortandflowsSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static PortandflowsPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsSwitch() {

-		if (modelPackage == null) {

-			modelPackage = PortandflowsPackage.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;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Flow 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>Flow Port</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFlowPort(FlowPort object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Flow Property</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Flow Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFlowProperty(FlowProperty object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Flow Specification</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Flow Specification</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFlowSpecification(FlowSpecification object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Item Flow</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Item Flow</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseItemFlow(ItemFlow 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;

-	}

-

-	/**

-	 * 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 PortandflowsPackage.FLOW_PORT: {

-			FlowPort flowPort = (FlowPort) theEObject;

-			T result = caseFlowPort(flowPort);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PortandflowsPackage.FLOW_PROPERTY: {

-			FlowProperty flowProperty = (FlowProperty) theEObject;

-			T result = caseFlowProperty(flowProperty);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PortandflowsPackage.FLOW_SPECIFICATION: {

-			FlowSpecification flowSpecification = (FlowSpecification) theEObject;

-			T result = caseFlowSpecification(flowSpecification);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case PortandflowsPackage.ITEM_FLOW: {

-			ItemFlow itemFlow = (ItemFlow) theEObject;

-			T result = caseItemFlow(itemFlow);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-} // PortandflowsSwitch

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsXMLProcessor.java
deleted file mode 100644
index 300ad7f3a1f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/portandflows/util/PortandflowsXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.portandflows.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.sysml.portandflows.PortandflowsPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class PortandflowsXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PortandflowsXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		PortandflowsPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the PortandflowsResourceFactoryImpl 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 PortandflowsResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new PortandflowsResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // PortandflowsXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Copy.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Copy.java
deleted file mode 100644
index 72f7a2ba3d8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Copy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Copy</b></em>'. <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getCopy()

- * @model

- * @generated

- */

-public interface Copy extends org.eclipse.uml2.uml.profile.standard.Trace {

-} // Copy

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/DeriveReqt.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/DeriveReqt.java
deleted file mode 100644
index 8c37f516933..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/DeriveReqt.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Derive Reqt</b></em>'. <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getDeriveReqt()

- * @model

- * @generated

- */

-public interface DeriveReqt extends org.eclipse.uml2.uml.profile.standard.Trace {

-} // DeriveReqt

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
deleted file mode 100644
index fa5c1acfd64..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Requirement.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Requirement</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getText <em>Text</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getId <em>Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived <em>Derived</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom <em>Derived From</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy <em>Satisfied By</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy <em>Refined By</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo <em>Traced To</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy <em>Verified By</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster <em>Master</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getBase_Class <em>Base Class</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement()

- * @model

- * @generated

- */

-public interface Requirement 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.sysml.requirements.RequirementsPackage#getRequirement_Base_Class()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	org.eclipse.uml2.uml.Class getBase_Class();

-

-	/**

-	 * Returns the value of the '<em><b>Derived</b></em>' reference list. The

-	 * list contents are of type {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Derived</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Derived</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Derived()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<Requirement> getDerived();

-

-	/**

-	 * Returns the value of the '<em><b>Derived From</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Derived From</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Derived From</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_DerivedFrom()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<Requirement> getDerivedFrom();

-

-	/**

-	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Id</em>' attribute.

-	 * @see #setId(String)

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Id()

-	 * @model unique="false" required="true" ordered="false"

-	 * @generated

-	 */

-	String getId();

-

-	/**

-	 * Returns the value of the '<em><b>Master</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Master</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Master</em>' reference.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Master()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	Requirement getMaster();

-

-	/**

-	 * Returns the value of the '<em><b>Refined By</b></em>' reference list. The

-	 * list contents are of type {@link org.eclipse.uml2.uml.NamedElement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Refined By</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Refined By</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_RefinedBy()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<NamedElement> getRefinedBy();

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Refined By</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getRefinedBy()

-	 * @generated

-	 */

-	NamedElement getRefinedBy(String name);

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Refined By</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @param ignoreCase

-	 *            Whether to ignore case in {@link java.lang.String} comparisons.

-	 * @param eClass

-	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getRefinedBy()

-	 * @generated

-	 */

-	NamedElement getRefinedBy(String name, boolean ignoreCase, EClass eClass);

-

-	/**

-	 * Returns the value of the '<em><b>Satisfied By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Satisfied By</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Satisfied By</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_SatisfiedBy()

-	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

-	 * @generated

-	 */

-	EList<NamedElement> getSatisfiedBy();

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Satisfied By</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getSatisfiedBy()

-	 * @generated

-	 */

-	NamedElement getSatisfiedBy(String name);

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Satisfied By</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @param ignoreCase

-	 *            Whether to ignore case in {@link java.lang.String} comparisons.

-	 * @param eClass

-	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getSatisfiedBy()

-	 * @generated

-	 */

-	NamedElement getSatisfiedBy(String name, boolean ignoreCase, EClass eClass);

-

-	/**

-	 * Returns the value of the '<em><b>Text</b></em>' attribute. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Text</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Text</em>' attribute.

-	 * @see #setText(String)

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_Text()

-	 * @model unique="false" required="true" ordered="false"

-	 * @generated

-	 */

-	String getText();

-

-	/**

-	 * Returns the value of the '<em><b>Traced To</b></em>' reference list. The

-	 * list contents are of type {@link org.eclipse.uml2.uml.NamedElement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Traced To</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Traced To</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_TracedTo()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<NamedElement> getTracedTo();

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Traced To</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getTracedTo()

-	 * @generated

-	 */

-	NamedElement getTracedTo(String name);

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Traced To</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @param ignoreCase

-	 *            Whether to ignore case in {@link java.lang.String} comparisons.

-	 * @param eClass

-	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getTracedTo()

-	 * @generated

-	 */

-	NamedElement getTracedTo(String name, boolean ignoreCase, EClass eClass);

-

-	/**

-	 * Returns the value of the '<em><b>Verified By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.uml2.uml.NamedElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Verified By</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Verified By</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirement_VerifiedBy()

-	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"

-	 * @generated

-	 */

-	EList<NamedElement> getVerifiedBy();

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Verified By</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getVerifiedBy()

-	 * @generated

-	 */

-	NamedElement getVerifiedBy(String name);

-

-	/**

-	 * Retrieves the first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>' from the '<em><b>Verified By</b></em>'

-	 * reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param name

-	 *            The '<em><b>Name</b></em>' of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @param ignoreCase

-	 *            Whether to ignore case in {@link java.lang.String} comparisons.

-	 * @param eClass

-	 *            The Ecore class of the {@link org.eclipse.uml2.uml.NamedElement} to retrieve, or <code>null</code>.

-	 * @return The first {@link org.eclipse.uml2.uml.NamedElement} with the specified '<em><b>Name</b></em>', or <code>null</code>.

-	 * @see #getVerifiedBy()

-	 * @generated

-	 */

-	NamedElement getVerifiedBy(String name, boolean ignoreCase, EClass eClass);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#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);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getId <em>Id</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Id</em>' attribute.

-	 * @see #getId()

-	 * @generated

-	 */

-	void setId(String value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getText <em>Text</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Text</em>' attribute.

-	 * @see #getText()

-	 * @generated

-	 */

-	void setText(String value);

-

-} // Requirement

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementRelated.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementRelated.java
deleted file mode 100644
index d52d8e7a083..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementRelated.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Requirement Related</b></em> '. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getBase_NamedElement <em>Base Named Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom <em>Traced From</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies <em>Satisfies</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines <em>Refines</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies <em>Verifies</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated()

- * @model

- * @generated

- */

-public interface RequirementRelated extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Named Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Named 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 Named Element</em>' reference.

-	 * @see #setBase_NamedElement(NamedElement)

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Base_NamedElement()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	NamedElement getBase_NamedElement();

-

-	/**

-	 * Returns the value of the '<em><b>Refines</b></em>' reference list. The

-	 * list contents are of type {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Refines</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Refines</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Refines()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<Requirement> getRefines();

-

-	/**

-	 * Returns the value of the '<em><b>Satisfies</b></em>' reference list. The

-	 * list contents are of type {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Satisfies</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Satisfies</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Satisfies()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<Requirement> getSatisfies();

-

-	/**

-	 * Returns the value of the '<em><b>Traced From</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Traced From</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Traced From</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_TracedFrom()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<Requirement> getTracedFrom();

-

-	/**

-	 * Returns the value of the '<em><b>Verifies</b></em>' reference list. The

-	 * list contents are of type {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Verifies</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Verifies</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getRequirementRelated_Verifies()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<Requirement> getVerifies();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getBase_NamedElement <em>Base Named Element</em>}'

-	 * reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Named Element</em>' reference.

-	 * @see #getBase_NamedElement()

-	 * @generated

-	 */

-	void setBase_NamedElement(NamedElement value);

-

-} // RequirementRelated

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsFactory.java
deleted file mode 100644
index 1e3b8f35e3e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsFactory.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-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.sysml.requirements.RequirementsPackage

- * @generated

- */

-public interface RequirementsFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	RequirementsFactory eINSTANCE = org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Copy</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Copy</em>'.

-	 * @generated

-	 */

-	Copy createCopy();

-

-	/**

-	 * Returns a new object of class '<em>Derive Reqt</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Derive Reqt</em>'.

-	 * @generated

-	 */

-	DeriveReqt createDeriveReqt();

-

-	/**

-	 * Returns a new object of class '<em>Requirement</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Requirement</em>'.

-	 * @generated

-	 */

-	Requirement createRequirement();

-

-	/**

-	 * Returns a new object of class '<em>Requirement Related</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Requirement Related</em>'.

-	 * @generated

-	 */

-	RequirementRelated createRequirementRelated();

-

-	/**

-	 * Returns a new object of class '<em>Satisfy</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Satisfy</em>'.

-	 * @generated

-	 */

-	Satisfy createSatisfy();

-

-	/**

-	 * Returns a new object of class '<em>Test Case</em>'.

-	 * <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Test Case</em>'.

-	 * @generated

-	 */

-	TestCase createTestCase();

-

-	/**

-	 * Returns a new object of class '<em>Verify</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Verify</em>'.

-	 * @generated

-	 */

-	Verify createVerify();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	RequirementsPackage getRequirementsPackage();

-

-} // RequirementsFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsPackage.java
deleted file mode 100644
index cbae5d0f77a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/RequirementsPackage.java
+++ /dev/null
@@ -1,996 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- 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.sysml.requirements.RequirementsFactory

- * @model kind="package"

- * @generated

- */

-public interface RequirementsPackage extends EPackage {

-

-	/**

-	 * <!-- 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.sysml.requirements.internal.impl.DeriveReqtImpl <em>Derive Reqt</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.DeriveReqtImpl

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getDeriveReqt()

-		 * @generated

-		 */

-		EClass DERIVE_REQT = eINSTANCE.getDeriveReqt();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl

-		 * <em>Verify</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getVerify()

-		 * @generated

-		 */

-		EClass VERIFY = eINSTANCE.getVerify();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl <em>Copy</em>}' class.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getCopy()

-		 * @generated

-		 */

-		EClass COPY = eINSTANCE.getCopy();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl

-		 * <em>Satisfy</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getSatisfy()

-		 * @generated

-		 */

-		EClass SATISFY = eINSTANCE.getSatisfy();

-

-		/**

-		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl

-		 * <em>Test Case</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-		 * -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getTestCase()

-		 * @generated

-		 */

-		EClass TEST_CASE = eINSTANCE.getTestCase();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Behavior</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference TEST_CASE__BASE_BEHAVIOR = eINSTANCE.getTestCase_Base_Behavior();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Operation</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference TEST_CASE__BASE_OPERATION = eINSTANCE.getTestCase_Base_Operation();

-

-		/**

-		 * The meta object literal for the '<em><b>Verifies</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference TEST_CASE__VERIFIES = eINSTANCE.getTestCase_Verifies();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl <em>Requirement</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirement()

-		 * @generated

-		 */

-		EClass REQUIREMENT = eINSTANCE.getRequirement();

-

-		/**

-		 * The meta object literal for the '<em><b>Text</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute REQUIREMENT__TEXT = eINSTANCE.getRequirement_Text();

-

-		/**

-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute REQUIREMENT__ID = eINSTANCE.getRequirement_Id();

-

-		/**

-		 * The meta object literal for the '<em><b>Derived</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__DERIVED = eINSTANCE.getRequirement_Derived();

-

-		/**

-		 * The meta object literal for the '<em><b>Derived From</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__DERIVED_FROM = eINSTANCE.getRequirement_DerivedFrom();

-

-		/**

-		 * The meta object literal for the '<em><b>Satisfied By</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__SATISFIED_BY = eINSTANCE.getRequirement_SatisfiedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Refined By</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__REFINED_BY = eINSTANCE.getRequirement_RefinedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Traced To</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__TRACED_TO = eINSTANCE.getRequirement_TracedTo();

-

-		/**

-		 * The meta object literal for the '<em><b>Verified By</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__VERIFIED_BY = eINSTANCE.getRequirement_VerifiedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Master</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__MASTER = eINSTANCE.getRequirement_Master();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT__BASE_CLASS = eINSTANCE.getRequirement_Base_Class();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl

-		 * <em>Requirement Related</em>}' class.

-		 * <!-- begin-user-doc --> <!--

-		 * end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl

-		 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirementRelated()

-		 * @generated

-		 */

-		EClass REQUIREMENT_RELATED = eINSTANCE.getRequirementRelated();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Named Element</b></em>' reference feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT_RELATED__BASE_NAMED_ELEMENT = eINSTANCE.getRequirementRelated_Base_NamedElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Traced From</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT_RELATED__TRACED_FROM = eINSTANCE.getRequirementRelated_TracedFrom();

-

-		/**

-		 * The meta object literal for the '<em><b>Satisfies</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT_RELATED__SATISFIES = eINSTANCE.getRequirementRelated_Satisfies();

-

-		/**

-		 * The meta object literal for the '<em><b>Refines</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT_RELATED__REFINES = eINSTANCE.getRequirementRelated_Refines();

-

-		/**

-		 * The meta object literal for the '<em><b>Verifies</b></em>' reference list feature.

-		 * <!-- begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REQUIREMENT_RELATED__VERIFIES = eINSTANCE.getRequirementRelated_Verifies();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "requirements";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "Requirements";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	RequirementsPackage eINSTANCE = org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl.init();

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.DeriveReqtImpl

-	 * <em>Derive Reqt</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.DeriveReqtImpl

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getDeriveReqt()

-	 * @generated

-	 */

-	int DERIVE_REQT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DERIVE_REQT__BASE_ABSTRACTION = StandardPackage.TRACE__BASE_ABSTRACTION;

-

-	/**

-	 * The number of structural features of the '<em>Derive Reqt</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DERIVE_REQT_FEATURE_COUNT = StandardPackage.TRACE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Derive Reqt</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DERIVE_REQT_OPERATION_COUNT = StandardPackage.TRACE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl <em>Verify</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.VerifyImpl

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getVerify()

-	 * @generated

-	 */

-	int VERIFY = 1;

-

-	/**

-	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VERIFY__BASE_ABSTRACTION = StandardPackage.TRACE__BASE_ABSTRACTION;

-

-	/**

-	 * The number of structural features of the '<em>Verify</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VERIFY_FEATURE_COUNT = StandardPackage.TRACE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Verify</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VERIFY_OPERATION_COUNT = StandardPackage.TRACE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl <em>Copy</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.CopyImpl

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getCopy()

-	 * @generated

-	 */

-	int COPY = 2;

-

-	/**

-	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COPY__BASE_ABSTRACTION = StandardPackage.TRACE__BASE_ABSTRACTION;

-

-	/**

-	 * The number of structural features of the '<em>Copy</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COPY_FEATURE_COUNT = StandardPackage.TRACE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Copy</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COPY_OPERATION_COUNT = StandardPackage.TRACE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl <em>Satisfy</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.SatisfyImpl

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getSatisfy()

-	 * @generated

-	 */

-	int SATISFY = 3;

-

-	/**

-	 * The feature id for the '<em><b>Base Abstraction</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SATISFY__BASE_ABSTRACTION = StandardPackage.TRACE__BASE_ABSTRACTION;

-

-	/**

-	 * The number of structural features of the '<em>Satisfy</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SATISFY_FEATURE_COUNT = StandardPackage.TRACE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Satisfy</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SATISFY_OPERATION_COUNT = StandardPackage.TRACE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl <em>Test Case</em>}' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getTestCase()

-	 * @generated

-	 */

-	int TEST_CASE = 4;

-

-	/**

-	 * The feature id for the '<em><b>Base Behavior</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_CASE__BASE_BEHAVIOR = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Operation</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_CASE__BASE_OPERATION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Verifies</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_CASE__VERIFIES = 2;

-

-	/**

-	 * The number of structural features of the '<em>Test Case</em>' class. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_CASE_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>Test Case</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_CASE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the ' {@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl

-	 * <em>Requirement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirement()

-	 * @generated

-	 */

-	int REQUIREMENT = 5;

-

-	/**

-	 * The feature id for the '<em><b>Text</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__TEXT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Id</b></em>' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__ID = 1;

-

-	/**

-	 * The feature id for the '<em><b>Derived</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__DERIVED = 2;

-

-	/**

-	 * The feature id for the '<em><b>Derived From</b></em>' reference list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__DERIVED_FROM = 3;

-

-	/**

-	 * The feature id for the '<em><b>Satisfied By</b></em>' reference list.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__SATISFIED_BY = 4;

-

-	/**

-	 * The feature id for the '<em><b>Refined By</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__REFINED_BY = 5;

-

-	/**

-	 * The feature id for the '<em><b>Traced To</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__TRACED_TO = 6;

-

-	/**

-	 * The feature id for the '<em><b>Verified By</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__VERIFIED_BY = 7;

-

-	/**

-	 * The feature id for the '<em><b>Master</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__MASTER = 8;

-

-	/**

-	 * The feature id for the '<em><b>Base Class</b></em>' reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT__BASE_CLASS = 9;

-

-	/**

-	 * The number of structural features of the '<em>Requirement</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_FEATURE_COUNT = 10;

-

-	/**

-	 * The number of operations of the '<em>Requirement</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl <em>Requirement Related</em>}'

-	 * class.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl

-	 * @see org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl#getRequirementRelated()

-	 * @generated

-	 */

-	int REQUIREMENT_RELATED = 6;

-

-	/**

-	 * The feature id for the '<em><b>Base Named Element</b></em>' reference.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_RELATED__BASE_NAMED_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Traced From</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_RELATED__TRACED_FROM = 1;

-

-	/**

-	 * The feature id for the '<em><b>Satisfies</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_RELATED__SATISFIES = 2;

-

-	/**

-	 * The feature id for the '<em><b>Refines</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_RELATED__REFINES = 3;

-

-	/**

-	 * The feature id for the '<em><b>Verifies</b></em>' reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_RELATED__VERIFIES = 4;

-

-	/**

-	 * The number of structural features of the '<em>Requirement Related</em>' class.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_RELATED_FEATURE_COUNT = 5;

-

-	/**

-	 * The number of operations of the '<em>Requirement Related</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REQUIREMENT_RELATED_OPERATION_COUNT = 0;

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.requirements.Copy <em>Copy</em>}'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Copy</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Copy

-	 * @generated

-	 */

-	EClass getCopy();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.DeriveReqt <em>Derive Reqt</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Derive Reqt</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.DeriveReqt

-	 * @generated

-	 */

-	EClass getDeriveReqt();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.Requirement <em>Requirement</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Requirement</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement

-	 * @generated

-	 */

-	EClass getRequirement();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.Requirement#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.sysml.requirements.Requirement#getBase_Class()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_Base_Class();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived <em>Derived</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Derived</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerived()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_Derived();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom <em>Derived From</em>} '.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Derived From</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_DerivedFrom();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getId <em>Id</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Id</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getId()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EAttribute getRequirement_Id();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster <em>Master</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Master</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getMaster()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_Master();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy <em>Refined By</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Refined By</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_RefinedBy();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy <em>Satisfied By</em>} '.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Satisfied By</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_SatisfiedBy();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getText <em>Text</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Text</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getText()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EAttribute getRequirement_Text();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo <em>Traced To</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Traced To</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_TracedTo();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy <em>Verified By</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Verified By</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy()

-	 * @see #getRequirement()

-	 * @generated

-	 */

-	EReference getRequirement_VerifiedBy();

-

-	/**

-	 * Returns the meta object for class ' {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated

-	 * <em>Requirement Related</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for class '<em>Requirement Related</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated

-	 * @generated

-	 */

-	EClass getRequirementRelated();

-

-	/**

-	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getBase_NamedElement

-	 * <em>Base Named Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the meta object for the reference '<em>Base Named Element</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getBase_NamedElement()

-	 * @see #getRequirementRelated()

-	 * @generated

-	 */

-	EReference getRequirementRelated_Base_NamedElement();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines <em>Refines</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Refines</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines()

-	 * @see #getRequirementRelated()

-	 * @generated

-	 */

-	EReference getRequirementRelated_Refines();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies

-	 * <em>Satisfies</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Satisfies</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies()

-	 * @see #getRequirementRelated()

-	 * @generated

-	 */

-	EReference getRequirementRelated_Satisfies();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom

-	 * <em>Traced From</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Traced From</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom()

-	 * @see #getRequirementRelated()

-	 * @generated

-	 */

-	EReference getRequirementRelated_TracedFrom();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies <em>Verifies</em>} '.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Verifies</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies()

-	 * @see #getRequirementRelated()

-	 * @generated

-	 */

-	EReference getRequirementRelated_Verifies();

-

-	/**

-	 * 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

-	 */

-	RequirementsFactory getRequirementsFactory();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.Satisfy <em>Satisfy</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Satisfy</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Satisfy

-	 * @generated

-	 */

-	EClass getSatisfy();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.TestCase <em>Test Case</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Test Case</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.TestCase

-	 * @generated

-	 */

-	EClass getTestCase();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Behavior <em>Base Behavior</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base Behavior</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Behavior()

-	 * @see #getTestCase()

-	 * @generated

-	 */

-	EReference getTestCase_Base_Behavior();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.requirements.TestCase#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.sysml.requirements.TestCase#getBase_Operation()

-	 * @see #getTestCase()

-	 * @generated

-	 */

-	EReference getTestCase_Base_Operation();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies <em>Verifies</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Verifies</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies()

-	 * @see #getTestCase()

-	 * @generated

-	 */

-	EReference getTestCase_Verifies();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.requirements.Verify <em>Verify</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Verify</em>'.

-	 * @see org.eclipse.papyrus.sysml.requirements.Verify

-	 * @generated

-	 */

-	EClass getVerify();

-

-} // RequirementsPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Satisfy.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Satisfy.java
deleted file mode 100644
index dafc2ef8a4e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Satisfy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Satisfy</b></em>'. <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getSatisfy()

- * @model

- * @generated

- */

-public interface Satisfy extends org.eclipse.uml2.uml.profile.standard.Trace {

-

-} // Satisfy

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/TestCase.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/TestCase.java
deleted file mode 100644
index 1492252e6a7..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/TestCase.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.Operation;

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Test Case</b></em>'. <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Behavior <em>Base Behavior</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Operation <em>Base Operation</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies <em>Verifies</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getTestCase()

- * @model

- * @generated

- */

-public interface TestCase extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Base Behavior</b></em>' reference. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Behavior</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 Behavior</em>' reference.

-	 * @see #setBase_Behavior(Behavior)

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getTestCase_Base_Behavior()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Behavior getBase_Behavior();

-

-	/**

-	 * 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.sysml.requirements.RequirementsPackage#getTestCase_Base_Operation()

-	 * @model required="true" ordered="false"

-	 * @generated

-	 */

-	Operation getBase_Operation();

-

-	/**

-	 * Returns the value of the '<em><b>Verifies</b></em>' reference list. The

-	 * list contents are of type {@link org.eclipse.papyrus.sysml.requirements.Requirement}. <!--

-	 * begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Verifies</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Verifies</em>' reference list.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getTestCase_Verifies()

-	 * @model transient="true" changeable="false" volatile="true" derived="true"

-	 *        ordered="false"

-	 * @generated

-	 */

-	EList<Requirement> getVerifies();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getBase_Behavior <em>Base Behavior</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base Behavior</em>' reference.

-	 * @see #getBase_Behavior()

-	 * @generated

-	 */

-	void setBase_Behavior(Behavior value);

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.requirements.TestCase#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);

-

-} // TestCase

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/VerdictKind.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/VerdictKind.java
deleted file mode 100644
index 42cadbd24b2..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/VerdictKind.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-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>Verdict Kind</b></em>', and utility methods for working with

- * them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getVerdictKind()

- * @model

- * @generated

- */

-public enum VerdictKind implements Enumerator {

-	/**

-	 * The '<em><b>Pass</b></em>' literal object. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #PASS_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	PASS(0, "pass", "pass"),

-

-	/**

-	 * The '<em><b>Fail</b></em>' literal object. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #FAIL_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	FAIL(1, "fail", "fail"),

-

-	/**

-	 * The '<em><b>Inconclusive</b></em>' literal object. <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @see #INCONCLUSIVE_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	INCONCLUSIVE(2, "inconclusive", "inconclusive"),

-

-	/**

-	 * The '<em><b>Error</b></em>' literal object. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #ERROR_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ERROR(3, "error", "error");

-

-	/**

-	 * The '<em><b>Pass</b></em>' literal value. <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Pass</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #PASS

-	 * @model name="pass"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int PASS_VALUE = 0;

-

-	/**

-	 * The '<em><b>Fail</b></em>' literal value. <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Fail</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #FAIL

-	 * @model name="fail"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int FAIL_VALUE = 1;

-

-	/**

-	 * The '<em><b>Inconclusive</b></em>' literal value. <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Inconclusive</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #INCONCLUSIVE

-	 * @model name="inconclusive"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int INCONCLUSIVE_VALUE = 2;

-

-	/**

-	 * 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 = 3;

-

-	/**

-	 * An array of all the '<em><b>Verdict Kind</b></em>' enumerators. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final VerdictKind[] VALUES_ARRAY = new VerdictKind[] { PASS, FAIL, INCONCLUSIVE, ERROR, };

-

-	/**

-	 * A public read-only list of all the '<em><b>Verdict Kind</b></em>'

-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<VerdictKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Verdict Kind</b></em>' literal with the specified

-	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static VerdictKind get(int value) {

-		switch (value) {

-		case PASS_VALUE:

-			return PASS;

-		case FAIL_VALUE:

-			return FAIL;

-		case INCONCLUSIVE_VALUE:

-			return INCONCLUSIVE;

-		case ERROR_VALUE:

-			return ERROR;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Verdict Kind</b></em>' literal with the specified

-	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static VerdictKind get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			VerdictKind result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Verdict Kind</b></em>' literal with the specified

-	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static VerdictKind getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			VerdictKind result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		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 VerdictKind(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getLiteral() {

-		return literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public int getValue() {

-		return value;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // VerdictKind

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Verify.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Verify.java
deleted file mode 100644
index 7c2ce97f401..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/Verify.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements;

-

-

-/**

- * <!-- begin-user-doc --> A representation of the model object ' <em><b>Verify</b></em>'. <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.sysml.requirements.RequirementsPackage#getVerify()

- * @model

- * @generated

- */

-public interface Verify extends org.eclipse.uml2.uml.profile.standard.Trace {

-} // Verify

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/CopyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/CopyImpl.java
deleted file mode 100644
index 2b3e84c0de4..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/CopyImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.sysml.requirements.Copy;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Copy</b></em>'. <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class CopyImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements Copy {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CopyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RequirementsPackage.Literals.COPY;

-	}

-

-} // CopyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/DeriveReqtImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/DeriveReqtImpl.java
deleted file mode 100644
index a23e5cc05ce..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/DeriveReqtImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Derive Reqt</b></em>'. <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class DeriveReqtImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements DeriveReqt {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DeriveReqtImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RequirementsPackage.Literals.DERIVE_REQT;

-	}

-

-} // DeriveReqtImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementImpl.java
deleted file mode 100644
index 6858f4d18f6..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementImpl.java
+++ /dev/null
@@ -1,708 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEList;

-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.EcoreEList.UnmodifiableEList;

-import org.eclipse.papyrus.sysml.requirements.Copy;

-import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.DirectedRelationship;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.profile.standard.Refine;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-import org.eclipse.uml2.uml.profile.standard.Trace;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Requirement</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getText <em>Text</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getId <em>Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getDerived <em>Derived</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getDerivedFrom <em>Derived From</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getSatisfiedBy <em>Satisfied By</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getRefinedBy <em>Refined By</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getTracedTo <em>Traced To</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getVerifiedBy <em>Verified By</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getMaster <em>Master</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementImpl#getBase_Class <em>Base Class</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class RequirementImpl extends MinimalEObjectImpl.Container implements Requirement {

-

-	/**

-	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getText()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TEXT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getText()

-	 * @generated

-	 * @ordered

-	 */

-	protected String text = TEXT_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getId()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #getId()

-	 * @generated

-	 * @ordered

-	 */

-	protected String id = ID_EDEFAULT;

-

-	/**

-	 * 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 RequirementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- 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 NOT

-	 */

-	public Requirement basicGetMaster() {

-		// The Requirement is the supplier of the Copy link between the master

-		// Requirement and

-		// current

-		// This should return the TestCase verifying current Requirement

-		Requirement master = null;

-		Copy currentCopy = null;

-

-		if (getBase_Class() != null) {

-			Iterator<Dependency> itDep = getBase_Class().getClientDependencies().iterator();

-

-			// Find Copy link

-			while (itDep.hasNext()) {

-				Dependency currentDep = itDep.next();

-				currentCopy = UMLUtil.getStereotypeApplication(currentDep, Copy.class);

-

-				if (currentCopy != null) {

-					EList<NamedElement> suppliers = currentCopy.getBase_Abstraction().getSuppliers();

-					Iterator<NamedElement> it = suppliers.iterator();

-					while (it.hasNext() && (master == null)) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							master = currentRequirement;

-						}

-					}

-				}

-			}

-		}

-		return master;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT__TEXT:

-			return getText();

-		case RequirementsPackage.REQUIREMENT__ID:

-			return getId();

-		case RequirementsPackage.REQUIREMENT__DERIVED:

-			return getDerived();

-		case RequirementsPackage.REQUIREMENT__DERIVED_FROM:

-			return getDerivedFrom();

-		case RequirementsPackage.REQUIREMENT__SATISFIED_BY:

-			return getSatisfiedBy();

-		case RequirementsPackage.REQUIREMENT__REFINED_BY:

-			return getRefinedBy();

-		case RequirementsPackage.REQUIREMENT__TRACED_TO:

-			return getTracedTo();

-		case RequirementsPackage.REQUIREMENT__VERIFIED_BY:

-			return getVerifiedBy();

-		case RequirementsPackage.REQUIREMENT__MASTER:

-			if (resolve) {

-				return getMaster();

-			}

-			return basicGetMaster();

-		case RequirementsPackage.REQUIREMENT__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 boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT__TEXT:

-			return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);

-		case RequirementsPackage.REQUIREMENT__ID:

-			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);

-		case RequirementsPackage.REQUIREMENT__DERIVED:

-			return !getDerived().isEmpty();

-		case RequirementsPackage.REQUIREMENT__DERIVED_FROM:

-			return !getDerivedFrom().isEmpty();

-		case RequirementsPackage.REQUIREMENT__SATISFIED_BY:

-			return !getSatisfiedBy().isEmpty();

-		case RequirementsPackage.REQUIREMENT__REFINED_BY:

-			return !getRefinedBy().isEmpty();

-		case RequirementsPackage.REQUIREMENT__TRACED_TO:

-			return !getTracedTo().isEmpty();

-		case RequirementsPackage.REQUIREMENT__VERIFIED_BY:

-			return !getVerifiedBy().isEmpty();

-		case RequirementsPackage.REQUIREMENT__MASTER:

-			return basicGetMaster() != null;

-		case RequirementsPackage.REQUIREMENT__BASE_CLASS:

-			return base_Class != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT__TEXT:

-			setText((String) newValue);

-			return;

-		case RequirementsPackage.REQUIREMENT__ID:

-			setId((String) newValue);

-			return;

-		case RequirementsPackage.REQUIREMENT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RequirementsPackage.Literals.REQUIREMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT__TEXT:

-			setText(TEXT_EDEFAULT);

-			return;

-		case RequirementsPackage.REQUIREMENT__ID:

-			setId(ID_EDEFAULT);

-			return;

-		case RequirementsPackage.REQUIREMENT__BASE_CLASS:

-			setBase_Class((org.eclipse.uml2.uml.Class) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, RequirementsPackage.REQUIREMENT__BASE_CLASS, oldBase_Class, base_Class));

-				}

-			}

-		}

-		return base_Class;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<Requirement> getDerived() {

-		// This should return the Requirement(s) derived from current

-		EList<Requirement> derived = new BasicEList<Requirement>();

-		DeriveReqt currentDeriveReqt = null;

-

-		if (getBase_Class() != null) {

-			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

-

-			// Find DeriveReqt link

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDirectedRelationship = itDep.next();

-				currentDeriveReqt = UMLUtil.getStereotypeApplication(currentDirectedRelationship, DeriveReqt.class);

-

-				if (currentDeriveReqt != null) {

-					EList<NamedElement> clients = currentDeriveReqt.getBase_Abstraction().getClients();

-					Iterator<NamedElement> it = clients.iterator();

-					while (it.hasNext()) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							derived.add(currentRequirement);

-						}

-					}

-				}

-			}

-		}

-

-		UnmodifiableEList<Requirement> resultList = new UnmodifiableEList<Requirement>(this, RequirementsPackage.eINSTANCE.getRequirement_Derived(), derived.size(), derived.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<Requirement> getDerivedFrom() {

-		// This should return the Requirement(s) this Requirement is derived

-		// from

-		EList<Requirement> derivedFrom = new BasicEList<Requirement>();

-		DeriveReqt currentDeriveReqt = null;

-		if (getBase_Class() != null) {

-			Iterator<DirectedRelationship> itDep = getBase_Class().getSourceDirectedRelationships().iterator();

-

-			// Find DeriveReqt link

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDRelationship = itDep.next();

-				currentDeriveReqt = UMLUtil.getStereotypeApplication(currentDRelationship, DeriveReqt.class);

-

-				if (currentDeriveReqt != null) {

-					EList<NamedElement> suppliers = currentDeriveReqt.getBase_Abstraction().getSuppliers();

-					Iterator<NamedElement> it = suppliers.iterator();

-					while (it.hasNext()) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							derivedFrom.add(currentRequirement);

-						}

-					}

-				}

-			}

-		}

-

-		UnmodifiableEList<Requirement> resultList = new UnmodifiableEList<Requirement>(this, RequirementsPackage.eINSTANCE.getRequirement_DerivedFrom(), derivedFrom.size(), derivedFrom.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getId() {

-		return id;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Requirement getMaster() {

-		Requirement master = basicGetMaster();

-		return master != null && master.eIsProxy() ? (Requirement) eResolveProxy((InternalEObject) master) : master;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<NamedElement> getRefinedBy() {

-		// This should return the NamedElement(s) that refine current

-		// Requirement

-		EList<NamedElement> refinedBy = new BasicEList<NamedElement>();

-		Refine currentRefine = null;

-

-		if (getBase_Class() != null) {

-			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

-

-			// Find Refine link

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDRelationship = itDep.next();

-				currentRefine = UMLUtil.getStereotypeApplication(currentDRelationship, Refine.class);

-

-				if (currentRefine != null) {

-					refinedBy.addAll(currentRefine.getBase_Abstraction().getClients());

-				}

-			}

-		}

-

-		UnmodifiableEList<NamedElement> resultList = new UnmodifiableEList<NamedElement>(this, RequirementsPackage.eINSTANCE.getRequirement_RefinedBy(), refinedBy.size(), refinedBy.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getRefinedBy(String name) {

-		return getRefinedBy(name, false, null);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getRefinedBy(String name, boolean ignoreCase, EClass eClass) {

-		refinedByLoop: for (NamedElement refinedBy : getRefinedBy()) {

-			if (eClass != null && !eClass.isInstance(refinedBy)) {

-				continue refinedByLoop;

-			}

-			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(refinedBy.getName()) : name.equals(refinedBy.getName()))) {

-				continue refinedByLoop;

-			}

-			return refinedBy;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<NamedElement> getSatisfiedBy() {

-		// This should return the NamedElement(s) that satisfy current

-		// Requirement

-		EList<NamedElement> satisfyBy = new BasicEList<NamedElement>();

-		Satisfy currentSatisfy = null;

-

-		if (getBase_Class() != null) {

-			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

-

-			// Find Satisfy link

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDRelationship = itDep.next();

-				currentSatisfy = UMLUtil.getStereotypeApplication(currentDRelationship, Satisfy.class);

-

-				if (currentSatisfy != null) {

-					satisfyBy.addAll(currentSatisfy.getBase_Abstraction().getClients());

-				}

-			}

-		}

-

-		UnmodifiableEList<NamedElement> resultList = new UnmodifiableEList<NamedElement>(this, RequirementsPackage.eINSTANCE.getRequirement_SatisfiedBy(), satisfyBy.size(), satisfyBy.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getSatisfiedBy(String name) {

-		return getSatisfiedBy(name, false, null);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getSatisfiedBy(String name, boolean ignoreCase, EClass eClass) {

-		satisfiedByLoop: for (NamedElement satisfiedBy : getSatisfiedBy()) {

-			if (eClass != null && !eClass.isInstance(satisfiedBy)) {

-				continue satisfiedByLoop;

-			}

-			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(satisfiedBy.getName()) : name.equals(satisfiedBy.getName()))) {

-				continue satisfiedByLoop;

-			}

-			return satisfiedBy;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getText() {

-		return text;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<NamedElement> getTracedTo() {

-		// This should return the NamedElement(s) traced by current Requirement

-		// SysML spec. : Derived from all elements that are the client of a

-		// «trace» relationship

-		// for which this requirement is a supplier.

-		EList<NamedElement> tracedTo = new BasicEList<NamedElement>();

-		Trace currentTrace = null;

-

-		if (getBase_Class() != null) {

-			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

-

-			// Find Trace link

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDR = itDep.next();

-				currentTrace = UMLUtil.getStereotypeApplication(currentDR, Trace.class);

-

-				// Must be a Trace not a subtype (see bug #352563).

-				if ((currentTrace != null) && (currentTrace.eClass() == StandardPackage.eINSTANCE.getTrace())) {

-					EList<NamedElement> suppliers = currentTrace.getBase_Abstraction().getClients();

-					tracedTo.addAll(suppliers);

-				}

-			}

-		}

-

-		UnmodifiableEList<NamedElement> resultList = new UnmodifiableEList<NamedElement>(this, RequirementsPackage.eINSTANCE.getRequirement_TracedTo(), tracedTo.size(), tracedTo.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getTracedTo(String name) {

-		return getTracedTo(name, false, null);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getTracedTo(String name, boolean ignoreCase, EClass eClass) {

-		tracedToLoop: for (NamedElement tracedTo : getTracedTo()) {

-			if (eClass != null && !eClass.isInstance(tracedTo)) {

-				continue tracedToLoop;

-			}

-			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(tracedTo.getName()) : name.equals(tracedTo.getName()))) {

-				continue tracedToLoop;

-			}

-			return tracedTo;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<NamedElement> getVerifiedBy() {

-		// This should return the list of NamedElement verifying current

-		// Requirement

-		EList<NamedElement> verifiedBy = new BasicEList<NamedElement>();

-		Verify currentVerify = null;

-

-		if (getBase_Class() != null) {

-			Iterator<DirectedRelationship> itDep = getBase_Class().getTargetDirectedRelationships().iterator();

-

-			// Find Verify link

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDRelationship = itDep.next();

-				currentVerify = UMLUtil.getStereotypeApplication(currentDRelationship, Verify.class);

-

-				if (currentVerify != null) {

-					verifiedBy.addAll(currentVerify.getBase_Abstraction().getClients());

-				}

-			}

-		}

-

-		UnmodifiableEList<NamedElement> resultList = new UnmodifiableEList<NamedElement>(this, RequirementsPackage.eINSTANCE.getRequirement_VerifiedBy(), verifiedBy.size(), verifiedBy.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getVerifiedBy(String name) {

-		return getVerifiedBy(name, false, null);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getVerifiedBy(String name, boolean ignoreCase, EClass eClass) {

-		verifiedByLoop: for (NamedElement verifiedBy : getVerifiedBy()) {

-			if (eClass != null && !eClass.isInstance(verifiedBy)) {

-				continue verifiedByLoop;

-			}

-			if (name != null && !(ignoreCase ? name.equalsIgnoreCase(verifiedBy.getName()) : name.equals(verifiedBy.getName()))) {

-				continue verifiedByLoop;

-			}

-			return verifiedBy;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, RequirementsPackage.REQUIREMENT__BASE_CLASS, oldBase_Class, base_Class));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setId(String newId) {

-		String oldId = id;

-		id = newId;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__ID, oldId, id));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public void setMaster(Requirement newMaster) {

-

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setText(String newText) {

-		String oldText = text;

-		text = newText;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT__TEXT, oldText, text));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (text: ");

-		result.append(text);

-		result.append(", id: ");

-		result.append(id);

-		result.append(')');

-		return result.toString();

-	}

-

-} // RequirementImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementRelatedImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementRelatedImpl.java
deleted file mode 100644
index 3302f43eae5..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementRelatedImpl.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEList;

-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.EcoreEList.UnmodifiableEList;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementRelated;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.DirectedRelationship;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.profile.standard.Refine;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-import org.eclipse.uml2.uml.profile.standard.Trace;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Requirement Related</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl#getBase_NamedElement <em>Base Named Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl#getTracedFrom <em>Traced From</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl#getSatisfies <em>Satisfies</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl#getRefines <em>Refines</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementRelatedImpl#getVerifies <em>Verifies</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class RequirementRelatedImpl extends MinimalEObjectImpl.Container implements RequirementRelated {

-

-	/**

-	 * The cached value of the '{@link #getBase_NamedElement() <em>Base Named Element</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_NamedElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected NamedElement base_NamedElement;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RequirementRelatedImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement basicGetBase_NamedElement() {

-		return base_NamedElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

-			if (resolve) {

-				return getBase_NamedElement();

-			}

-			return basicGetBase_NamedElement();

-		case RequirementsPackage.REQUIREMENT_RELATED__TRACED_FROM:

-			return getTracedFrom();

-		case RequirementsPackage.REQUIREMENT_RELATED__SATISFIES:

-			return getSatisfies();

-		case RequirementsPackage.REQUIREMENT_RELATED__REFINES:

-			return getRefines();

-		case RequirementsPackage.REQUIREMENT_RELATED__VERIFIES:

-			return getVerifies();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

-			return base_NamedElement != null;

-		case RequirementsPackage.REQUIREMENT_RELATED__TRACED_FROM:

-			return !getTracedFrom().isEmpty();

-		case RequirementsPackage.REQUIREMENT_RELATED__SATISFIES:

-			return !getSatisfies().isEmpty();

-		case RequirementsPackage.REQUIREMENT_RELATED__REFINES:

-			return !getRefines().isEmpty();

-		case RequirementsPackage.REQUIREMENT_RELATED__VERIFIES:

-			return !getVerifies().isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RequirementsPackage.Literals.REQUIREMENT_RELATED;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT:

-			setBase_NamedElement((NamedElement) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NamedElement getBase_NamedElement() {

-		if (base_NamedElement != null && base_NamedElement.eIsProxy()) {

-			InternalEObject oldBase_NamedElement = (InternalEObject) base_NamedElement;

-			base_NamedElement = (NamedElement) eResolveProxy(oldBase_NamedElement);

-			if (base_NamedElement != oldBase_NamedElement) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

-				}

-			}

-		}

-		return base_NamedElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<Requirement> getRefines() {

-		// This should return the Requirement(s) refined by current element

-		EList<Requirement> refines = new BasicEList<Requirement>();

-		Refine currentRefine = null;

-

-		if (getBase_NamedElement() != null) {

-			// Find Refine link

-			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

-

-			while (itDep.hasNext()) {

-				Dependency currentDependency = itDep.next();

-				currentRefine = UMLUtil.getStereotypeApplication(currentDependency, Refine.class);

-

-				if (currentRefine != null) {

-					EList<NamedElement> suppliers = currentRefine.getBase_Abstraction().getSuppliers();

-					Iterator<NamedElement> it = suppliers.iterator();

-					while (it.hasNext()) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							refines.add(currentRequirement);

-						}

-					}

-				}

-			}

-		}

-

-		UnmodifiableEList<Requirement> resultList = new UnmodifiableEList<Requirement>(this, RequirementsPackage.eINSTANCE.getRequirementRelated_Refines(), refines.size(), refines.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<Requirement> getSatisfies() {

-		// This should return the Requirement(s) satisfied by current element

-		EList<Requirement> satisfies = new BasicEList<Requirement>();

-		Satisfy currentSatisfy = null;

-

-		if (getBase_NamedElement() != null) {

-			// Find Satisfy link

-			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

-

-			while (itDep.hasNext()) {

-				Dependency currentDependency = itDep.next();

-				currentSatisfy = UMLUtil.getStereotypeApplication(currentDependency, Satisfy.class);

-

-				if (currentSatisfy != null) {

-					EList<NamedElement> suppliers = currentSatisfy.getBase_Abstraction().getSuppliers();

-					Iterator<NamedElement> it = suppliers.iterator();

-					while (it.hasNext()) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							satisfies.add(currentRequirement);

-						}

-					}

-				}

-			}

-		}

-

-		UnmodifiableEList<Requirement> resultList = new UnmodifiableEList<Requirement>(this, RequirementsPackage.eINSTANCE.getRequirementRelated_Satisfies(), satisfies.size(), satisfies.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<Requirement> getTracedFrom() {

-

-		// Derived from all requirements that are supplier of a "trace"

-		// relationship for

-		// which this element is a client.

-		// "trace" subtypes are not included (see bug #352563).

-		EList<Requirement> tracedFrom = new BasicEList<Requirement>();

-		Trace currentTrace = null;

-

-		if (getBase_NamedElement() != null) {

-			// Find Trace link

-			EList<DirectedRelationship> relationships = getBase_NamedElement().getSourceDirectedRelationships();

-			Iterator<DirectedRelationship> itDep = relationships.iterator();

-

-			while (itDep.hasNext()) {

-				DirectedRelationship currentDRelationship = itDep.next();

-				currentTrace = UMLUtil.getStereotypeApplication(currentDRelationship, Trace.class);

-

-				// Must be a Trace not a subtype (see bug #352563).

-				if ((currentTrace != null) && (currentTrace.eClass() == StandardPackage.eINSTANCE.getTrace())) {

-					EList<NamedElement> clients = currentTrace.getBase_Abstraction().getSuppliers();

-					Iterator<NamedElement> it = clients.iterator();

-					while (it.hasNext()) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							tracedFrom.add(currentRequirement);

-						}

-					}

-				}

-			}

-		}

-

-		UnmodifiableEList<Requirement> resultList = new UnmodifiableEList<Requirement>(this, RequirementsPackage.eINSTANCE.getRequirementRelated_TracedFrom(), tracedFrom.size(), tracedFrom.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<Requirement> getVerifies() {

-		// This should return the Requirement(s) verified by current element

-		EList<Requirement> verifies = new BasicEList<Requirement>();

-		Verify currentVerify = null;

-

-		if (getBase_NamedElement() != null) {

-			// Find Satisfy link

-			Iterator<Dependency> itDep = getBase_NamedElement().getClientDependencies().iterator();

-

-			while (itDep.hasNext()) {

-				Dependency currentDependency = itDep.next();

-				currentVerify = UMLUtil.getStereotypeApplication(currentDependency, Verify.class);

-

-				if (currentVerify != null) {

-					EList<NamedElement> suppliers = currentVerify.getBase_Abstraction().getSuppliers();

-					Iterator<NamedElement> it = suppliers.iterator();

-					while (it.hasNext()) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							verifies.add(currentRequirement);

-						}

-					}

-				}

-			}

-		}

-

-

-		UnmodifiableEList<Requirement> resultList = new UnmodifiableEList<Requirement>(this, RequirementsPackage.eINSTANCE.getRequirementRelated_Verifies(), verifies.size(), verifies.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_NamedElement(NamedElement newBase_NamedElement) {

-		NamedElement oldBase_NamedElement = base_NamedElement;

-		base_NamedElement = newBase_NamedElement;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, oldBase_NamedElement, base_NamedElement));

-		}

-	}

-

-} // RequirementRelatedImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsFactoryImpl.java
deleted file mode 100644
index 19ecac49983..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsFactoryImpl.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.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.sysml.requirements.Copy;

-import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementRelated;

-import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.sysml.requirements.TestCase;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class RequirementsFactoryImpl extends EFactoryImpl implements RequirementsFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static RequirementsPackage getPackage() {

-		return RequirementsPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static RequirementsFactory init() {

-		try {

-			RequirementsFactory theRequirementsFactory = (RequirementsFactory) EPackage.Registry.INSTANCE.getEFactory(RequirementsPackage.eNS_URI);

-			if (theRequirementsFactory != null) {

-				return theRequirementsFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new RequirementsFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementsFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case RequirementsPackage.DERIVE_REQT:

-			return createDeriveReqt();

-		case RequirementsPackage.VERIFY:

-			return createVerify();

-		case RequirementsPackage.COPY:

-			return createCopy();

-		case RequirementsPackage.SATISFY:

-			return createSatisfy();

-		case RequirementsPackage.TEST_CASE:

-			return createTestCase();

-		case RequirementsPackage.REQUIREMENT:

-			return createRequirement();

-		case RequirementsPackage.REQUIREMENT_RELATED:

-			return createRequirementRelated();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Copy createCopy() {

-		CopyImpl copy = new CopyImpl();

-		return copy;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DeriveReqt createDeriveReqt() {

-		DeriveReqtImpl deriveReqt = new DeriveReqtImpl();

-		return deriveReqt;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Requirement createRequirement() {

-		RequirementImpl requirement = new RequirementImpl();

-		return requirement;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementRelated createRequirementRelated() {

-		RequirementRelatedImpl requirementRelated = new RequirementRelatedImpl();

-		return requirementRelated;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Satisfy createSatisfy() {

-		SatisfyImpl satisfy = new SatisfyImpl();

-		return satisfy;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public TestCase createTestCase() {

-		TestCaseImpl testCase = new TestCaseImpl();

-		return testCase;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Verify createVerify() {

-		VerifyImpl verify = new VerifyImpl();

-		return verify;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementsPackage getRequirementsPackage() {

-		return (RequirementsPackage) getEPackage();

-	}

-

-} // RequirementsFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsPackageImpl.java
deleted file mode 100644
index 573a688091c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/RequirementsPackageImpl.java
+++ /dev/null
@@ -1,589 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.Copy;

-import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementRelated;

-import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.sysml.requirements.TestCase;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class RequirementsPackageImpl extends EPackageImpl implements RequirementsPackage {

-

-	/**

-	 * <!-- 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 RequirementsPackage#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 RequirementsPackage init() {

-		if (isInited) {

-			return (RequirementsPackage) EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RequirementsPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theRequirementsPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theRequirementsPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theRequirementsPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(RequirementsPackage.eNS_URI, theRequirementsPackage);

-		return theRequirementsPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass deriveReqtEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass verifyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass copyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass satisfyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass testCaseEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass requirementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass requirementRelatedEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.requirements.RequirementsPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private RequirementsPackageImpl() {

-		super(eNS_URI, RequirementsFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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

-		deriveReqtEClass = createEClass(DERIVE_REQT);

-

-		verifyEClass = createEClass(VERIFY);

-

-		copyEClass = createEClass(COPY);

-

-		satisfyEClass = createEClass(SATISFY);

-

-		testCaseEClass = createEClass(TEST_CASE);

-		createEReference(testCaseEClass, TEST_CASE__BASE_BEHAVIOR);

-		createEReference(testCaseEClass, TEST_CASE__BASE_OPERATION);

-		createEReference(testCaseEClass, TEST_CASE__VERIFIES);

-

-		requirementEClass = createEClass(REQUIREMENT);

-		createEAttribute(requirementEClass, REQUIREMENT__TEXT);

-		createEAttribute(requirementEClass, REQUIREMENT__ID);

-		createEReference(requirementEClass, REQUIREMENT__DERIVED);

-		createEReference(requirementEClass, REQUIREMENT__DERIVED_FROM);

-		createEReference(requirementEClass, REQUIREMENT__SATISFIED_BY);

-		createEReference(requirementEClass, REQUIREMENT__REFINED_BY);

-		createEReference(requirementEClass, REQUIREMENT__TRACED_TO);

-		createEReference(requirementEClass, REQUIREMENT__VERIFIED_BY);

-		createEReference(requirementEClass, REQUIREMENT__MASTER);

-		createEReference(requirementEClass, REQUIREMENT__BASE_CLASS);

-

-		requirementRelatedEClass = createEClass(REQUIREMENT_RELATED);

-		createEReference(requirementRelatedEClass, REQUIREMENT_RELATED__BASE_NAMED_ELEMENT);

-		createEReference(requirementRelatedEClass, REQUIREMENT_RELATED__TRACED_FROM);

-		createEReference(requirementRelatedEClass, REQUIREMENT_RELATED__SATISFIES);

-		createEReference(requirementRelatedEClass, REQUIREMENT_RELATED__REFINES);

-		createEReference(requirementRelatedEClass, REQUIREMENT_RELATED__VERIFIES);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getCopy() {

-		return copyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getDeriveReqt() {

-		return deriveReqtEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getRequirement() {

-		return requirementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_Base_Class() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_Derived() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_DerivedFrom() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getRequirement_Id() {

-		return (EAttribute) requirementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_Master() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_RefinedBy() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_SatisfiedBy() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getRequirement_Text() {

-		return (EAttribute) requirementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_TracedTo() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirement_VerifiedBy() {

-		return (EReference) requirementEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getRequirementRelated() {

-		return requirementRelatedEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirementRelated_Base_NamedElement() {

-		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirementRelated_Refines() {

-		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirementRelated_Satisfies() {

-		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirementRelated_TracedFrom() {

-		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getRequirementRelated_Verifies() {

-		return (EReference) requirementRelatedEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementsFactory getRequirementsFactory() {

-		return (RequirementsFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getSatisfy() {

-		return satisfyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getTestCase() {

-		return testCaseEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getTestCase_Base_Behavior() {

-		return (EReference) testCaseEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getTestCase_Base_Operation() {

-		return (EReference) testCaseEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getTestCase_Verifies() {

-		return (EReference) testCaseEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getVerify() {

-		return verifyEClass;

-	}

-

-	/**

-	 * 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

-		StandardPackage theStandardPackage = (StandardPackage) EPackage.Registry.INSTANCE.getEPackage(StandardPackage.eNS_URI);

-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		TypesPackage theTypesPackage = (TypesPackage) EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		deriveReqtEClass.getESuperTypes().add(theStandardPackage.getTrace());

-		verifyEClass.getESuperTypes().add(theStandardPackage.getTrace());

-		copyEClass.getESuperTypes().add(theStandardPackage.getTrace());

-		satisfyEClass.getESuperTypes().add(theStandardPackage.getTrace());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(deriveReqtEClass, DeriveReqt.class, "DeriveReqt", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(verifyEClass, Verify.class, "Verify", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(copyEClass, Copy.class, "Copy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(satisfyEClass, Satisfy.class, "Satisfy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(testCaseEClass, TestCase.class, "TestCase", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getTestCase_Base_Behavior(), theUMLPackage.getBehavior(), null, "base_Behavior", null, 1, 1, TestCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getTestCase_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, TestCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getTestCase_Verifies(), this.getRequirement(), null, "verifies", null, 0, -1, TestCase.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-

-		initEClass(requirementEClass, Requirement.class, "Requirement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getRequirement_Text(), theTypesPackage.getString(), "text", null, 1, 1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getRequirement_Id(), theTypesPackage.getString(), "id", null, 1, 1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_Derived(), this.getRequirement(), null, "derived", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_DerivedFrom(), this.getRequirement(), null, "derivedFrom", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_SatisfiedBy(), theUMLPackage.getNamedElement(), null, "satisfiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRequirement_RefinedBy(), theUMLPackage.getNamedElement(), null, "refinedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRequirement_TracedTo(), theUMLPackage.getNamedElement(), null, "tracedTo", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRequirement_VerifiedBy(), theUMLPackage.getNamedElement(), null, "verifiedBy", null, 0, -1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRequirement_Master(), this.getRequirement(), null, "master", null, 0, 1, Requirement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirement_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,

-				!IS_ORDERED);

-

-		initEClass(requirementRelatedEClass, RequirementRelated.class, "RequirementRelated", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRequirementRelated_Base_NamedElement(), theUMLPackage.getNamedElement(), null, "base_NamedElement", null, 1, 1, RequirementRelated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				!IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getRequirementRelated_TracedFrom(), this.getRequirement(), null, "tracedFrom", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRequirementRelated_Satisfies(), this.getRequirement(), null, "satisfies", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRequirementRelated_Refines(), this.getRequirement(), null, "refines", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-		initEReference(getRequirementRelated_Verifies(), this.getRequirement(), null, "verifies", null, 0, -1, RequirementRelated.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED,

-				!IS_ORDERED);

-	}

-

-} // RequirementsPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/SatisfyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/SatisfyImpl.java
deleted file mode 100644
index 7e3d5226746..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/SatisfyImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Satisfy</b></em>'. <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class SatisfyImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements Satisfy {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SatisfyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RequirementsPackage.Literals.SATISFY;

-	}

-

-} // SatisfyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/TestCaseImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/TestCaseImpl.java
deleted file mode 100644
index 57b03df213c..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/TestCaseImpl.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEList;

-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.EcoreEList.UnmodifiableEList;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.TestCase;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Test Case</b></em>'. <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl#getBase_Behavior <em>Base Behavior</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl#getBase_Operation <em>Base Operation</em>}</li>

- * <li>{@link org.eclipse.papyrus.sysml.requirements.internal.impl.TestCaseImpl#getVerifies <em>Verifies</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class TestCaseImpl extends MinimalEObjectImpl.Container implements TestCase {

-

-	/**

-	 * The cached value of the '{@link #getBase_Behavior() <em>Base Behavior</em>}' reference.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #getBase_Behavior()

-	 * @generated

-	 * @ordered

-	 */

-	protected Behavior base_Behavior;

-

-	/**

-	 * 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 TestCaseImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Behavior basicGetBase_Behavior() {

-		return base_Behavior;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Operation basicGetBase_Operation() {

-		return base_Operation;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

-			if (resolve) {

-				return getBase_Behavior();

-			}

-			return basicGetBase_Behavior();

-		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

-			if (resolve) {

-				return getBase_Operation();

-			}

-			return basicGetBase_Operation();

-		case RequirementsPackage.TEST_CASE__VERIFIES:

-			return getVerifies();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

-			return base_Behavior != null;

-		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

-			return base_Operation != null;

-		case RequirementsPackage.TEST_CASE__VERIFIES:

-			return !getVerifies().isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior) newValue);

-			return;

-		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

-			setBase_Operation((Operation) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RequirementsPackage.Literals.TEST_CASE;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case RequirementsPackage.TEST_CASE__BASE_BEHAVIOR:

-			setBase_Behavior((Behavior) null);

-			return;

-		case RequirementsPackage.TEST_CASE__BASE_OPERATION:

-			setBase_Operation((Operation) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Behavior getBase_Behavior() {

-		if (base_Behavior != null && base_Behavior.eIsProxy()) {

-			InternalEObject oldBase_Behavior = (InternalEObject) base_Behavior;

-			base_Behavior = (Behavior) eResolveProxy(oldBase_Behavior);

-			if (base_Behavior != oldBase_Behavior) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementsPackage.TEST_CASE__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

-				}

-			}

-		}

-		return base_Behavior;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	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, RequirementsPackage.TEST_CASE__BASE_OPERATION, oldBase_Operation, base_Operation));

-				}

-			}

-		}

-		return base_Operation;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	public EList<Requirement> getVerifies() {

-		// This should return the Requirements verified by current TestCase

-		EList<Requirement> verifies = new BasicEList<Requirement>();

-		Verify currentVerify = null;

-

-		if ((getBase_Behavior() != null) || (getBase_Operation() != null)) {

-			// Find Verify link

-			Iterator<Dependency> itDep;

-			if (getBase_Behavior() != null) {

-				itDep = getBase_Behavior().getClientDependencies().iterator();

-			} else { // if (getBase_Operation() != null)

-				itDep = getBase_Operation().getClientDependencies().iterator();

-			}

-

-			while (itDep.hasNext()) {

-				Dependency currentDependency = itDep.next();

-				currentVerify = UMLUtil.getStereotypeApplication(currentDependency, Verify.class);

-

-				if (currentVerify != null) {

-					EList<NamedElement> suppliers = currentVerify.getBase_Abstraction().getSuppliers();

-					Iterator<NamedElement> it = suppliers.iterator();

-					while (it.hasNext()) {

-						Requirement currentRequirement = UMLUtil.getStereotypeApplication(it.next(), Requirement.class);

-						if (currentRequirement != null) {

-							verifies.add(currentRequirement);

-						}

-					}

-				}

-			}

-		}

-

-		UnmodifiableEList<Requirement> resultList = new UnmodifiableEList<Requirement>(this, RequirementsPackage.eINSTANCE.getTestCase_Verifies(), verifies.size(), verifies.toArray());

-		return resultList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Behavior(Behavior newBase_Behavior) {

-		Behavior oldBase_Behavior = base_Behavior;

-		base_Behavior = newBase_Behavior;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.TEST_CASE__BASE_BEHAVIOR, oldBase_Behavior, base_Behavior));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBase_Operation(Operation newBase_Operation) {

-		Operation oldBase_Operation = base_Operation;

-		base_Operation = newBase_Operation;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, RequirementsPackage.TEST_CASE__BASE_OPERATION, oldBase_Operation, base_Operation));

-		}

-	}

-

-} // TestCaseImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/VerifyImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/VerifyImpl.java
deleted file mode 100644
index c51d0c58864..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/internal/impl/VerifyImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.internal.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Verify</b></em>'. <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class VerifyImpl extends org.eclipse.uml2.uml.profile.standard.internal.impl.TraceImpl implements Verify {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VerifyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RequirementsPackage.Literals.VERIFY;

-	}

-

-} // VerifyImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsAdapterFactory.java
deleted file mode 100644
index d7e1e56a56b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsAdapterFactory.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.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.sysml.requirements.Copy;

-import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementRelated;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.sysml.requirements.TestCase;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-

-/**

- * <!-- 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.sysml.requirements.RequirementsPackage

- * @generated

- */

-public class RequirementsAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static RequirementsPackage modelPackage;

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RequirementsSwitch<Adapter> modelSwitch = new RequirementsSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseDeriveReqt(DeriveReqt object) {

-			return createDeriveReqtAdapter();

-		}

-

-		@Override

-		public Adapter caseVerify(Verify object) {

-			return createVerifyAdapter();

-		}

-

-		@Override

-		public Adapter caseCopy(Copy object) {

-			return createCopyAdapter();

-		}

-

-		@Override

-		public Adapter caseSatisfy(Satisfy object) {

-			return createSatisfyAdapter();

-		}

-

-		@Override

-		public Adapter caseTestCase(TestCase object) {

-			return createTestCaseAdapter();

-		}

-

-		@Override

-		public Adapter caseRequirement(Requirement object) {

-			return createRequirementAdapter();

-		}

-

-		@Override

-		public Adapter caseRequirementRelated(RequirementRelated object) {

-			return createRequirementRelatedAdapter();

-		}

-

-		@Override

-		public Adapter caseTrace(org.eclipse.uml2.uml.profile.standard.Trace object) {

-			return createTraceAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementsAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = RequirementsPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * 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.sysml.requirements.Copy <em>Copy</em>}'. <!--

-	 * begin-user-doc --> This default implementation returns null so that we

-	 * can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.requirements.Copy

-	 * @generated

-	 */

-	public Adapter createCopyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.requirements.DeriveReqt <em>Derive Reqt</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.requirements.DeriveReqt

-	 * @generated

-	 */

-	public Adapter createDeriveReqtAdapter() {

-		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;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.requirements.Requirement <em>Requirement</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.requirements.Requirement

-	 * @generated

-	 */

-	public Adapter createRequirementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated <em>Requirement Related</em>}'.

-	 * <!-- begin-user-doc --> This default

-	 * implementation returns null so that we can easily ignore cases; it's

-	 * useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated

-	 * @generated

-	 */

-	public Adapter createRequirementRelatedAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.requirements.Satisfy <em>Satisfy</em>}'.

-	 * <!-- begin-user-doc --> This default implementation returns null so that

-	 * we can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.requirements.Satisfy

-	 * @generated

-	 */

-	public Adapter createSatisfyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.requirements.TestCase

-	 * <em>Test Case</em>}'. <!-- begin-user-doc --> This default implementation

-	 * returns null so that we can easily ignore cases; it's useful to ignore a

-	 * case when inheritance will catch all the cases anyway. <!-- end-user-doc

-	 * -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.requirements.TestCase

-	 * @generated

-	 */

-	public Adapter createTestCaseAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.uml.standard.Trace <em>Trace</em>}'. <!--

-	 * begin-user-doc --> This default implementation returns null so that we

-	 * can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.standard.Trace

-	 * @generated

-	 */

-	public Adapter createTraceAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.requirements.Verify <em>Verify</em>}'.

-	 * <!-- begin-user-doc --> This default implementation returns null so that

-	 * we can easily ignore cases; it's useful to ignore a case when inheritance

-	 * will catch all the cases anyway. <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.requirements.Verify

-	 * @generated

-	 */

-	public Adapter createVerifyAdapter() {

-		return null;

-	}

-

-	/**

-	 * 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;

-	}

-

-} // RequirementsAdapterFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceFactoryImpl.java
deleted file mode 100644
index 9c3d4b36d38..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.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.sysml.requirements.util.RequirementsResourceImpl

- * @generated

- */

-public class RequirementsResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementsResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new RequirementsResourceImpl(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;

-	}

-

-} // RequirementsResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceImpl.java
deleted file mode 100644
index 195efc32eb9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.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.sysml.requirements.util.RequirementsResourceFactoryImpl

- * @generated

- */

-public class RequirementsResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public RequirementsResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // RequirementsResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsSwitch.java
deleted file mode 100644
index fc08a6f44d9..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsSwitch.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.sysml.requirements.Copy;

-import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

-import org.eclipse.papyrus.sysml.requirements.Requirement;

-import org.eclipse.papyrus.sysml.requirements.RequirementRelated;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.Satisfy;

-import org.eclipse.papyrus.sysml.requirements.TestCase;

-import org.eclipse.papyrus.sysml.requirements.Verify;

-

-/**

- * <!-- 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.sysml.requirements.RequirementsPackage

- * @generated

- */

-public class RequirementsSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static RequirementsPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementsSwitch() {

-		if (modelPackage == null) {

-			modelPackage = RequirementsPackage.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;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of ' <em>Copy</em>'. <!-- begin-user-doc --> This implementation returns null;

-	 * returning a non-null result will terminate the switch. <!-- end-user-doc

-	 * -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of ' <em>Copy</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCopy(Copy object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Derive Reqt</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Derive Reqt</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDeriveReqt(DeriveReqt object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Requirement</em>'.

-	 * <!-- begin-user-doc --> This implementation

-	 * returns null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Requirement</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseRequirement(Requirement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Requirement Related</em>'.

-	 * <!-- begin-user-doc --> This

-	 * implementation returns null; returning a non-null result will terminate

-	 * the switch. <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Requirement Related</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseRequirementRelated(RequirementRelated object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Trace</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Trace</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTrace(org.eclipse.uml2.uml.profile.standard.Trace object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Satisfy</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Satisfy</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSatisfy(Satisfy object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Test Case</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Test Case</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTestCase(TestCase object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Verify</em>'.

-	 * <!-- begin-user-doc --> This implementation returns

-	 * null; returning a non-null result will terminate the switch. <!--

-	 * end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Verify</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVerify(Verify 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;

-	}

-

-	/**

-	 * 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 RequirementsPackage.DERIVE_REQT: {

-			DeriveReqt deriveReqt = (DeriveReqt) theEObject;

-			T result = caseDeriveReqt(deriveReqt);

-			if (result == null) {

-				result = caseTrace(deriveReqt);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case RequirementsPackage.VERIFY: {

-			Verify verify = (Verify) theEObject;

-			T result = caseVerify(verify);

-			if (result == null) {

-				result = caseTrace(verify);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case RequirementsPackage.COPY: {

-			Copy copy = (Copy) theEObject;

-			T result = caseCopy(copy);

-			if (result == null) {

-				result = caseTrace(copy);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case RequirementsPackage.SATISFY: {

-			Satisfy satisfy = (Satisfy) theEObject;

-			T result = caseSatisfy(satisfy);

-			if (result == null) {

-				result = caseTrace(satisfy);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case RequirementsPackage.TEST_CASE: {

-			TestCase testCase = (TestCase) theEObject;

-			T result = caseTestCase(testCase);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case RequirementsPackage.REQUIREMENT: {

-			Requirement requirement = (Requirement) theEObject;

-			T result = caseRequirement(requirement);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case RequirementsPackage.REQUIREMENT_RELATED: {

-			RequirementRelated requirementRelated = (RequirementRelated) theEObject;

-			T result = caseRequirementRelated(requirementRelated);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-} // RequirementsSwitch

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsXMLProcessor.java
deleted file mode 100644
index 5866b8bc07f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/requirements/util/RequirementsXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.requirements.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.sysml.requirements.RequirementsPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class RequirementsXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RequirementsXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		RequirementsPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the RequirementsResourceFactoryImpl 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 RequirementsResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new RequirementsResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // RequirementsXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesFactory.java
deleted file mode 100644
index 6a55298e6cb..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.statemachines;

-

-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.sysml.statemachines.StatemachinesPackage

- * @generated

- */

-public interface StatemachinesFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	StatemachinesFactory eINSTANCE = org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesFactoryImpl.init();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	StatemachinesPackage getStatemachinesPackage();

-

-} // StatemachinesFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesPackage.java
deleted file mode 100644
index 7f3e90af964..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/StatemachinesPackage.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.statemachines;

-

-import org.eclipse.emf.ecore.EDataType;

-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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.statemachines.StatemachinesFactory

- * @model kind="package"

- * @generated

- */

-public interface StatemachinesPackage extends EPackage {

-

-	/**

-	 * <!-- 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 '<em>Dummy</em>' data type. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see java.lang.String

-		 * @see org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl#getDummy()

-		 * @generated

-		 */

-		EDataType DUMMY = eINSTANCE.getDummy();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "statemachines";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/StateMachines";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "StateMachines";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	StatemachinesPackage eINSTANCE = org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl.init();

-

-	/**

-	 * The meta object id for the '<em>Dummy</em>' data type. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see java.lang.String

-	 * @see org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl#getDummy()

-	 * @generated

-	 */

-	int DUMMY = 0;

-

-	/**

-	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for data type '<em>Dummy</em>'.

-	 * @see java.lang.String

-	 * @model instanceClass="java.lang.String"

-	 * @generated

-	 */

-	EDataType getDummy();

-

-	/**

-	 * 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

-	 */

-	StatemachinesFactory getStatemachinesFactory();

-

-} // StatemachinesPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesFactoryImpl.java
deleted file mode 100644
index 7862f696c60..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesFactoryImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.statemachines.internal.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.sysml.statemachines.StatemachinesFactory;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class StatemachinesFactoryImpl extends EFactoryImpl implements StatemachinesFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static StatemachinesPackage getPackage() {

-		return StatemachinesPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static StatemachinesFactory init() {

-		try {

-			StatemachinesFactory theStatemachinesFactory = (StatemachinesFactory) EPackage.Registry.INSTANCE.getEFactory(StatemachinesPackage.eNS_URI);

-			if (theStatemachinesFactory != null) {

-				return theStatemachinesFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new StatemachinesFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StatemachinesFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

-		return super.convertToString(eDataType, instanceValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case StatemachinesPackage.DUMMY:

-			return convertDummyToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String) super.createFromString(eDataType, initialValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case StatemachinesPackage.DUMMY:

-			return createDummyFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StatemachinesPackage getStatemachinesPackage() {

-		return (StatemachinesPackage) getEPackage();

-	}

-

-} // StatemachinesFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesPackageImpl.java
deleted file mode 100644
index eaf3f3dab73..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/internal/impl/StatemachinesPackageImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.statemachines.internal.impl;

-

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesFactory;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class StatemachinesPackageImpl extends EPackageImpl implements StatemachinesPackage {

-

-	/**

-	 * <!-- 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 StatemachinesPackage#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 StatemachinesPackage init() {

-		if (isInited) {

-			return (StatemachinesPackage) EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StatemachinesPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI)

-				: UsecasesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theStatemachinesPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theUsecasesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theStatemachinesPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theUsecasesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theStatemachinesPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(StatemachinesPackage.eNS_URI, theStatemachinesPackage);

-		return theStatemachinesPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EDataType dummyEDataType = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.statemachines.StatemachinesPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private StatemachinesPackageImpl() {

-		super(eNS_URI, StatemachinesFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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 data types

-		dummyEDataType = createEDataType(DUMMY);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EDataType getDummy() {

-		return dummyEDataType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StatemachinesFactory getStatemachinesFactory() {

-		return (StatemachinesFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * 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);

-

-		// Initialize data types

-		initEDataType(dummyEDataType, String.class, "Dummy", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

-	}

-

-} // StatemachinesPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceFactoryImpl.java
deleted file mode 100644
index cdb32d84587..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceFactoryImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.statemachines.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.sysml.statemachines.util.StatemachinesResourceImpl

- * @generated

- */

-public class StatemachinesResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StatemachinesResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new StatemachinesResourceImpl(uri);

-		return result;

-	}

-

-} // StatemachinesResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceImpl.java
deleted file mode 100644
index a35223abb88..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.statemachines.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.sysml.statemachines.util.StatemachinesResourceFactoryImpl

- * @generated

- */

-public class StatemachinesResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public StatemachinesResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // StatemachinesResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesXMLProcessor.java
deleted file mode 100644
index 43f411aeefa..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/statemachines/util/StatemachinesXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.statemachines.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.sysml.statemachines.StatemachinesPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class StatemachinesXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StatemachinesXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		StatemachinesPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the StatemachinesResourceFactoryImpl 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 StatemachinesResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new StatemachinesResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // StatemachinesXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesFactory.java
deleted file mode 100644
index ee22d425c4e..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.usecases;

-

-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.sysml.usecases.UsecasesPackage

- * @generated

- */

-public interface UsecasesFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	UsecasesFactory eINSTANCE = org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesFactoryImpl.init();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	UsecasesPackage getUsecasesPackage();

-

-} // UsecasesFactory

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesPackage.java
deleted file mode 100644
index 858cbfce912..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/UsecasesPackage.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.usecases;

-

-import org.eclipse.emf.ecore.EDataType;

-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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.sysml.usecases.UsecasesFactory

- * @model kind="package"

- * @generated

- */

-public interface UsecasesPackage extends EPackage {

-

-	/**

-	 * <!-- 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 '<em>Dummy</em>' data type. <!--

-		 * begin-user-doc --> <!-- end-user-doc -->

-		 *

-		 * @see java.lang.String

-		 * @see org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl#getDummy()

-		 * @generated

-		 */

-		EDataType DUMMY = eINSTANCE.getDummy();

-

-	}

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "usecases";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/SysML/UseCases";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "UseCases";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	UsecasesPackage eINSTANCE = org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl.init();

-

-	/**

-	 * The meta object id for the '<em>Dummy</em>' data type. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see java.lang.String

-	 * @see org.eclipse.papyrus.sysml.usecases.internal.impl.UsecasesPackageImpl#getDummy()

-	 * @generated

-	 */

-	int DUMMY = 0;

-

-	/**

-	 * Returns the meta object for data type '{@link java.lang.String <em>Dummy</em>}'.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @return the meta object for data type '<em>Dummy</em>'.

-	 * @see java.lang.String

-	 * @model instanceClass="java.lang.String"

-	 * @generated

-	 */

-	EDataType getDummy();

-

-	/**

-	 * 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

-	 */

-	UsecasesFactory getUsecasesFactory();

-

-} // UsecasesPackage

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesFactoryImpl.java
deleted file mode 100644
index 65801a38170..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesFactoryImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.usecases.internal.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.sysml.usecases.UsecasesFactory;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class UsecasesFactoryImpl extends EFactoryImpl implements UsecasesFactory {

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static UsecasesPackage getPackage() {

-		return UsecasesPackage.eINSTANCE;

-	}

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static UsecasesFactory init() {

-		try {

-			UsecasesFactory theUsecasesFactory = (UsecasesFactory) EPackage.Registry.INSTANCE.getEFactory(UsecasesPackage.eNS_URI);

-			if (theUsecasesFactory != null) {

-				return theUsecasesFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new UsecasesFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UsecasesFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertDummyToString(EDataType eDataType, Object instanceValue) {

-		return super.convertToString(eDataType, instanceValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case UsecasesPackage.DUMMY:

-			return convertDummyToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String createDummyFromString(EDataType eDataType, String initialValue) {

-		return (String) super.createFromString(eDataType, initialValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case UsecasesPackage.DUMMY:

-			return createDummyFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UsecasesPackage getUsecasesPackage() {

-		return (UsecasesPackage) getEPackage();

-	}

-

-} // UsecasesFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesPackageImpl.java
deleted file mode 100644
index 09bdd3bbbc8..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/internal/impl/UsecasesPackageImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.usecases.internal.impl;

-

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.sysml.SysmlPackage;

-import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.internal.impl.ActivitiesPackageImpl;

-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

-import org.eclipse.papyrus.sysml.allocations.internal.impl.AllocationsPackageImpl;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.blocks.internal.impl.BlocksPackageImpl;

-import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintsPackageImpl;

-import org.eclipse.papyrus.sysml.interactions.InteractionsPackage;

-import org.eclipse.papyrus.sysml.interactions.internal.impl.InteractionsPackageImpl;

-import org.eclipse.papyrus.sysml.internal.impl.SysmlPackageImpl;

-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

-import org.eclipse.papyrus.sysml.modelelements.internal.impl.ModelelementsPackageImpl;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.papyrus.sysml.portandflows.internal.impl.PortandflowsPackageImpl;

-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

-import org.eclipse.papyrus.sysml.requirements.internal.impl.RequirementsPackageImpl;

-import org.eclipse.papyrus.sysml.statemachines.StatemachinesPackage;

-import org.eclipse.papyrus.sysml.statemachines.internal.impl.StatemachinesPackageImpl;

-import org.eclipse.papyrus.sysml.usecases.UsecasesFactory;

-import org.eclipse.papyrus.sysml.usecases.UsecasesPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-

-/**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

- *

- * @generated

- */

-public class UsecasesPackageImpl extends EPackageImpl implements UsecasesPackage {

-

-	/**

-	 * <!-- 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 UsecasesPackage#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 UsecasesPackage init() {

-		if (isInited) {

-			return (UsecasesPackage) EPackage.Registry.INSTANCE.getEPackage(UsecasesPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		UsecasesPackageImpl theUsecasesPackage = (UsecasesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UsecasesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UsecasesPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		StandardPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		SysmlPackageImpl theSysmlPackage = (SysmlPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) instanceof SysmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SysmlPackage.eNS_URI) : SysmlPackage.eINSTANCE);

-		ModelelementsPackageImpl theModelelementsPackage = (ModelelementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ModelelementsPackage.eNS_URI) instanceof ModelelementsPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ModelelementsPackage.eNS_URI) : ModelelementsPackage.eINSTANCE);

-		BlocksPackageImpl theBlocksPackage = (BlocksPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) instanceof BlocksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI) : BlocksPackage.eINSTANCE);

-		PortandflowsPackageImpl thePortandflowsPackage = (PortandflowsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI) instanceof PortandflowsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PortandflowsPackage.eNS_URI)

-				: PortandflowsPackage.eINSTANCE);

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-		ActivitiesPackageImpl theActivitiesPackage = (ActivitiesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI) instanceof ActivitiesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ActivitiesPackage.eNS_URI)

-				: ActivitiesPackage.eINSTANCE);

-		AllocationsPackageImpl theAllocationsPackage = (AllocationsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI) instanceof AllocationsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(AllocationsPackage.eNS_URI)

-				: AllocationsPackage.eINSTANCE);

-		RequirementsPackageImpl theRequirementsPackage = (RequirementsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI) instanceof RequirementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI)

-				: RequirementsPackage.eINSTANCE);

-		InteractionsPackageImpl theInteractionsPackage = (InteractionsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI) instanceof InteractionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(InteractionsPackage.eNS_URI)

-				: InteractionsPackage.eINSTANCE);

-		StatemachinesPackageImpl theStatemachinesPackage = (StatemachinesPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StatemachinesPackage.eNS_URI) instanceof StatemachinesPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(StatemachinesPackage.eNS_URI) : StatemachinesPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theUsecasesPackage.createPackageContents();

-		theSysmlPackage.createPackageContents();

-		theModelelementsPackage.createPackageContents();

-		theBlocksPackage.createPackageContents();

-		thePortandflowsPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-		theActivitiesPackage.createPackageContents();

-		theAllocationsPackage.createPackageContents();

-		theRequirementsPackage.createPackageContents();

-		theInteractionsPackage.createPackageContents();

-		theStatemachinesPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theUsecasesPackage.initializePackageContents();

-		theSysmlPackage.initializePackageContents();

-		theModelelementsPackage.initializePackageContents();

-		theBlocksPackage.initializePackageContents();

-		thePortandflowsPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-		theActivitiesPackage.initializePackageContents();

-		theAllocationsPackage.initializePackageContents();

-		theRequirementsPackage.initializePackageContents();

-		theInteractionsPackage.initializePackageContents();

-		theStatemachinesPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theUsecasesPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(UsecasesPackage.eNS_URI, theUsecasesPackage);

-		return theUsecasesPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EDataType dummyEDataType = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * 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.sysml.usecases.UsecasesPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private UsecasesPackageImpl() {

-		super(eNS_URI, UsecasesFactory.eINSTANCE);

-	}

-

-	/**

-	 * 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 data types

-		dummyEDataType = createEDataType(DUMMY);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EDataType getDummy() {

-		return dummyEDataType;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UsecasesFactory getUsecasesFactory() {

-		return (UsecasesFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * 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);

-

-		// Initialize data types

-		initEDataType(dummyEDataType, String.class, "Dummy", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

-	}

-

-} // UsecasesPackageImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceFactoryImpl.java
deleted file mode 100644
index 44b027f4b3a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceFactoryImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.usecases.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.sysml.usecases.util.UsecasesResourceImpl

- * @generated

- */

-public class UsecasesResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UsecasesResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new UsecasesResourceImpl(uri);

-		return result;

-	}

-

-} // UsecasesResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceImpl.java
deleted file mode 100644
index 8b7557945cf..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.usecases.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.sysml.usecases.util.UsecasesResourceFactoryImpl

- * @generated

- */

-public class UsecasesResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public UsecasesResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // UsecasesResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesXMLProcessor.java
deleted file mode 100644
index 14563fb224f..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/usecases/util/UsecasesXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.usecases.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.sysml.usecases.UsecasesPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class UsecasesXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public UsecasesXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		UsecasesPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the UsecasesResourceFactoryImpl 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 UsecasesResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new UsecasesResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // UsecasesXMLProcessor

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
deleted file mode 100644
index a62a851f321..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/ElementUtil.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-@Deprecated
-public class ElementUtil {
-
-	/**
-	 * Check if the StereotypedElement has the given stereotype, or if one of
-	 * its stereotype is inherits from the stereotype passed in parameter. This
-	 * method currently exists in UMLUtils, this one is a copy created to avoid
-	 * some dependencies propagated by UMLUtils (jface...). Current UMLUtils
-	 * plug-in should probably be separated into two parts one depending on UML2
-	 * plug-in only, and the other bringing ui related features;
-	 *
-	 * @deprecated prefer using {@link UMLUtil#getStereotypeApplication(Element, Class)}
-	 */
-	@Deprecated
-	public static EObject hasStereotype(Element elt, EClass stereotypeClass) {
-		return UMLUtil.getStereotypeApplication(elt, stereotypeClass.getClass());
-	}
-
-	/**
-	 * Convenient method to retrieve the StereotypeApplication by passing an
-	 * element of the static profile.
-	 *
-	 * @deprecated prefer using {@link UMLUtil#getStereotypeApplication(Element, Class)}
-	 */
-	@Deprecated
-	public static <T extends EObject> T getStereotypeApplication(Element element, java.lang.Class<T> clazz) {
-		return UMLUtil.getStereotypeApplication(element, clazz);
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResource.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResource.java
deleted file mode 100644
index e0b8514a990..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResource.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.util;

-

-import org.eclipse.papyrus.sysml.SysmlPackage;

-

-/**

- * For all deprecated : use org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication

- * Ex :

- * replace appliedStereotype =

- * connectorEnd.getAppliedStereotype("SysML::Blocks::NestedConnectorEnd");connectorEnd.getStereotypeApplication(appliedStereotype);

- * by org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(element, NestedConnectorEnd.class);

- */

-public class SysmlResource {

-

-	public static final String LIBRARIES_PATHMAP = "pathmap://SysML_LIBRARIES/"; //$NON-NLS-1$

-

-	public static final String SYSML_PRIMITIVE_TYPES_LIBRARY_URI = LIBRARIES_PATHMAP + "SysMLPrimitiveTypes.uml"; //$NON-NLS-1$

-

-	public static final String PROFILES_PATHMAP = "pathmap://SysML_PROFILES/"; //$NON-NLS-1$

-

-	public static final String SYSML_PROFILE_NS_URI = SysmlPackage.eNS_URI;

-

-	public static final String SYSML_PROFILE_URI = PROFILES_PATHMAP + "SysML.profile.uml"; //$NON-NLS-1$

-

-

-	// Stereotypes ids

-	@Deprecated

-	public static String CONFORM_ID = "SysML::ModelElements::Conform";

-

-	@Deprecated

-	public static String VIEW_ID = "SysML::ModelElements::View";

-

-	@Deprecated

-	public static String VIEW_POINT_ID = "SysML::ModelElements::ViewPoint";

-

-	/**

-	 * @deprecated use VIEW_POINT_ID instead

-	 */

-	@Deprecated

-	public static String VIEWPOINT_ID = VIEW_POINT_ID;

-

-	@Deprecated

-	public static String RATIONALE_ID = "SysML::ModelElements::Rationale";

-

-	@Deprecated

-	public static String PROBLEM_ID = "SysML::ModelElements::Problem";

-

-	@Deprecated

-	public static String BLOCK_ID = "SysML::Blocks::Block";

-

-	@Deprecated

-	public static String DISTRIBUTED_PROPERTY_ID = "SysML::Blocks::DistributedProperty";

-

-	@Deprecated

-	public static String DIMENSION_ID = "SysML::Blocks::Dimension";

-

-	@Deprecated

-	public static String UNIT_ID = "SysML::Blocks::Unit";

-

-	@Deprecated

-	public static String VALUE_TYPE_ID = "SysML::Blocks::ValueType";

-

-	@Deprecated

-	public static String NESTED_CONNECTOR_END_ID = "SysML::Blocks::NestedConnectorEnd";

-

-	/** @deprecated use NESTED_CONNECTOR_END_ID instead */

-	@Deprecated

-	public static String NESTED_CONNECTOREND_ID = NESTED_CONNECTOR_END_ID;

-

-	@Deprecated

-	public static String PARTICIPANT_PROPERTY_ID = "SysML::Blocks::ParticipantProperty";

-

-	@Deprecated

-	public static String CONNECTOR_PROPERTY_ID = "SysML::Blocks::ConnectorProperty";

-

-	@Deprecated

-	public static String BINDING_CONNECTOR_ID = "SysML::Blocks::BindingConnector";

-

-	@Deprecated

-	public static String PROPERTY_SPECIFIC_TYPE_ID = "SysML::Blocks::PropertySpecificType";

-

-	@Deprecated

-	public static String FLOW_PORT_ID = "SysML::PortAndFlows::FlowPort";

-

-	@Deprecated

-	public static String FLOW_PROPERTY_ID = "SysML::PortAndFlows::FlowProperty";

-

-	@Deprecated

-	public static String FLOW_SPECIFICATION_ID = "SysML::PortAndFlows::FlowSpecification";

-

-	@Deprecated

-	public static String ITEM_FLOW_ID = "SysML::PortAndFlows::ItemFlow";

-

-	@Deprecated

-	public static String CONSTRAINT_BLOCK_ID = "SysML::Constraints::ConstraintBlock";

-

-	@Deprecated

-	public static String CONSTRAINT_PROPERTY_ID = "SysML::Constraints::ConstraintProperty";

-

-	@Deprecated

-	public static String OPTIONAL_ID = "SysML::Activities::Optional";

-

-	@Deprecated

-	public static String RATE_ID = "SysML::Activities::Rate";

-

-	@Deprecated

-	public static String PROBABILITY_ID = "SysML::Activities::Probability";

-

-	@Deprecated

-	public static String CONTINUOUS_ID = "SysML::Activities::Continuous";

-

-	@Deprecated

-	public static String DISCRETE_ID = "SysML::Activities::Discrete";

-

-	@Deprecated

-	public static String CONTROL_OPERATOR_ID = "SysML::Activities::ControlOperator";

-

-	@Deprecated

-	public static String NO_BUFFER_ID = "SysML::Activities::NoBuffer";

-

-	@Deprecated

-	public static String OVERWRITE_ID = "SysML::Activities::Overwrite";

-

-	@Deprecated

-	public static String ALLOCATE_ID = "SysML::Allocations::Allocate";

-

-	@Deprecated

-	public static String ALLOCATED_ID = "SysML::Allocations::Allocated";

-

-	@Deprecated

-	public static String ALLOCATE_ACTIVITY_PARTITION_ID = "SysML::Allocations::AllocateActivityPartition";

-

-	@Deprecated

-	public static String DERIVE_REQT_ID = "SysML::Requirements::DeriveReqt";

-

-	@Deprecated

-	public static String VERIFY_ID = "SysML::Requirements::Verify";

-

-	@Deprecated

-	public static String COPY_ID = "SysML::Requirements::Copy";

-

-	@Deprecated

-	public static String SATISFY_ID = "SysML::Requirements::Satisfy";

-

-	@Deprecated

-	public static String TEST_CASE_ID = "SysML::Requirements::TestCase";

-

-	@Deprecated

-	public static String REQUIREMENT_ID = "SysML::Requirements::Requirement";

-

-	@Deprecated

-	public static String REQUIREMENT_RELATED_ID = "SysML::Requirements::RequirementRelated";

-

-	// SubProfiles ids

-	@Deprecated

-	public static String SYSML_ID = "SysML";

-

-	@Deprecated

-	public static String MODEL_ELEMENTS_ID = "SysML::ModelElements";

-

-	@Deprecated

-	public static String BLOCKS_ID = "SysML::Blocks";

-

-	@Deprecated

-	public static String PORT_AND_FLOWS_ID = "SysML::PortAndFlows";

-

-	@Deprecated

-	public static String CONSTRAINTS_ID = "SysML::Constraints";

-

-	@Deprecated

-	public static String ACTIVITIES_ID = "SysML::Activities";

-

-	@Deprecated

-	public static String ALLOCATIONS_ID = "SysML::Allocations";

-

-	@Deprecated

-	public static String REQUIREMENTS_ID = "SysML::Requirements";

-

-	// stereotype properties ids

-	// requirements properties

-	@Deprecated

-	public static String REQUIREMENT_BASE_CLASS_ID = "base_Class"; //$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_DERIVED_ID = "derived"; //$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_DERIVED_FROM_ID = "derivedFrom";//$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_ID_ID = "id";//$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_MASTER_ID = "master";//$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_REFINED_BY_ID = "refinedBy";//$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_SATISFIED_BY_ID = "satisfiedBy";//$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_TEXT_ID = "text";//$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_TRACED_TO_ID = "tracedTo";//$NON-NLS-1$

-

-	@Deprecated

-	public static String REQUIREMENT_VERIFIED_BY_ID = "verifiedBy";//$NON-NLS-1$

-

-}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceFactoryImpl.java
deleted file mode 100644
index b016daa3233..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceFactoryImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.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.sysml.util.SysmlResourceImpl

- * @generated

- */

-public class SysmlResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SysmlResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new SysmlResourceImpl(uri);

-		return result;

-	}

-

-} // SysmlResourceFactoryImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceImpl.java
deleted file mode 100644
index 16734d1af82..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.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.sysml.util.SysmlResourceFactoryImpl

- * @generated

- */

-public class SysmlResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public SysmlResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // SysmlResourceImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlXMLProcessor.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlXMLProcessor.java
deleted file mode 100644
index 47aad158763..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/util/SysmlXMLProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.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.sysml.SysmlPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc --> <!-- end-user-doc -->

- *

- * @generated

- */

-public class SysmlXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SysmlXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		SysmlPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the SysmlResourceFactoryImpl 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 SysmlResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new SysmlResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // SysmlXMLProcessor

diff --git a/plugins/sysml/pom.xml b/plugins/sysml/pom.xml
deleted file mode 100644
index f851e26a27f..00000000000
--- a/plugins/sysml/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.sysml</artifactId>
-	<packaging>pom</packaging>
-	<version>0.0.1-SNAPSHOT</version>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../releng/extra</relativePath>
-    </parent>
-	<name>Papyrus SysML</name>
-	<description>Top container of the Papyrus SysML 1.1 modeler</description>
-
-	<modules>
-		<module>architecture</module>
-		<module>diagram</module>
-		<module>modelexplorer</module>
-		<module>nattable</module>
-		<module>org.eclipse.papyrus.sysml</module>
-		<module>org.eclipse.papyrus.sysml.edit</module>
-		<module>org.eclipse.papyrus.sysml.service.types</module>
-		<module>properties</module>
-	</modules>
-</project>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.classpath b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.classpath
deleted file mode 100644
index 9d5026e8ffd..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.project b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.project
deleted file mode 100644
index 620558ae391..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.sysml.properties</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>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.pde.api.tools.prefs b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
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
deleted file mode 100644
index 237c58bb368..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.sysml.properties.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.properties;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/SysML.ctx b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/SysML.ctx
deleted file mode 100644
index 7f847bee4dd..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/SysML.ctx
+++ /dev/null
@@ -1,759 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_dm3VYMNaEeS3R6PXxQ7txw" name="SysML">

-  <dependencies href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_69QJkKDJEeSZxfCXzZz3-w"/>

-  <tabs xmi:id="_dm3VYcNaEeS3R6PXxQ7txw" label="SysML" id="basicTabSysML" category="org.eclipse.papyrus" priority="20">

-    <sections xmi:id="_dm3VYsNaEeS3R6PXxQ7txw" name="SingleConform" sectionFile="ui/SingleConform.xwt">

-      <widget href="ui/SingleConform.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm3VY8NaEeS3R6PXxQ7txw" name="MultipleConform" sectionFile="ui/MultipleConform.xwt">

-      <widget href="ui/MultipleConform.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38cMNaEeS3R6PXxQ7txw" name="SingleView" sectionFile="ui/SingleView.xwt">

-      <widget href="ui/SingleView.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38ccNaEeS3R6PXxQ7txw" name="MultipleView" sectionFile="ui/MultipleView.xwt">

-      <widget href="ui/MultipleView.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38csNaEeS3R6PXxQ7txw" name="SingleViewPoint" sectionFile="ui/SingleViewPoint.xwt">

-      <widget href="ui/SingleViewPoint.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38c8NaEeS3R6PXxQ7txw" name="MultipleViewPoint" sectionFile="ui/MultipleViewPoint.xwt">

-      <widget href="ui/MultipleViewPoint.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38dMNaEeS3R6PXxQ7txw" name="SingleBlock" sectionFile="ui/SingleBlock.xwt">

-      <widget href="ui/SingleBlock.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38dcNaEeS3R6PXxQ7txw" name="MultipleBlock" sectionFile="ui/MultipleBlock.xwt">

-      <widget href="ui/MultipleBlock.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38dsNaEeS3R6PXxQ7txw" name="SingleDistributedProperty" sectionFile="ui/SingleDistributedProperty.xwt">

-      <widget href="ui/SingleDistributedProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38d8NaEeS3R6PXxQ7txw" name="MultipleDistributedProperty" sectionFile="ui/MultipleDistributedProperty.xwt">

-      <widget href="ui/MultipleDistributedProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38eMNaEeS3R6PXxQ7txw" name="SingleDimension" sectionFile="ui/SingleDimension.xwt">

-      <widget href="ui/SingleDimension.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38ecNaEeS3R6PXxQ7txw" name="MultipleDimension" sectionFile="ui/MultipleDimension.xwt">

-      <widget href="ui/MultipleDimension.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm38esNaEeS3R6PXxQ7txw" name="SingleUnit" sectionFile="ui/SingleUnit.xwt">

-      <widget href="ui/SingleUnit.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jgMNaEeS3R6PXxQ7txw" name="MultipleUnit" sectionFile="ui/MultipleUnit.xwt">

-      <widget href="ui/MultipleUnit.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jgcNaEeS3R6PXxQ7txw" name="SingleValueType" sectionFile="ui/SingleValueType.xwt">

-      <widget href="ui/SingleValueType.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jgsNaEeS3R6PXxQ7txw" name="MultipleValueType" sectionFile="ui/MultipleValueType.xwt">

-      <widget href="ui/MultipleValueType.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jg8NaEeS3R6PXxQ7txw" name="SingleNestedConnectorEnd" sectionFile="ui/SingleNestedConnectorEnd.xwt">

-      <widget href="ui/SingleNestedConnectorEnd.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jhMNaEeS3R6PXxQ7txw" name="MultipleNestedConnectorEnd" sectionFile="ui/MultipleNestedConnectorEnd.xwt">

-      <widget href="ui/MultipleNestedConnectorEnd.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jhcNaEeS3R6PXxQ7txw" name="SingleParticipantProperty" sectionFile="ui/SingleParticipantProperty.xwt">

-      <widget href="ui/SingleParticipantProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jhsNaEeS3R6PXxQ7txw" name="MultipleParticipantProperty" sectionFile="ui/MultipleParticipantProperty.xwt">

-      <widget href="ui/MultipleParticipantProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jh8NaEeS3R6PXxQ7txw" name="SingleConnectorProperty" sectionFile="ui/SingleConnectorProperty.xwt">

-      <widget href="ui/SingleConnectorProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jiMNaEeS3R6PXxQ7txw" name="MultipleConnectorProperty" sectionFile="ui/MultipleConnectorProperty.xwt">

-      <widget href="ui/MultipleConnectorProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm4jicNaEeS3R6PXxQ7txw" name="SingleBindingConnector" sectionFile="ui/SingleBindingConnector.xwt">

-      <widget href="ui/SingleBindingConnector.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KkMNaEeS3R6PXxQ7txw" name="MultipleBindingConnector" sectionFile="ui/MultipleBindingConnector.xwt">

-      <widget href="ui/MultipleBindingConnector.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KkcNaEeS3R6PXxQ7txw" name="SinglePropertySpecificType" sectionFile="ui/SinglePropertySpecificType.xwt">

-      <widget href="ui/SinglePropertySpecificType.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KksNaEeS3R6PXxQ7txw" name="MultiplePropertySpecificType" sectionFile="ui/MultiplePropertySpecificType.xwt">

-      <widget href="ui/MultiplePropertySpecificType.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5Kk8NaEeS3R6PXxQ7txw" name="SingleFlowPort" sectionFile="ui/SingleFlowPort.xwt">

-      <widget href="ui/SingleFlowPort.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KlMNaEeS3R6PXxQ7txw" name="MultipleFlowPort" sectionFile="ui/MultipleFlowPort.xwt">

-      <widget href="ui/MultipleFlowPort.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KlcNaEeS3R6PXxQ7txw" name="SingleFlowProperty" sectionFile="ui/SingleFlowProperty.xwt">

-      <widget href="ui/SingleFlowProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KlsNaEeS3R6PXxQ7txw" name="MultipleFlowProperty" sectionFile="ui/MultipleFlowProperty.xwt">

-      <widget href="ui/MultipleFlowProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5Kl8NaEeS3R6PXxQ7txw" name="SingleFlowSpecification" sectionFile="ui/SingleFlowSpecification.xwt">

-      <widget href="ui/SingleFlowSpecification.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KmMNaEeS3R6PXxQ7txw" name="MultipleFlowSpecification" sectionFile="ui/MultipleFlowSpecification.xwt">

-      <widget href="ui/MultipleFlowSpecification.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5KmcNaEeS3R6PXxQ7txw" name="SingleItemFlow" sectionFile="ui/SingleItemFlow.xwt">

-      <widget href="ui/SingleItemFlow.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xoMNaEeS3R6PXxQ7txw" name="MultipleItemFlow" sectionFile="ui/MultipleItemFlow.xwt">

-      <widget href="ui/MultipleItemFlow.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xocNaEeS3R6PXxQ7txw" name="SingleConstraintBlock" sectionFile="ui/SingleConstraintBlock.xwt">

-      <widget href="ui/SingleConstraintBlock.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xosNaEeS3R6PXxQ7txw" name="MultipleConstraintBlock" sectionFile="ui/MultipleConstraintBlock.xwt">

-      <widget href="ui/MultipleConstraintBlock.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xo8NaEeS3R6PXxQ7txw" name="SingleConstraintProperty" sectionFile="ui/SingleConstraintProperty.xwt">

-      <widget href="ui/SingleConstraintProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xpMNaEeS3R6PXxQ7txw" name="MultipleConstraintProperty" sectionFile="ui/MultipleConstraintProperty.xwt">

-      <widget href="ui/MultipleConstraintProperty.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xpcNaEeS3R6PXxQ7txw" name="SingleOptional" sectionFile="ui/SingleOptional.xwt">

-      <widget href="ui/SingleOptional.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xpsNaEeS3R6PXxQ7txw" name="MultipleOptional" sectionFile="ui/MultipleOptional.xwt">

-      <widget href="ui/MultipleOptional.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xp8NaEeS3R6PXxQ7txw" name="SingleRate" sectionFile="ui/SingleRate.xwt">

-      <widget href="ui/SingleRate.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xqMNaEeS3R6PXxQ7txw" name="MultipleRate" sectionFile="ui/MultipleRate.xwt">

-      <widget href="ui/MultipleRate.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xqcNaEeS3R6PXxQ7txw" name="SingleProbability" sectionFile="ui/SingleProbability.xwt">

-      <widget href="ui/SingleProbability.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm5xqsNaEeS3R6PXxQ7txw" name="MultipleProbability" sectionFile="ui/MultipleProbability.xwt">

-      <widget href="ui/MultipleProbability.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6YsMNaEeS3R6PXxQ7txw" name="SingleContinuous" sectionFile="ui/SingleContinuous.xwt">

-      <widget href="ui/SingleContinuous.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6YscNaEeS3R6PXxQ7txw" name="MultipleContinuous" sectionFile="ui/MultipleContinuous.xwt">

-      <widget href="ui/MultipleContinuous.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6YssNaEeS3R6PXxQ7txw" name="SingleDiscrete" sectionFile="ui/SingleDiscrete.xwt">

-      <widget href="ui/SingleDiscrete.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6Ys8NaEeS3R6PXxQ7txw" name="MultipleDiscrete" sectionFile="ui/MultipleDiscrete.xwt">

-      <widget href="ui/MultipleDiscrete.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6YtMNaEeS3R6PXxQ7txw" name="SingleControlOperator" sectionFile="ui/SingleControlOperator.xwt">

-      <widget href="ui/SingleControlOperator.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6YtcNaEeS3R6PXxQ7txw" name="MultipleControlOperator" sectionFile="ui/MultipleControlOperator.xwt">

-      <widget href="ui/MultipleControlOperator.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6YtsNaEeS3R6PXxQ7txw" name="SingleNoBuffer" sectionFile="ui/SingleNoBuffer.xwt">

-      <widget href="ui/SingleNoBuffer.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6Yt8NaEeS3R6PXxQ7txw" name="MultipleNoBuffer" sectionFile="ui/MultipleNoBuffer.xwt">

-      <widget href="ui/MultipleNoBuffer.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6YuMNaEeS3R6PXxQ7txw" name="SingleOverwrite" sectionFile="ui/SingleOverwrite.xwt">

-      <widget href="ui/SingleOverwrite.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_wMNaEeS3R6PXxQ7txw" name="MultipleOverwrite" sectionFile="ui/MultipleOverwrite.xwt">

-      <widget href="ui/MultipleOverwrite.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_wcNaEeS3R6PXxQ7txw" name="SingleAllocate" sectionFile="ui/SingleAllocate.xwt">

-      <widget href="ui/SingleAllocate.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_wsNaEeS3R6PXxQ7txw" name="MultipleAllocate" sectionFile="ui/MultipleAllocate.xwt">

-      <widget href="ui/MultipleAllocate.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_w8NaEeS3R6PXxQ7txw" name="SingleAllocated" sectionFile="ui/SingleAllocated.xwt">

-      <widget href="ui/SingleAllocated.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_xMNaEeS3R6PXxQ7txw" name="MultipleAllocated" sectionFile="ui/MultipleAllocated.xwt">

-      <widget href="ui/MultipleAllocated.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_xcNaEeS3R6PXxQ7txw" name="SingleAllocateActivityPartition" sectionFile="ui/SingleAllocateActivityPartition.xwt">

-      <widget href="ui/SingleAllocateActivityPartition.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_xsNaEeS3R6PXxQ7txw" name="MultipleAllocateActivityPartition" sectionFile="ui/MultipleAllocateActivityPartition.xwt">

-      <widget href="ui/MultipleAllocateActivityPartition.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_x8NaEeS3R6PXxQ7txw" name="SingleTestCase" sectionFile="ui/SingleTestCase.xwt">

-      <widget href="ui/SingleTestCase.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_yMNaEeS3R6PXxQ7txw" name="MultipleTestCase" sectionFile="ui/MultipleTestCase.xwt">

-      <widget href="ui/MultipleTestCase.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm6_ycNaEeS3R6PXxQ7txw" name="SingleRequirement" sectionFile="ui/SingleRequirement.xwt">

-      <widget href="ui/SingleRequirement.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm7m0MNaEeS3R6PXxQ7txw" name="MultipleRequirement" sectionFile="ui/MultipleRequirement.xwt">

-      <widget href="ui/MultipleRequirement.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm7m0cNaEeS3R6PXxQ7txw" name="SingleRequirementRelated" sectionFile="ui/SingleRequirementRelated.xwt">

-      <widget href="ui/SingleRequirementRelated.xwt#/"/>

-    </sections>

-    <sections xmi:id="_dm7m0sNaEeS3R6PXxQ7txw" name="MultipleRequirementRelated" sectionFile="ui/MultipleRequirementRelated.xwt">

-      <widget href="ui/MultipleRequirementRelated.xwt#/"/>

-    </sections>

-  </tabs>

-  <views xmi:id="_dm7m08NaEeS3R6PXxQ7txw" name="SingleConform" sections="_dm3VYsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm7m1MNaEeS3R6PXxQ7txw" name="isSingleConform">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm7m1cNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::ModelElements::Conform"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm7m1sNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleConform" sections="_dm3VY8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm7m18NaEeS3R6PXxQ7txw" name="isMultipleConform">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm7m2MNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::ModelElements::Conform"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm7m2cNaEeS3R6PXxQ7txw" name="SingleView" sections="_dm38cMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm7m2sNaEeS3R6PXxQ7txw" name="isSingleView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm7m28NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::ModelElements::View"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm7m3MNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleView" sections="_dm38ccNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm7m3cNaEeS3R6PXxQ7txw" name="isMultipleView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm7m3sNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::ModelElements::View"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm8N4MNaEeS3R6PXxQ7txw" name="SingleViewPoint" sections="_dm38csNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm8N4cNaEeS3R6PXxQ7txw" name="isSingleViewPoint">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm8N4sNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::ModelElements::ViewPoint"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm8N48NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleViewPoint" sections="_dm38c8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm8N5MNaEeS3R6PXxQ7txw" name="isMultipleViewPoint">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm8N5cNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::ModelElements::ViewPoint"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm8N5sNaEeS3R6PXxQ7txw" name="SingleBlock" sections="_dm38dMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm8N58NaEeS3R6PXxQ7txw" name="isSingleBlock">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm8N6MNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::Block"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm8N6cNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleBlock" sections="_dm38dcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm8N6sNaEeS3R6PXxQ7txw" name="isMultipleBlock">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm8N68NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::Block"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm8N7MNaEeS3R6PXxQ7txw" name="SingleDistributedProperty" sections="_dm38dsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm8N7cNaEeS3R6PXxQ7txw" name="isSingleDistributedProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm8N7sNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::DistributedProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm8N78NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleDistributedProperty" sections="_dm38d8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm8N8MNaEeS3R6PXxQ7txw" name="isMultipleDistributedProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm8N8cNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::DistributedProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm808MNaEeS3R6PXxQ7txw" name="SingleDimension" sections="_dm38eMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm808cNaEeS3R6PXxQ7txw" name="isSingleDimension">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm808sNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::Dimension"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm8088NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleDimension" sections="_dm38ecNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm809MNaEeS3R6PXxQ7txw" name="isMultipleDimension">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm809cNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::Dimension"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm809sNaEeS3R6PXxQ7txw" name="SingleUnit" sections="_dm38esNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm8098NaEeS3R6PXxQ7txw" name="isSingleUnit">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm80-MNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::Unit"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm80-cNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleUnit" sections="_dm4jgMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm80-sNaEeS3R6PXxQ7txw" name="isMultipleUnit">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm80-8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::Unit"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm80_MNaEeS3R6PXxQ7txw" name="SingleValueType" sections="_dm4jgcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm80_cNaEeS3R6PXxQ7txw" name="isSingleValueType">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm80_sNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::ValueType"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm80_8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleValueType" sections="_dm4jgsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm81AMNaEeS3R6PXxQ7txw" name="isMultipleValueType">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm81AcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::ValueType"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm9cAMNaEeS3R6PXxQ7txw" name="SingleNestedConnectorEnd" sections="_dm4jg8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm9cAcNaEeS3R6PXxQ7txw" name="isSingleNestedConnectorEnd">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm9cAsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::NestedConnectorEnd"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm9cA8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleNestedConnectorEnd" sections="_dm4jhMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm9cBMNaEeS3R6PXxQ7txw" name="isMultipleNestedConnectorEnd">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm9cBcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::NestedConnectorEnd"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm9cBsNaEeS3R6PXxQ7txw" name="SingleParticipantProperty" sections="_dm4jhcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm9cB8NaEeS3R6PXxQ7txw" name="isSingleParticipantProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm9cCMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::ParticipantProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm9cCcNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleParticipantProperty" sections="_dm4jhsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm9cCsNaEeS3R6PXxQ7txw" name="isMultipleParticipantProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm9cC8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::ParticipantProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm9cDMNaEeS3R6PXxQ7txw" name="SingleConnectorProperty" sections="_dm4jh8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm9cDcNaEeS3R6PXxQ7txw" name="isSingleConnectorProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm9cDsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::ConnectorProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm9cD8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleConnectorProperty" sections="_dm4jiMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm9cEMNaEeS3R6PXxQ7txw" name="isMultipleConnectorProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm9cEcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::ConnectorProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-DEMNaEeS3R6PXxQ7txw" name="SingleBindingConnector" sections="_dm4jicNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-DEcNaEeS3R6PXxQ7txw" name="isSingleBindingConnector">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-DEsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::BindingConnector"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-DE8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleBindingConnector" sections="_dm5KkMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-DFMNaEeS3R6PXxQ7txw" name="isMultipleBindingConnector">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-DFcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::BindingConnector"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-DFsNaEeS3R6PXxQ7txw" name="SinglePropertySpecificType" sections="_dm5KkcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-DF8NaEeS3R6PXxQ7txw" name="isSinglePropertySpecificType">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-DGMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::PropertySpecificType"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-DGcNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultiplePropertySpecificType" sections="_dm5KksNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-DGsNaEeS3R6PXxQ7txw" name="isMultiplePropertySpecificType">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-DG8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Blocks::PropertySpecificType"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-DHMNaEeS3R6PXxQ7txw" name="SingleFlowPort" sections="_dm5Kk8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-DHcNaEeS3R6PXxQ7txw" name="isSingleFlowPort">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-DHsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::FlowPort"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-DH8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleFlowPort" sections="_dm5KlMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-DIMNaEeS3R6PXxQ7txw" name="isMultipleFlowPort">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-DIcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::FlowPort"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-DIsNaEeS3R6PXxQ7txw" name="SingleFlowProperty" sections="_dm5KlcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-qIMNaEeS3R6PXxQ7txw" name="isSingleFlowProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-qIcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::FlowProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-qIsNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleFlowProperty" sections="_dm5KlsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-qI8NaEeS3R6PXxQ7txw" name="isMultipleFlowProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-qJMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::FlowProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-qJcNaEeS3R6PXxQ7txw" name="SingleFlowSpecification" sections="_dm5Kl8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-qJsNaEeS3R6PXxQ7txw" name="isSingleFlowSpecification">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-qJ8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::FlowSpecification"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-qKMNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleFlowSpecification" sections="_dm5KmMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-qKcNaEeS3R6PXxQ7txw" name="isMultipleFlowSpecification">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-qKsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::FlowSpecification"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-qK8NaEeS3R6PXxQ7txw" name="SingleItemFlow" sections="_dm5KmcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-qLMNaEeS3R6PXxQ7txw" name="isSingleItemFlow">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-qLcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::ItemFlow"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-qLsNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleItemFlow" sections="_dm5xoMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm-qL8NaEeS3R6PXxQ7txw" name="isMultipleItemFlow">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm-qMMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::PortAndFlows::ItemFlow"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm-qMcNaEeS3R6PXxQ7txw" name="SingleConstraintBlock" sections="_dm5xocNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_RMMNaEeS3R6PXxQ7txw" name="isSingleConstraintBlock">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_RMcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Constraints::ConstraintBlock"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_RMsNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleConstraintBlock" sections="_dm5xosNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_RM8NaEeS3R6PXxQ7txw" name="isMultipleConstraintBlock">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_RNMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Constraints::ConstraintBlock"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_RNcNaEeS3R6PXxQ7txw" name="SingleConstraintProperty" sections="_dm5xo8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_RNsNaEeS3R6PXxQ7txw" name="isSingleConstraintProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_RN8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Constraints::ConstraintProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_ROMNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleConstraintProperty" sections="_dm5xpMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_ROcNaEeS3R6PXxQ7txw" name="isMultipleConstraintProperty">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_ROsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Constraints::ConstraintProperty"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_RO8NaEeS3R6PXxQ7txw" name="SingleOptional" sections="_dm5xpcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_RPMNaEeS3R6PXxQ7txw" name="isSingleOptional">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_RPcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Optional"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_RPsNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleOptional" sections="_dm5xpsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_RP8NaEeS3R6PXxQ7txw" name="isMultipleOptional">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_RQMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Optional"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_RQcNaEeS3R6PXxQ7txw" name="SingleRate" sections="_dm5xp8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_RQsNaEeS3R6PXxQ7txw" name="isSingleRate">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_4QMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Rate"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_4QcNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleRate" sections="_dm5xqMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_4QsNaEeS3R6PXxQ7txw" name="isMultipleRate">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_4Q8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Rate"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_4RMNaEeS3R6PXxQ7txw" name="SingleProbability" sections="_dm5xqcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_4RcNaEeS3R6PXxQ7txw" name="isSingleProbability">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_4RsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Probability"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_4R8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleProbability" sections="_dm5xqsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_4SMNaEeS3R6PXxQ7txw" name="isMultipleProbability">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_4ScNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Probability"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_4SsNaEeS3R6PXxQ7txw" name="SingleContinuous" sections="_dm6YsMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_4S8NaEeS3R6PXxQ7txw" name="isSingleContinuous">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_4TMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Continuous"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_4TcNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleContinuous" sections="_dm6YscNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_4TsNaEeS3R6PXxQ7txw" name="isMultipleContinuous">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dm_4T8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Continuous"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dm_4UMNaEeS3R6PXxQ7txw" name="SingleDiscrete" sections="_dm6YssNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dm_4UcNaEeS3R6PXxQ7txw" name="isSingleDiscrete">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnAfUMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Discrete"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnAfUcNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleDiscrete" sections="_dm6Ys8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnAfUsNaEeS3R6PXxQ7txw" name="isMultipleDiscrete">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnAfU8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Discrete"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnAfVMNaEeS3R6PXxQ7txw" name="SingleControlOperator" sections="_dm6YtMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnAfVcNaEeS3R6PXxQ7txw" name="isSingleControlOperator">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnAfVsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::ControlOperator"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnAfV8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleControlOperator" sections="_dm6YtcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnAfWMNaEeS3R6PXxQ7txw" name="isMultipleControlOperator">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnAfWcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::ControlOperator"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnAfWsNaEeS3R6PXxQ7txw" name="SingleNoBuffer" sections="_dm6YtsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnAfW8NaEeS3R6PXxQ7txw" name="isSingleNoBuffer">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnAfXMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::NoBuffer"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnAfXcNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleNoBuffer" sections="_dm6Yt8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnAfXsNaEeS3R6PXxQ7txw" name="isMultipleNoBuffer">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnAfX8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::NoBuffer"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBGYMNaEeS3R6PXxQ7txw" name="SingleOverwrite" sections="_dm6YuMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBGYcNaEeS3R6PXxQ7txw" name="isSingleOverwrite">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBGYsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Overwrite"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBGY8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleOverwrite" sections="_dm6_wMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBGZMNaEeS3R6PXxQ7txw" name="isMultipleOverwrite">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBGZcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Activities::Overwrite"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBGZsNaEeS3R6PXxQ7txw" name="SingleAllocate" sections="_dm6_wcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBGZ8NaEeS3R6PXxQ7txw" name="isSingleAllocate">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBGaMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Allocations::Allocate"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBGacNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleAllocate" sections="_dm6_wsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBGasNaEeS3R6PXxQ7txw" name="isMultipleAllocate">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBGa8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Allocations::Allocate"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBGbMNaEeS3R6PXxQ7txw" name="SingleAllocated" sections="_dm6_w8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBGbcNaEeS3R6PXxQ7txw" name="isSingleAllocated">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBGbsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Allocations::Allocated"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBGb8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleAllocated" sections="_dm6_xMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBtcMNaEeS3R6PXxQ7txw" name="isMultipleAllocated">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBtccNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Allocations::Allocated"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBtcsNaEeS3R6PXxQ7txw" name="SingleAllocateActivityPartition" sections="_dm6_xcNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBtc8NaEeS3R6PXxQ7txw" name="isSingleAllocateActivityPartition">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBtdMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Allocations::AllocateActivityPartition"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBtdcNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleAllocateActivityPartition" sections="_dm6_xsNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBtdsNaEeS3R6PXxQ7txw" name="isMultipleAllocateActivityPartition">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBtd8NaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Allocations::AllocateActivityPartition"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBteMNaEeS3R6PXxQ7txw" name="SingleTestCase" sections="_dm6_x8NaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBtecNaEeS3R6PXxQ7txw" name="isSingleTestCase">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBtesNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Requirements::TestCase"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBte8NaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleTestCase" sections="_dm6_yMNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBtfMNaEeS3R6PXxQ7txw" name="isMultipleTestCase">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBtfcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Requirements::TestCase"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnBtfsNaEeS3R6PXxQ7txw" name="SingleRequirement" sections="_dm6_ycNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnBtf8NaEeS3R6PXxQ7txw" name="isSingleRequirement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnBtgMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Requirements::Requirement"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnCUgMNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleRequirement" sections="_dm7m0MNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnCUgcNaEeS3R6PXxQ7txw" name="isMultipleRequirement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnCUgsNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Requirements::Requirement"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnCUg8NaEeS3R6PXxQ7txw" name="SingleRequirementRelated" sections="_dm7m0cNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnCUhMNaEeS3R6PXxQ7txw" name="isSingleRequirementRelated">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnCUhcNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Requirements::RequirementRelated"/>

-    </constraints>

-  </views>

-  <views xmi:id="_dnCUhsNaEeS3R6PXxQ7txw" elementMultiplicity="-1" name="MultipleRequirementRelated" sections="_dm7m0sNaEeS3R6PXxQ7txw" automaticContext="true">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_dnCUh8NaEeS3R6PXxQ7txw" name="isMultipleRequirementRelated">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_dnCUiMNaEeS3R6PXxQ7txw" name="stereotypeName" value="SysML::Requirements::RequirementRelated"/>

-    </constraints>

-  </views>

-  <dataContexts xmi:id="_dnCUicNaEeS3R6PXxQ7txw" name="SysML" label="SysML">

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnCUisNaEeS3R6PXxQ7txw" name="Activities">

-      <elements xmi:id="_dnCUi8NaEeS3R6PXxQ7txw" name="Continuous" supertypes="_dnC7kMNaEeS3R6PXxQ7txw"/>

-      <elements xmi:id="_dnCUjMNaEeS3R6PXxQ7txw" name="Discrete" supertypes="_dnC7kMNaEeS3R6PXxQ7txw"/>

-      <elements xmi:id="_dnCUjcNaEeS3R6PXxQ7txw" name="NoBuffer">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.116"/>

-      </elements>

-      <elements xmi:id="_dnCUjsNaEeS3R6PXxQ7txw" name="Overwrite">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.116"/>

-      </elements>

-      <elements xmi:id="_dnCUj8NaEeS3R6PXxQ7txw" name="Probability">

-        <properties xmi:id="_dnCUkMNaEeS3R6PXxQ7txw" name="probability" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.112"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.72"/>

-      </elements>

-      <elements xmi:id="_dnC7kMNaEeS3R6PXxQ7txw" name="Rate">

-        <properties xmi:id="_dnC7kcNaEeS3R6PXxQ7txw" name="rate" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.112"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.31"/>

-      </elements>

-      <elements xmi:id="_dnC7ksNaEeS3R6PXxQ7txw" name="ControlOperator">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.42"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.44"/>

-      </elements>

-      <elements xmi:id="_dnC7k8NaEeS3R6PXxQ7txw" name="Optional">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.31"/>

-      </elements>

-    </elements>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnC7lMNaEeS3R6PXxQ7txw" name="PortAndFlows">

-      <elements xmi:id="_dnC7lcNaEeS3R6PXxQ7txw" name="FlowSpecification">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.48"/>

-      </elements>

-      <elements xmi:id="_dnC7lsNaEeS3R6PXxQ7txw" name="FlowProperty">

-        <properties xmi:id="_dnC7l8NaEeS3R6PXxQ7txw" name="direction" type="Enumeration"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.35"/>

-      </elements>

-      <elements xmi:id="_dnC7mMNaEeS3R6PXxQ7txw" name="FlowPort">

-        <properties xmi:id="_dnC7mcNaEeS3R6PXxQ7txw" name="isAtomic" type="Boolean"/>

-        <properties xmi:id="_dnC7msNaEeS3R6PXxQ7txw" name="direction" type="Enumeration"/>

-        <properties xmi:id="_dnC7m8NaEeS3R6PXxQ7txw" name="isConjugated" type="Boolean"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.58"/>

-      </elements>

-      <elements xmi:id="_dnC7nMNaEeS3R6PXxQ7txw" name="ItemFlow">

-        <properties xmi:id="_dnC7ncNaEeS3R6PXxQ7txw" name="itemProperty" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.224"/>

-      </elements>

-    </elements>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnC7nsNaEeS3R6PXxQ7txw" name="Blocks">

-      <elements xmi:id="_dnC7n8NaEeS3R6PXxQ7txw" name="Dimension">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.92"/>

-      </elements>

-      <elements xmi:id="_dnC7oMNaEeS3R6PXxQ7txw" name="Unit">

-        <properties xmi:id="_dnC7ocNaEeS3R6PXxQ7txw" name="dimension" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.92"/>

-      </elements>

-      <elements xmi:id="_dnC7osNaEeS3R6PXxQ7txw" name="DistributedProperty">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.35"/>

-      </elements>

-      <elements xmi:id="_dnDioMNaEeS3R6PXxQ7txw" name="Block">

-        <properties xmi:id="_dnDiocNaEeS3R6PXxQ7txw" name="isEncapsulated" type="Boolean"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.45"/>

-      </elements>

-      <elements xmi:id="_dnDiosNaEeS3R6PXxQ7txw" name="ValueType">

-        <properties xmi:id="_dnDio8NaEeS3R6PXxQ7txw" name="dimension" type="Reference"/>

-        <properties xmi:id="_dnDipMNaEeS3R6PXxQ7txw" name="unit" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.73"/>

-      </elements>

-      <elements xmi:id="_dnDipcNaEeS3R6PXxQ7txw" name="ParticipantProperty">

-        <properties xmi:id="_dnDipsNaEeS3R6PXxQ7txw" name="end" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.35"/>

-      </elements>

-      <elements xmi:id="_dnDip8NaEeS3R6PXxQ7txw" name="NestedConnectorEnd">

-        <properties xmi:id="_dnDiqMNaEeS3R6PXxQ7txw" name="propertyPath" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.34"/>

-      </elements>

-      <elements xmi:id="_dnDiqcNaEeS3R6PXxQ7txw" name="PropertySpecificType">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.16"/>

-      </elements>

-      <elements xmi:id="_dnDiqsNaEeS3R6PXxQ7txw" name="ConnectorProperty">

-        <properties xmi:id="_dnDiq8NaEeS3R6PXxQ7txw" name="connector" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.35"/>

-      </elements>

-      <elements xmi:id="_dnDirMNaEeS3R6PXxQ7txw" name="BindingConnector">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.65"/>

-      </elements>

-    </elements>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnDircNaEeS3R6PXxQ7txw" name="Requirements">

-      <elements xmi:id="_dnDirsNaEeS3R6PXxQ7txw" name="Requirement">

-        <properties xmi:id="_dnDir8NaEeS3R6PXxQ7txw" name="satisfiedBy" type="Reference"/>

-        <properties xmi:id="_dnDisMNaEeS3R6PXxQ7txw" name="verifiedBy" type="Reference"/>

-        <properties xmi:id="_dnDiscNaEeS3R6PXxQ7txw" name="tracedTo" type="Reference"/>

-        <properties xmi:id="_dnDissNaEeS3R6PXxQ7txw" name="derivedFrom" type="Reference"/>

-        <properties xmi:id="_dnDis8NaEeS3R6PXxQ7txw" name="refinedBy" type="Reference"/>

-        <properties xmi:id="_dnDitMNaEeS3R6PXxQ7txw" name="text"/>

-        <properties xmi:id="_dnDitcNaEeS3R6PXxQ7txw" name="master" type="Reference"/>

-        <properties xmi:id="_dnDitsNaEeS3R6PXxQ7txw" name="derived" type="Reference"/>

-        <properties xmi:id="_dnEJsMNaEeS3R6PXxQ7txw" name="id"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.45"/>

-      </elements>

-      <elements xmi:id="_dnEJscNaEeS3R6PXxQ7txw" name="RequirementRelated">

-        <properties xmi:id="_dnEJssNaEeS3R6PXxQ7txw" name="refines" type="Reference"/>

-        <properties xmi:id="_dnEJs8NaEeS3R6PXxQ7txw" name="verifies" type="Reference"/>

-        <properties xmi:id="_dnEJtMNaEeS3R6PXxQ7txw" name="satisfies" type="Reference"/>

-        <properties xmi:id="_dnEJtcNaEeS3R6PXxQ7txw" name="tracedFrom" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.4"/>

-      </elements>

-      <elements xmi:id="_dnEJtsNaEeS3R6PXxQ7txw" name="TestCase">

-        <properties xmi:id="_dnEJt8NaEeS3R6PXxQ7txw" name="verifies" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.42"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.44"/>

-      </elements>

-    </elements>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnEJuMNaEeS3R6PXxQ7txw" name="ModelElements">

-      <elements xmi:id="_dnEJucNaEeS3R6PXxQ7txw" name="View">

-        <properties xmi:id="_dnEJusNaEeS3R6PXxQ7txw" name="viewPoint" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.2"/>

-      </elements>

-      <elements xmi:id="_dnEJu8NaEeS3R6PXxQ7txw" name="ViewPoint">

-        <properties xmi:id="_dnEJvMNaEeS3R6PXxQ7txw" name="concerns"/>

-        <properties xmi:id="_dnEJvcNaEeS3R6PXxQ7txw" name="languages"/>

-        <properties xmi:id="_dnEJvsNaEeS3R6PXxQ7txw" name="methods"/>

-        <properties xmi:id="_dnEJv8NaEeS3R6PXxQ7txw" name="purpose"/>

-        <properties xmi:id="_dnEJwMNaEeS3R6PXxQ7txw" name="stakeHolders"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.45"/>

-      </elements>

-      <elements xmi:id="_dnEJwcNaEeS3R6PXxQ7txw" name="Conform">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.5"/>

-      </elements>

-      <elements xmi:id="_dnEJwsNaEeS3R6PXxQ7txw" name="Problem">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.0"/>

-      </elements>

-      <elements xmi:id="_dnEJw8NaEeS3R6PXxQ7txw" name="Rationale">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.0"/>

-      </elements>

-    </elements>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnEJxMNaEeS3R6PXxQ7txw" name="Interactions"/>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnEJxcNaEeS3R6PXxQ7txw" name="UseCases"/>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnEJxsNaEeS3R6PXxQ7txw" name="Constraints">

-      <elements xmi:id="_dnEwwMNaEeS3R6PXxQ7txw" name="ConstraintBlock" supertypes="_dnDioMNaEeS3R6PXxQ7txw"/>

-      <elements xmi:id="_dnEwwcNaEeS3R6PXxQ7txw" name="ConstraintProperty">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.35"/>

-      </elements>

-    </elements>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnEwwsNaEeS3R6PXxQ7txw" name="Allocations">

-      <elements xmi:id="_dnEww8NaEeS3R6PXxQ7txw" name="Allocate">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.29"/>

-      </elements>

-      <elements xmi:id="_dnEwxMNaEeS3R6PXxQ7txw" name="Allocated">

-        <properties xmi:id="_dnEwxcNaEeS3R6PXxQ7txw" name="allocatedFrom" type="Reference"/>

-        <properties xmi:id="_dnEwxsNaEeS3R6PXxQ7txw" name="allocatedTo" type="Reference"/>

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.4"/>

-      </elements>

-      <elements xmi:id="_dnEwx8NaEeS3R6PXxQ7txw" name="AllocateActivityPartition">

-        <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.113"/>

-      </elements>

-    </elements>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_dnEwyMNaEeS3R6PXxQ7txw" name="StateMachines"/>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>

-  </dataContexts>

-</contexts:Context>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocate.xwt
deleted file mode 100644
index b0b8b3a93aa..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocate.xwt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocateActivityPartition.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocateActivityPartition.xwt
deleted file mode 100644
index f88853ea3b7..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocateActivityPartition.xwt
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocated.xwt
deleted file mode 100644
index a1e301803db..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocated.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBindingConnector.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBindingConnector.xwt
deleted file mode 100644
index e3d3ecfec79..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBindingConnector.xwt
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Connector:kind"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBlock.xwt
deleted file mode 100644
index dbf95510ba6..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBlock.xwt
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="SysML:Blocks:Block:isEncapsulated"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConform.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConform.xwt
deleted file mode 100644
index 3e741683a23..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConform.xwt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConnectorProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConnectorProperty.xwt
deleted file mode 100644
index 918eca59c51..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConnectorProperty.xwt
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintBlock.xwt
deleted file mode 100644
index 559fcc4a404..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintBlock.xwt
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintProperty.xwt
deleted file mode 100644
index 515f8ae0800..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintProperty.xwt
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleContinuous.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleContinuous.xwt
deleted file mode 100644
index 4cdb4658bc5..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleContinuous.xwt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleControlOperator.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleControlOperator.xwt
deleted file mode 100644
index 349c9245202..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleControlOperator.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDimension.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDimension.xwt
deleted file mode 100644
index 4bb903e934e..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDimension.xwt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDiscrete.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDiscrete.xwt
deleted file mode 100644
index 684c06007e4..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDiscrete.xwt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDistributedProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDistributedProperty.xwt
deleted file mode 100644
index 3c73aec16f4..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDistributedProperty.xwt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowPort.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowPort.xwt
deleted file mode 100644
index d7dd5cb19a5..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowPort.xwt
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}"
-			property="SysML:PortAndFlows:FlowPort:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowProperty.xwt
deleted file mode 100644
index ea2c9fd55d4..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowProperty.xwt
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}"
-			property="SysML:PortAndFlows:FlowProperty:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowSpecification.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowSpecification.xwt
deleted file mode 100644
index 9946121b7c1..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowSpecification.xwt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleItemFlow.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleItemFlow.xwt
deleted file mode 100644
index e8afd320cb4..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleItemFlow.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNestedConnectorEnd.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNestedConnectorEnd.xwt
deleted file mode 100644
index 0b18d0e3d19..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNestedConnectorEnd.xwt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNoBuffer.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNoBuffer.xwt
deleted file mode 100644
index af627cbafdc..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNoBuffer.xwt
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOptional.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOptional.xwt
deleted file mode 100644
index 23c53e75652..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOptional.xwt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOverwrite.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOverwrite.xwt
deleted file mode 100644
index 0719424a2be..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOverwrite.xwt
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleParticipantProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleParticipantProperty.xwt
deleted file mode 100644
index 0babcc2e529..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleParticipantProperty.xwt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleProbability.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleProbability.xwt
deleted file mode 100644
index b5af57716b2..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleProbability.xwt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultiplePropertySpecificType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultiplePropertySpecificType.xwt
deleted file mode 100644
index 91bc8702194..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultiplePropertySpecificType.xwt
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRate.xwt
deleted file mode 100644
index 6089ce6520e..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRate.xwt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirement.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirement.xwt
deleted file mode 100644
index bbbbc16bd64..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirement.xwt
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirementRelated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirementRelated.xwt
deleted file mode 100644
index 6ddfb238dfb..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirementRelated.xwt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleTestCase.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleTestCase.xwt
deleted file mode 100644
index d649c241efd..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleTestCase.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleUnit.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleUnit.xwt
deleted file mode 100644
index 6e1886249cb..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleUnit.xwt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleValueType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleValueType.xwt
deleted file mode 100644
index 98d15b4211e..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleValueType.xwt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleView.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleView.xwt
deleted file mode 100644
index 2cd85763044..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleView.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleViewPoint.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleViewPoint.xwt
deleted file mode 100644
index b2e12a3be56..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleViewPoint.xwt
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocate.xwt
deleted file mode 100644
index 2f15bb6a48a..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocate.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}" property="UML:Dependency:client"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}" property="UML:Dependency:supplier"></ppe:MultiReference>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocateActivityPartition.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocateActivityPartition.xwt
deleted file mode 100644
index 67fc19b94b5..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocateActivityPartition.xwt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ActivityPartition:isDimension"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ActivityPartition:isExternal"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocated.xwt
deleted file mode 100644
index cf971d2b320..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocated.xwt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Allocations:Allocated:allocatedFrom"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Allocations:Allocated:allocatedTo"></ppe:MultiReference>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBindingConnector.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBindingConnector.xwt
deleted file mode 100644
index 925e301e46b..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBindingConnector.xwt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Connector:kind"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBlock.xwt
deleted file mode 100644
index 95f57c2702b..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBlock.xwt
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="SysML:Blocks:Block:isEncapsulated"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConform.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConform.xwt
deleted file mode 100644
index 5afd8d301ee..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConform.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}" property="UML:Dependency:client"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}" property="UML:Dependency:supplier"></ppe:MultiReference>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConnectorProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConnectorProperty.xwt
deleted file mode 100644
index 551d8d6c3c2..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConnectorProperty.xwt
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Blocks:ConnectorProperty:connector"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintBlock.xwt
deleted file mode 100644
index 93d9e8f8098..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintBlock.xwt
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="SysML:Blocks:Block:isEncapsulated"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintProperty.xwt
deleted file mode 100644
index 2f99f20e92b..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintProperty.xwt
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleContinuous.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleContinuous.xwt
deleted file mode 100644
index b5226c6e05a..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleContinuous.xwt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Activities:Rate:rate"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleControlOperator.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleControlOperator.xwt
deleted file mode 100644
index 7ca8ab48fc0..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleControlOperator.xwt
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDimension.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDimension.xwt
deleted file mode 100644
index b65e8c326de..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDimension.xwt
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDiscrete.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDiscrete.xwt
deleted file mode 100644
index 318f8d5cb4d..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDiscrete.xwt
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Activities:Rate:rate"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDistributedProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDistributedProperty.xwt
deleted file mode 100644
index fb925b3d8ce..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDistributedProperty.xwt
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowPort.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowPort.xwt
deleted file mode 100644
index 62215a6e492..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowPort.xwt
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="SysML:PortAndFlows:FlowPort:isAtomic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isBehavior"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="SysML:PortAndFlows:FlowPort:isConjugated"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Port:isService"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}"
-			property="SysML:PortAndFlows:FlowPort:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowProperty.xwt
deleted file mode 100644
index 4bdb1e4c055..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowProperty.xwt
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}"
-			property="SysML:PortAndFlows:FlowProperty:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowSpecification.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowSpecification.xwt
deleted file mode 100644
index b2ea9394f82..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowSpecification.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleItemFlow.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleItemFlow.xwt
deleted file mode 100644
index 6b17054ce64..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleItemFlow.xwt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:PortAndFlows:ItemFlow:itemProperty"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNestedConnectorEnd.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNestedConnectorEnd.xwt
deleted file mode 100644
index 2b4fc6c8db2..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNestedConnectorEnd.xwt
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Blocks:NestedConnectorEnd:propertyPath"></ppe:MultiReference>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNoBuffer.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNoBuffer.xwt
deleted file mode 100644
index 209090ba399..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNoBuffer.xwt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOptional.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOptional.xwt
deleted file mode 100644
index 08723433f4f..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOptional.xwt
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOverwrite.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOverwrite.xwt
deleted file mode 100644
index ad9e4450734..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOverwrite.xwt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:ObjectNode:isControlType"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:ObjectNode:ordering"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleParticipantProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleParticipantProperty.xwt
deleted file mode 100644
index c188e0bec94..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleParticipantProperty.xwt
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerived"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Property:isDerivedUnion"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:StructuralFeature:isReadOnly"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Property:aggregation"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Blocks:ParticipantProperty:end"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleProbability.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleProbability.xwt
deleted file mode 100644
index 48cf081fba7..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleProbability.xwt
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Activities:Probability:probability"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SinglePropertySpecificType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SinglePropertySpecificType.xwt
deleted file mode 100644
index 75a5eee8405..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SinglePropertySpecificType.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRate.xwt
deleted file mode 100644
index 43eac11a316..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRate.xwt
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isException"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isOrdered"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Parameter:isStream"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:direction"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:Parameter:effect"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Activities:Rate:rate"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirement.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirement.xwt
deleted file mode 100644
index f5f6a26b73a..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirement.xwt
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="SysML:Requirements:Requirement:id"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringMultiline input="{Binding}"
-			property="SysML:Requirements:Requirement:text"></ppe:StringMultiline>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Requirements:Requirement:master"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:Requirement:derived"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:Requirement:derivedFrom"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:Requirement:refinedBy"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:Requirement:satisfiedBy"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:Requirement:tracedTo"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:Requirement:verifiedBy"></ppe:MultiReference>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirementRelated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirementRelated.xwt
deleted file mode 100644
index d0d14a2c9e3..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirementRelated.xwt
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:RequirementRelated:refines"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:RequirementRelated:satisfies"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:RequirementRelated:tracedFrom"></ppe:MultiReference>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:RequirementRelated:verifies"></ppe:MultiReference>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleTestCase.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleTestCase.xwt
deleted file mode 100644
index 8331beebd17..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleTestCase.xwt
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Operation:isQuery"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Behavior:isReentrant"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Feature:isStatic"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:BehavioralFeature:concurrency"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="SysML:Requirements:TestCase:verifies"></ppe:MultiReference>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleUnit.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleUnit.xwt
deleted file mode 100644
index a2a007621dd..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleUnit.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Blocks:Unit:dimension"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleValueType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleValueType.xwt
deleted file mode 100644
index 3e7b5300203..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleValueType.xwt
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Blocks:ValueType:dimension"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:Blocks:ValueType:unit"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleView.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleView.xwt
deleted file mode 100644
index 72d22c12f5f..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleView.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="SysML:ModelElements:View:viewPoint"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleViewPoint.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleViewPoint.xwt
deleted file mode 100644
index 8fb9f2ee9d0..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleViewPoint.xwt
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="SysML:ModelElements:ViewPoint:concerns"></ppe:MultiString>
-		<ppe:MultiString input="{Binding}"
-			property="SysML:ModelElements:ViewPoint:languages"></ppe:MultiString>
-		<ppe:MultiString input="{Binding}"
-			property="SysML:ModelElements:ViewPoint:methods"></ppe:MultiString>
-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="SysML:ModelElements:ViewPoint:purpose"></ppe:StringEditor>
-		<ppe:MultiString input="{Binding}"
-			property="SysML:ModelElements:ViewPoint:stakeHolders"></ppe:MultiString>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
-	</Composite>
-</Composite>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/OSGI-INF/l10n/bundle.properties b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 8a843d32087..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.sysml.properties

-Bundle-Name = Papyrus properties SysML

-Bundle-Vendor = Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/about.html b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/build.properties b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/build.properties
deleted file mode 100644
index 039185560d7..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#

-#Mon Sep 12 09:30:06 CEST 2011

-bin.includes=META-INF/,.,plugin.xml,Model/,about.html,OSGI-INF/

-output..=bin/

-src.includes = about.html

-source..=src/

-bin..=bin/

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.properties b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.properties
deleted file mode 100644
index aea07946faf..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################
-# Copyright (c) 2015 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
-##################################################################################)
-
-pluginDescription=This plug-in contains the SysML property view configuration
\ No newline at end of file
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.xml b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.xml
deleted file mode 100644
index 44dc867612a..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.properties.contexts">

-      <context

-            contextModel="Model/SysML.ctx">

-      </context>

-   </extension>

-

-</plugin>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/pom.xml b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/pom.xml
deleted file mode 100644
index a6e87afbfac..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml-properties</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.properties</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java
deleted file mode 100644
index cd1c1eea776..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java
+++ /dev/null
@@ -1,44 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.properties;

-

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-/** The activator class controls the plug-in life cycle */

-public class Activator implements BundleActivator {

-

-	private static BundleContext context;

-

-	static BundleContext getContext() {

-		return context;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext bundleContext) throws Exception {

-		Activator.context = bundleContext;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext bundleContext) throws Exception {

-		Activator.context = null;

-	}

-

-}

diff --git a/plugins/sysml/properties/pom.xml b/plugins/sysml/properties/pom.xml
deleted file mode 100644
index 37464214249..00000000000
--- a/plugins/sysml/properties/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.sysml-properties</artifactId>
-	<packaging>pom</packaging>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.sysml</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-    </parent>
-	<name>Papyrus SysML Properties</name>
-	<description>Papyrus Properties View configurations for SysML modeling.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.sysml.properties</module>
-	</modules>
-</project>