Merge branch 'master' of ssh://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus

219 files changed, 528 insertions, 15093 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java
index 39c89da798b..8c5e656e4bf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.acceleo.ui.handlers;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.ui.PlatformUI;
 
 
@@ -35,7 +35,7 @@ public abstract class CmdHandler extends AbstractHandler {
 				.getSelectionService().getSelection();
 
 		if(selection != null) {
-			Object selectedObject = BusinessModelResolver.getInstance().getBusinessModel(selection.getFirstElement());
+			Object selectedObject = EMFHelper.getEObject(selection.getFirstElement());
 			if (selectedObject instanceof EObject) {
 				selectedEObject = (EObject) selectedObject;
 			}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
index 91182541b1d..fc88d84f01d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
@@ -1,29 +1,30 @@
-Manifest-Version: 1.0

+Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.texteditor.modelexplorer,

  org.eclipse.papyrus.texteditor.modelexplorer.queries

 Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

+Bundle-Name: %pluginName
+Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.emf.edit;bundle-version="2.9.0",
  org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.0",

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

+ org.eclipse.emf.facet.infra.query.core;bundle-version="0.3.0",
  com.google.guava;bundle-version="11.0.0",

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

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

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

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

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

+ org.eclipse.core.expressions;bundle-version="3.4.500",
+ org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.3.0",
+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.3.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

 Bundle-Vendor: %pluginProvider

 Bundle-Version: 1.0.0.qualifier

 Bundle-ManifestVersion: 2

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

  or

-Import-Package: org.eclipse.papyrus.infra.core.editorsfactory

+Import-Package: org.eclipse.papyrus.infra.core.editorsfactory,
+ org.eclipse.papyrus.infra.viewpoints.policy
 Bundle-SymbolicName: org.eclipse.papyrus.texteditor.modelexplorer;sing

  leton:=true

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
index 8aaf591760b..7cfe9d236a9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/src/org/eclipse/papyrus/texteditor/modelexplorer/queries/IsTextEditorContainer.java
@@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
 import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
 import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
+import org.eclipse.papyrus.infra.viewpoints.policy.NotationUtils;
 import org.eclipse.papyrus.texteditor.model.texteditormodel.TextEditorModel;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
 import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
 
 /** Returns true if the element contains a Table */
@@ -33,18 +33,14 @@ public class IsTextEditorContainer extends AbstractEditorContainerQuery implemen
 	 * {@inheritDoc}
 	 */
 	public Boolean evaluate(final EObject context, ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(context);
-		if(roots == null) {
+		Iterator<EObject> roots = NotationUtils.getNotationRoots(context);
+		if (roots == null)
 			return false;
-		}
-
-		while(roots.hasNext()) {
-			EObject root = roots.next();
-			if(root instanceof TextEditorModel) {
-				if(EcoreUtil.equals(((TextEditorModel)root).getEditedObject(), context)) {
+		while (roots.hasNext()) {
+			EObject inner = roots.next();
+			if (inner instanceof TextEditorModel)
+				if (EcoreUtil.equals(((TextEditorModel)inner).getEditedObject(), context))
 					return true;
-				}
-			}
 		}
 		return false;
 	}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java
index ccb634c2366..7fb7f8df94c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.qompass.designer.ui.handlers;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.ui.PlatformUI;
 
@@ -36,8 +35,7 @@ public abstract class CmdHandler extends AbstractHandler {
 				.getSelectionService().getSelection();
 				
 		if(selection != null) {
-			
-				selectedEObject = EMFHelper.getEObject(selection);
+			selectedEObject = EMFHelper.getEObject(selection.getFirstElement());
 		}
 	}
 
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.classpath b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.classpath
deleted file mode 100644
index 59cf3977c7e..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.project b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.project
deleted file mode 100644
index 772da1bd948..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.robotml.diagram.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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.settings/org.eclipse.jdt.core.prefs b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 13d4138d936..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Jan 17 11:23:08 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/META-INF/MANIFEST.MF
deleted file mode 100644
index a30bc3026f7..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",

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

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

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

- org.eclipse.uml2.uml,

- org.eclipse.core.runtime,

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

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

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

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

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.architecture.Act

- ivator

-Bundle-SymbolicName: org.eclipse.papyrus.robotml.diagram.architecture;

- singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/META-INF/MANIFEST.gen.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/META-INF/MANIFEST.gen.MF
deleted file mode 100644
index 0c181ac2575..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/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.robotml.diagram.architecture;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.architecture.Activator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.papyrus.core.adaptor.gmf,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.diagram.composite,
- org.eclipse.papyrus.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/about.html b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.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>June 5, 2007</p>	

-<h3>License</h3>

-

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

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

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

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

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

-

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

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

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

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

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

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

-

-</body>

-</html>

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/build.gen.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/build.gen.properties
deleted file mode 100644
index ca6d14e16f2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/build.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/build.properties
deleted file mode 100644
index 594508013d5..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/,\
-           src-gen/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               palettes/,\
-               model/,\
-               bundle.properties,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/Diagram_InternalBlock.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/Diagram_InternalBlock.gif
deleted file mode 100644
index b75f79f5ef9..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/Diagram_InternalBlock.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/diagram-proteus.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/diagram-proteus.gif
deleted file mode 100644
index 294127bdf0c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/diagram-proteus.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/proteus-24x24.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/proteus-24x24.gif
deleted file mode 100644
index 0d12622309f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/proteus-24x24.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/robot24x24.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/robot24x24.gif
deleted file mode 100644
index 895cc590ed0..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/robot24x24.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/model/Proteus.Architecture.idgen b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/model/Proteus.Architecture.idgen
deleted file mode 100644
index f72440a7584..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/model/Proteus.Architecture.idgen
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<diagramcontent:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagramcontent="http://www.eclipse.org/papyrus/0.7.0/diagramcontent" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" name="Architecture" label="Proteus Architecture Diagram" icon="icons/obj16/architecture.gif" hint="architecture" javaPackagePrefix="org.eclipse.papyrus.robotml.diagram.architecture" javaClassPrefix="ArchitectureDiagram" language="proteus" createCommandLabel="Create a new Proteus Architecture Diagram">
-  <diagramEditPart name="ArchitectureDiagramEditPart">
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.composite.edit.policies.CompositeStructureDiagramItemSemanticEditPolicy" key="EditPolicyRoles.SEMANTIC_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" key="&quot;RemoveOrphanView&quot;"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.robotml.diagram.architecture.edit.policy.ArchitectureDiagramDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>
-  </diagramEditPart>
-  <inheritedDiagrams name="CompositeDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" paletteToolPrefix="composite.tool">
-    <genInheritedEditor href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#CompositeStructure"/>
-    <genNodes name="Component">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.10"/>
-    </genNodes>
-    <genNodes name="" customPreferencePage="">
-      <genNode xsi:type="gmfgen:GenChildSideAffixedNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.0"/>
-    </genNodes>
-    <genNodes>
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.2"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.48"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.53"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.27"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.32"/>
-    </genNodes>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@links.13"/>
-    </genLinks>
-  </inheritedDiagrams>
-</diagramcontent:Diagram>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/palettes/architecture.palette.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/palettes/architecture.palette.gen.xml
deleted file mode 100644
index c83eb6b91a1..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/palettes/architecture.palette.gen.xml
+++ /dev/null
@@ -1,27 +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.robotml.diagram.architecture.PROTEUS_Architecture__Tools" name="Tools">
-			<aspectTool description="Create a new Component" id="architecture.tool.component"
-				name="Component" refToolId="composite.tool.class">
-			</aspectTool>
-			<aspectTool description="Create a new Port" id="architecture.tool.port"
-				name="Port" refToolId="composite.tool.port">
-			</aspectTool>
-			<aspectTool description="Create a new Property" id="architecture.tool.property"
-				name="Property" refToolId="composite.tool.property">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="architecture.tool.comment"
-				name="Comment" refToolId="composite.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="architecture.tool.constraint"
-				name="Constraint" refToolId="composite.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new Connector" id="architecture.tool.connector"
-				name="Connector" refToolId="composite.tool.connector">
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.gen.xml
deleted file mode 100644
index 0c146e5d7ac..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.gen.xml
+++ /dev/null
@@ -1,242 +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.robotml.diagram.architecture.ArchitectureDiagramCreateCommand"
-		icon="icons/obj16/diagram-proteus.gif"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-		language="uml"
-		label="Proteus Architecture Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.architecture.ArchitectureDiagramEditorFactory"
-		icon="icons/obj16/diagram-proteus.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-		name="Create a new Proteus Architecture Diagram"
-		description="Create a new Proteus Architecture Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.architecture.ArchitectureDiagramCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.architecture.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.uml.diagram.ui.menu.diagrams" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-			icon="icons/obj16/diagram-proteus.gif" label="Create a new Proteus Architecture Diagram"
-			style="push" tooltip="Create a new Proteus Architecture Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
-			</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.robotml.diagram.architecture.CreateCommand"
-			icon="icons/obj16/diagram-proteus.gif" label="Create a new Proteus Architecture Diagram"
-			style="push" tooltip="Create a new Proteus Architecture Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
-			</visibleWhen>
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-			icon="icons/obj16/diagram-proteus.gif"
-			label="Create a new Proteus Architecture Diagram"
-			style="push"
-			tooltip="Create a new Proteus Architecture Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.diagram.common.IsPapyrusActiveWithUMLModel"/>
-			</visibleWhen>
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.diagram.common.paletteDefinition"
-	name="UML_Architecture">
-	
-	<paletteDefinition ID="UML_Architecture"
-		class="org.eclipse.papyrus.diagram.common.service.PluginPaletteProvider"
-		name="UML_Architecture" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/architecture.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.architecture"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.architecture.provider.ArchitectureDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="architecture"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from CompositeDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.architecture.provider.InheritedCompositeDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- 
-			"2073" = CLASS
-			"3069" = PORT_CN
-			"3070" = PROPERTY_CN
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2073, 3069, 3070"/>
-		
-		<!-- 
-			"4013" = CONNECTOR
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4013"/>
-	</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.robotml.diagram.architecture.provider.ArchitectureDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.architecture.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="architecture"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.architecture.provider.InheritedCompositeDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2073" = CLASS
-			"5156" = CLASS_LABEL_COMPOSITE_NAME_HINT
-			"7073" = CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT
-			"3069" = PORT_CN
-			"5125" = PORT_CN_LABEL_NAME_HINT
-			"6029" = PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT
-			"3070" = PROPERTY_CN
-			"5126" = PROPERTY_CN_LABEL_PART_NAME_HINT
-			"7077" = PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT
-		  -->
-		<object
-			id="CLASS"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2073, 5156, 7073"/>
-		</object>
-		<object
-			id="PORT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3069, 5125, 6029"/>
-		</object>
-		<object
-			id="PROPERTY_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3070, 5126, 7077"/>
-		</object>
-		
-		<!-- 	
-			"4013" = CONNECTOR
-			"6025" = CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT
-		  -->
-		<object
-			id="CONNECTOR"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4013, 6025"/>
-		</object>
-
-		<context views="CLASS, PORT_CN, PROPERTY_CN"/>
-		<context views="CONNECTOR"/>
-		
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.architecture.provider.ArchitectureDiagramEditPolicyProvider">
-		<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.robotml.diagram.architecture.preferences"
-		name="Architecture Diagram"
-		category="org.eclipse.papyrus.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ArchitectureDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ComponentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ComponentPreferencePage"
-		name="Component">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PortPreferencePage"
-		name="Port">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConnectorPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConnectorPreferencePage"
-		name="Connector">
-	</page>
-	
-	
-</extension>
-
-</plugin>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.properties
deleted file mode 100644
index 5f19d18d0a2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/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:
-#     Saadia dhouib (CEA List) saadia.dhouib@cea.fr - initial API and implementation
-##################################################################################
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = RobotML profile and libraries (Incubation)
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.xml
deleted file mode 100644
index a65c8ba6f7b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/plugin.xml
+++ /dev/null
@@ -1,326 +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.robotml.diagram.architecture.ArchitectureDiagramCreateCommand"
-       icon="icons/obj16/architecture.gif"
-       id="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-       label="RobotML Architecture Diagram"
-       language="robotML"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.architecture.ArchitectureDiagramEditorFactory"
-		icon="icons/obj16/architecture.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-		name="Create a new RobotML Architecture Diagram"
-		description="Create a new RobotML Architecture Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.architecture.ArchitectureDiagramCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.architecture.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.robotml.diagram.architecture.CreateCommand"
-			icon="icons/obj16/architecture.gif" label="Create a new RobotML Architecture Diagram"
-			style="push" tooltip="Create a new RobotML Architecture Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-					
-		</command>
-	</menu>
-	</menuContribution>
-	
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.robotml.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-			icon="icons/obj16/architecture.gif" label="Create a new RobotML Architecture Diagram"
-			style="push" tooltip="Create a new RobotML Architecture Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.architecture.CreateCommand"
-			icon="icons/obj16/architecture.gif"
-			label="Create a new RobotML Architecture Diagram"
-			style="push"
-			tooltip="Create a new RobotML Architecture Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
-	name="RobotML_Architecture">
-	
-	<paletteDefinition ID="RobotML_Architecture"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="RobotML_Architecture" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/architecture.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.architecture"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.architecture.provider.ArchitectureDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="architecture"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from CompositeDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.architecture.provider.InheritedCompositeDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- 
-			"2073" = CLASS
-			"3069" = PORT_CN
-			"3070" = PROPERTY_CN
-			"2109" = COMMENT
-			"2114" = CONSTRAINT
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2073, 3069, 3070, 2109, 2114, 2007, 3097, 3085, 3120"/>
-		
-		<!-- 
-			"4013" = CONNECTOR
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4013,4003, 4002"/>
-		
-		<!-- 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>
-		
-		<!-- "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>
-		
-		<!-- "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.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.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>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Class, uml.Port, uml.Property, uml.Comment, uml.Constraint"/>
-		
-		<!-- Additional activation contexts for edges semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
-			elements="uml.Connector"/>
-			
-	</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.robotml.diagram.architecture.provider.ArchitectureDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.architecture.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="architecture"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.architecture.provider.InheritedCompositeDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2073" = CLASS
-			"5156" = CLASS_LABEL_COMPOSITE_NAME_HINT
-			"7073" = CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT
-			"3069" = PORT_CN
-			"5125" = PORT_CN_LABEL_NAME_HINT
-			"6029" = PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT
-			"3070" = PROPERTY_CN
-			"5126" = PROPERTY_CN_LABEL_PART_NAME_HINT
-			"7077" = PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT
-			"2109" = COMMENT
-			"5192" = COMMENT_LABEL_BODY_HINT
-			"2114" = CONSTRAINT
-			"5197" = CONSTRAINT_LABEL_NAME_HINT
-			"6039" = CONSTRAINT_LABEL_SPECIFICATION_HINT
-		  -->
-		<object
-			id="CLASS"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2073, 5156, 7073"/>
-		</object>
-		<object
-			id="PORT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3069, 5125, 6029"/>
-		</object>
-		<object
-			id="PROPERTY_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3070, 5126, 7077"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2109, 5192"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2114, 5197, 6039"/>
-		</object>
-
-				
-		<!-- 	
-			"4013" = CONNECTOR
-			"6025" = CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT
-		  -->
-		<object
-			id="CONNECTOR"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4013, 6025"/>
-		</object>
-
-		<context views="CLASS, PORT_CN, PROPERTY_CN, COMMENT, CONSTRAINT"/>
-		<context views="CONNECTOR"/>
-				
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.architecture.provider.CustomArchitectureDiagramEditPolicyProvider">
-		<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.robotml.diagram.architecture.preferences"
-		name="Architecture Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ArchitectureDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ComponentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ComponentPreferencePage"
-		name="Component">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PortPreferencePage"
-		name="Port">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-		
-	<page  	category="org.eclipse.papyrus.robotml.diagram.architecture.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConnectorPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConnectorPreferencePage"
-		name="Connector">
-	</page>	
-</extension>
-   <extension
-         point="org.eclipse.ui.contexts">
-      <context
-            id="org.eclipse.papyrus.robotml.diagram.architecture.ui.diagramContext"
-            name="diagramContext"
-            parentId="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext">
-      </context>
-   </extension>
-
-</plugin>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/Activator.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/Activator.java
deleted file mode 100644
index 42f4875457d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/Activator.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture;
-
-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.robotml.diagram.architecture.preferences.ArchitectureDiagramPreferenceInitializer;
-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.robotml.diagram.architecture";
-
-	/** 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)
-	 */
-	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
-		ArchitectureDiagramPreferenceInitializer diagramPreferenceInitializer = new ArchitectureDiagramPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator 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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramCreateCommand.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramCreateCommand.java
deleted file mode 100644
index 3ec3f54813c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramCreateCommand.java
+++ /dev/null
@@ -1,40 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class ArchitectureDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	@Override
-	protected String getDefaultDiagramName() {
-		return "ArchitectureDiagram";
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return ArchitectureDiagramEditPart.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramEditorFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramEditorFactory.java
deleted file mode 100644
index 07e1657b135..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramEditorFactory.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class ArchitectureDiagramEditorFactory extends GmfEditorFactory {
-
-	public ArchitectureDiagramEditorFactory() {
-		super(ArchitectureDiagramForMultiEditor.class, ArchitectureDiagramEditPart.DIAGRAM_ID);
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramForMultiEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramForMultiEditor.java
deleted file mode 100644
index bb38a90ae54..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/ArchitectureDiagramForMultiEditor.java
+++ /dev/null
@@ -1,114 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture;
-
-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.robotml.diagram.architecture.part.ArchitectureDiagramEditor;
-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 ArchitectureDiagramForMultiEditor extends ArchitectureDiagramEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/diagram-proteus.gif";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(ArchitectureDiagramForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 * 
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 * 
-	 */
-	public ArchitectureDiagramForMultiEditor(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(getDiagram().getName());
-		setTitleImage(DIAG_IMG_DESC.createImage());
-	}
-
-	/**
-	 * {@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.robotml.diagram.architecture.EditingDomain";
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/edit/part/ArchitectureDiagramEditPart.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/edit/part/ArchitectureDiagramEditPart.java
deleted file mode 100644
index d2d8167a102..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/edit/part/ArchitectureDiagramEditPart.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CompositeStructureDiagramItemSemanticEditPolicy;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.policy.ArchitectureDiagramDragDropEditPolicy;
-
-public class ArchitectureDiagramEditPart extends DiagramEditPart {
-
-	public final static String DIAGRAM_ID = "architecture"; //$NON-NLS-1$
-
-	public ArchitectureDiagramEditPart(View view) {
-		super(view);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CompositeStructureDiagramItemSemanticEditPolicy());
-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ArchitectureDiagramDragDropEditPolicy());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/edit/policy/ArchitectureDiagramDragDropEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/edit/policy/ArchitectureDiagramDragDropEditPolicy.java
deleted file mode 100644
index 7c9043a732e..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/edit/policy/ArchitectureDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,90 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-import org.eclipse.papyrus.robotml.diagram.architecture.provider.ArchitectureDiagramElementTypes;
-
-/** Customization of the DND edit policy for the Architecture Diagram */
-public class ArchitectureDiagramDragDropEditPolicy extends CustomDiagramDragDropEditPolicy {
-
-	@Override
-	public int getNodeVisualID(View containerView, EObject domainElement) {
-		String semanticHint = "-1";
-
-		String containerGraphicalHint = containerView.getType();
-		if(containerGraphicalHint == null) {
-			// Cannot guess domain element graphical hint.
-			return -1; // -1 = undefined.
-		}
-
-		// Fill the semantic hint during the drop
-		// Elements inherited from CompositeDiagram
-		// Dropping Class
-		if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-			if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				semanticHint = ArchitectureDiagramElementTypes.CLASS.getSemanticHint();
-			}
-
-		} else
-		// Dropping Port
-		if(domainElement instanceof org.eclipse.uml2.uml.Port) {
-			if(ArchitectureDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				semanticHint = ArchitectureDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-			if(ArchitectureDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalHint)) {
-				semanticHint = ArchitectureDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping Property
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-			if(ArchitectureDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				semanticHint = ArchitectureDiagramElementTypes.PROPERTY_CN.getSemanticHint();
-			}
-			if(ArchitectureDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalHint)) {
-				semanticHint = ArchitectureDiagramElementTypes.PROPERTY_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping Comment
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				semanticHint = ArchitectureDiagramElementTypes.COMMENT.getSemanticHint();
-			}
-
-		} else
-		// Dropping Constraint
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				semanticHint = ArchitectureDiagramElementTypes.CONSTRAINT.getSemanticHint();
-			}
-
-		}
-
-		return new Integer(semanticHint);
-	}
-
-	@Override
-	public int getLinkWithClassVisualID(EObject domainElement) {
-		String semanticHint = "-1";
-
-		if(domainElement instanceof org.eclipse.uml2.uml.Connector) {
-			semanticHint = ArchitectureDiagramElementTypes.CONNECTOR.getSemanticHint();
-		}
-
-		return new Integer(semanticHint);
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/factory/ArchitectureDiagramViewFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/factory/ArchitectureDiagramViewFactory.java
deleted file mode 100644
index 9933c87fa1b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/factory/ArchitectureDiagramViewFactory.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class ArchitectureDiagramViewFactory extends DiagramViewFactory {
-
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/part/ArchitectureDiagramEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/part/ArchitectureDiagramEditor.java
deleted file mode 100644
index 4833c530fa1..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/part/ArchitectureDiagramEditor.java
+++ /dev/null
@@ -1,485 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.part;
-
-import java.util.EventObject;
-import java.util.Set;
-
-import org.eclipse.core.commands.operations.IUndoableOperation;
-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.infra.core.editor.IMultiDiagramEditor;
-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.robotml.diagram.architecture.Activator;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
-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 ArchitectureDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.robotml.diagram.architecture.part.ArchitectureDiagramEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-
-	/**
-	 * @generated
-	 */
-	private IUndoableOperation savedOperation = null;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public ArchitectureDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, 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
-	 */
-	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
-	 */
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	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
-	 */
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isDirty() {
-		IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
-		return savedOperation != op;
-	}
-
-
-	/**
-	 * @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
-	 */
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	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.
-			 */
-			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());
-			}
-
-			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
-						 */
-						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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramGeneralPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramGeneralPreferencePage.java
deleted file mode 100644
index 98207e2121c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramGeneralPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.robotml.diagram.architecture.Activator;
-
-public class ArchitectureDiagramGeneralPreferencePage extends DiagramPreferencePage {
-
-	public ArchitectureDiagramGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramLinkPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramLinkPreferencePage.java
deleted file mode 100644
index d9652e59490..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramLinkPreferencePage.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.robotml.diagram.architecture.Activator;
-
-public class ArchitectureDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramNodePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramNodePreferencePage.java
deleted file mode 100644
index 5da18d3f1f4..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramNodePreferencePage.java
+++ /dev/null
@@ -1,117 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.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.robotml.diagram.architecture.Activator;
-import org.eclipse.swt.widgets.Composite;
-
-public class ArchitectureDiagramNodePreferencePage 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 ArchitectureDiagramNodePreferencePage() {
-		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());
-			addAbstractGroup(compartmentGroup);
-		}
-
-		// Add label visibility group
-		if(!labelsList.isEmpty()) {
-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
-			addAbstractGroup(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 void initializeCompartmentsList() {
-		compartmentsList = Collections.emptyList();
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramPreferenceInitializer.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramPreferenceInitializer.java
deleted file mode 100644
index 23191ee7245..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ArchitectureDiagramPreferenceInitializer.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.architecture.Activator;
-
-public class ArchitectureDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.robotml.diagram.architecture.preferences.ComponentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.architecture.preferences.PortPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.architecture.preferences.PropertyPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.architecture.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.architecture.preferences.ConnectorPreferencePage.initDefaults(store);
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/CommentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/CommentPreferencePage.java
deleted file mode 100644
index 42d40b1ef59..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/CommentPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class CommentPreferencePage extends ArchitectureDiagramNodePreferencePage {
-
-	public static String prefKey = ArchitectureDiagramEditPart.DIAGRAM_ID + "_Comment";
-
-
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ArchitectureDiagramEditPart.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java
deleted file mode 100644
index fd5f20c6e87..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java
+++ /dev/null
@@ -1,93 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.architecture.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.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-
-public class ComponentPreferencePage extends ArchitectureDiagramNodePreferencePage {
-
-	public static String prefKey = ArchitectureDiagramEditPart.DIAGRAM_ID + "_Class";
-
-	/** 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.FALSE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public ComponentPreferencePage() {
-		super();
-		setPreferenceKey(prefKey); //$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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ConnectorPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ConnectorPreferencePage.java
deleted file mode 100644
index 8e9e072e611..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ConnectorPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class ConnectorPreferencePage extends ArchitectureDiagramLinkPreferencePage {
-
-	public static String prefKey = ArchitectureDiagramEditPart.DIAGRAM_ID + "_Connector";
-
-	public ConnectorPreferencePage() {
-		super();
-		setPreferenceKey(ArchitectureDiagramEditPart.DIAGRAM_ID + "_Connector"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ConstraintPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index f4839972fa9..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ConstraintPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class ConstraintPreferencePage extends ArchitectureDiagramNodePreferencePage {
-
-	public static String prefKey = ArchitectureDiagramEditPart.DIAGRAM_ID + "_Constraint";
-
-
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ArchitectureDiagramEditPart.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java
deleted file mode 100644
index 05ea323b1a4..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class PortPreferencePage extends ArchitectureDiagramNodePreferencePage {
-
-	public static String prefKey = ArchitectureDiagramEditPart.DIAGRAM_ID + "_Port";
-
-
-	public PortPreferencePage() {
-		super();
-		setPreferenceKey(ArchitectureDiagramEditPart.DIAGRAM_ID + "_Port"); //$NON-NLS-1$
-	}
-
-	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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java
deleted file mode 100644
index 90050e87235..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class PropertyPreferencePage extends ArchitectureDiagramNodePreferencePage {
-
-	public static String prefKey = ArchitectureDiagramEditPart.DIAGRAM_ID + "_Property";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "PropertyPartCompartment" };
-
-	public PropertyPreferencePage() {
-		super();
-		setPreferenceKey(ArchitectureDiagramEditPart.DIAGRAM_ID + "_Property"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramEditPartProvider.java
deleted file mode 100644
index 91a5070fd87..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramEditPartProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.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.robotml.diagram.architecture.Activator;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-public class ArchitectureDiagramEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
-
-			// Ensure current diagram is Architecture Diagram
-			if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(view.getType())) {
-			return ArchitectureDiagramEditPart.class;
-		}
-
-		Activator.log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramEditPolicyProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramEditPolicyProvider.java
deleted file mode 100644
index d56ab7b8eda..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramEditPolicyProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.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.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.policy.ArchitectureDiagramDragDropEditPolicy;
-
-public class ArchitectureDiagramEditPolicyProvider 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(!ArchitectureDiagramEditPart.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartCompartmentEditPartCN) {
-			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.ConstraintEditPart) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public void createEditPolicies(EditPart editPart) {
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ArchitectureDiagramDragDropEditPolicy());
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramElementTypes.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramElementTypes.java
deleted file mode 100644
index 3d5965fb624..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramElementTypes.java
+++ /dev/null
@@ -1,88 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-public class ArchitectureDiagramElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** Proteus Architecture Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** Proteus Architecture Diagram :: Diagram */
-	public static final IHintedType ARCHITECTURE_DIAGRAM = (IHintedType)getElementType("architecture"); //$NON-NLS-1$
-
-
-
-
-	/** ********************************************************* */
-	/** Proteus Architecture Diagram - CompositeDiagram related elements */
-	/** ********************************************************* */
-
-
-	/** CompositeDiagram :: CLASS */
-	public static final IHintedType CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_2073"); //$NON-NLS-1$
-
-	public static final String CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT = "7073";
-
-	public static final String CLASS_LABEL_COMPOSITE_NAME_HINT = "5156";
-
-	/** CompositeDiagram :: CLASS_CN */
-	public static final IHintedType CLASS_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_3085"); //$NON-NLS-1$
-
-	public static final String CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT = "7060";
-
-	public static final String CLASS_CN_LABEL_COMPOSITE_NAME_HINT = "5155";
-
-	/** CompositeDiagram :: PORT_CN */
-	public static final IHintedType PORT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Port_3069"); //$NON-NLS-1$
-
-	public static final String PORT_CN_LABEL_NAME_HINT = "5125";
-
-	public static final String PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT = "6029";
-
-	/** CompositeDiagram :: PROPERTY_CN */
-	public static final IHintedType PROPERTY_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3070"); //$NON-NLS-1$
-
-	public static final String PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT = "7077";
-
-	public static final String PROPERTY_CN_LABEL_PART_NAME_HINT = "5126";
-
-	/** CompositeDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
-
-	public static final String COMMENT_LABEL_BODY_HINT = "5192";
-
-	/** CompositeDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = "5197";
-
-	public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = "6039";
-
-
-	/** CompositeDiagram :: CONNECTOR */
-	public static final IHintedType CONNECTOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Connector_4013"); //$NON-NLS-1$
-
-	public static final String CONNECTOR_LABEL_APPLIED_STEREOTYPE_HINT = "6025";
-
-
-	/** CompositeDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$
-
-	/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
-
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramViewProvider.java
deleted file mode 100644
index f7975186639..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/ArchitectureDiagramViewProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.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.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-import org.eclipse.papyrus.robotml.diagram.architecture.factory.ArchitectureDiagramViewFactory;
-
-public class ArchitectureDiagramViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(diagramKind)) {
-			return ArchitectureDiagramViewFactory.class;
-		}
-
-		log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/InheritedCompositeDiagramEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/InheritedCompositeDiagramEditPartProvider.java
deleted file mode 100644
index 5f238f7232e..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/InheritedCompositeDiagramEditPartProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.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;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-
-
-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 Architecture Diagram
-			if(!ArchitectureDiagramEditPart.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.Class) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Port) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Property) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
-				return true;
-			}
-
-			/** Edges *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.Connector) {
-				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.
-			String hint = view.getType();
-
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(ArchitectureDiagramElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(ArchitectureDiagramElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/InheritedCompositeDiagramViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/InheritedCompositeDiagramViewProvider.java
deleted file mode 100644
index e5e4767fd16..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/InheritedCompositeDiagramViewProvider.java
+++ /dev/null
@@ -1,251 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.architecture.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.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.papyrus.robotml.diagram.architecture.Activator;
-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider;
-
-
-
-public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		// No need to override here, assuming provides is correctly implemented.
-		Edge 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) {
-
-		// This provider is registered for Internal Block Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ArchitectureDiagramEditPart.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 Architecture Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ArchitectureDiagramEditPart.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == ArchitectureDiagramElementTypes.CONNECTOR) {
-			return true;
-		}
-
-		if(elementType == ArchitectureDiagramElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
-			return true;
-		}
-		if(elementType == ArchitectureDiagramElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			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 Architecture Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ArchitectureDiagramEditPart.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 == ArchitectureDiagramElementTypes.CLASS) {
-
-			if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				//System.err.println("class");
-				return true;
-			}
-		}
-
-		if(elementType == ArchitectureDiagramElementTypes.PORT_CN) {
-			//System.err.println("provides port view == true");
-			return true;
-		}
-		if(elementType == ArchitectureDiagramElementTypes.PROPERTY_CN) {
-			if(ArchitectureDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ArchitectureDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ArchitectureDiagramElementTypes.COMMENT) {
-			if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ArchitectureDiagramElementTypes.CONSTRAINT) {
-			if(ArchitectureDiagramEditPart.DIAGRAM_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);
-			if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-				if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Port) {
-				if(ArchitectureDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-					return false;
-				}
-				if(ArchitectureDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) {
-					return false;
-				}
-				if(ArchitectureDiagramElementTypes.PROPERTY_CN.equals(containerGraphicalType)) {
-					return true;
-				}
-				if(ArchitectureDiagramElementTypes.CLASS.equals(containerGraphicalType)) {
-					return true;
-				}
-
-				if(ArchitectureDiagramElementTypes.CLASS_CN.equals(containerGraphicalType)) {
-					return true;
-				}
-				if(ArchitectureDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-					return true;
-				}
-				return true;
-
-
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-				if(ArchitectureDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-					return true;
-				}
-				if(ArchitectureDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) {
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-				if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-				if(ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-					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);
-		}
-
-		// SemanticHint may be null when the element is created indirectly by
-		// DND from model explorer
-		// ex: Drag and drop a Connector may require to show ConnectorEnd first.
-		EObject eobject = (EObject)semanticAdapter.getAdapter(EObject.class);
-
-		if((eobject instanceof org.eclipse.uml2.uml.Class) && (containerView instanceof Diagram)) { // Class TopNode
-			return super.createNode(semanticAdapter, containerView, ArchitectureDiagramElementTypes.CLASS.getSemanticHint(), index, persisted, preferencesHint);
-		}
-		if((eobject instanceof org.eclipse.uml2.uml.Port) && !(containerView instanceof Diagram)) { // Port ChildNode
-			//System.err.println("creates port view");
-			return super.createNode(semanticAdapter, containerView, ArchitectureDiagramElementTypes.PORT_CN.getSemanticHint(), index, persisted, preferencesHint);
-		}
-		if((eobject instanceof org.eclipse.uml2.uml.Property) && !(containerView instanceof Diagram)) { // Property ChildNode
-			return super.createNode(semanticAdapter, containerView, ArchitectureDiagramElementTypes.PROPERTY_CN.getSemanticHint(), index, persisted, preferencesHint);
-		}
-		if((eobject instanceof org.eclipse.uml2.uml.Comment) && (containerView instanceof Diagram)) { // Comment TopNode
-			return super.createNode(semanticAdapter, containerView, ArchitectureDiagramElementTypes.COMMENT.getSemanticHint(), index, persisted, preferencesHint);
-		}
-		if((eobject instanceof org.eclipse.uml2.uml.Constraint) && (containerView instanceof Diagram)) { // Constraint TopNode
-			return super.createNode(semanticAdapter, containerView, ArchitectureDiagramElementTypes.CONSTRAINT.getSemanticHint(), index, persisted, preferencesHint);
-		}
-
-
-		Activator.log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if(!ArchitectureDiagramEditPart.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", ArchitectureDiagramEditPart.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/UMLValidationDecoratorProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/UMLValidationDecoratorProvider.java
deleted file mode 100644
index 52b07527b0d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/provider/UMLValidationDecoratorProvider.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:

- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.robotml.diagram.architecture.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.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;

-import org.eclipse.papyrus.robotml.diagram.architecture.part.ArchitectureDiagramEditor;

-import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-

-/**

- * @generated

- */

-public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider implements IDecoratorProvider {

-

-	/**

-	 * @generated

-	 */

-	@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 ArchitectureDiagramEditor) {

-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		if(!(operation instanceof CreateDecoratorsOperation)) {

-			return false;

-		}

-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation)operation).getDecoratorTarget();

-		View view = (View)decoratorTarget.getAdapter(View.class);

-		//System.err.println(ArchitectureDiagramEditPart.DIAGRAM_ID + " " + UMLVisualIDRegistry.getModelID(view));

-		return view != null && ArchitectureDiagramEditPart.DIAGRAM_ID.equals(UMLVisualIDRegistry.getModelID(view));

-	}

-}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src/org/eclipse/papyrus/robotml/diagram/architecture/provider/CustomArchitectureDiagramEditPolicyProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src/org/eclipse/papyrus/robotml/diagram/architecture/provider/CustomArchitectureDiagramEditPolicyProvider.java
deleted file mode 100644
index 85c06c0d723..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src/org/eclipse/papyrus/robotml/diagram/architecture/provider/CustomArchitectureDiagramEditPolicyProvider.java
+++ /dev/null
@@ -1,112 +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:

- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.robotml.diagram.architecture.provider;

-

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-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.core.listener.NotificationListener;

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

-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.notation.LayoutConstraint;

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies.NavigationEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;

-import org.eclipse.papyrus.robotml.diagram.common.editpolicies.CustomPropertyLabelEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.common.editpolicies.PortNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.common.editpolicies.StereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.EncapsulatedClassifierResizableShapeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartNameEditPartCN;

-

-

-

-

-// TODO: Auto-generated Javadoc

-/**

- * The Class CustomArchitectureDiagramEditPolicyProvider.

- */

-public class CustomArchitectureDiagramEditPolicyProvider extends ArchitectureDiagramEditPolicyProvider {

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see

-	 * org.eclipse.papyrus.robotml.diagram.architecture.provider.ArchitectureDiagramEditPolicyProvider#createEditPolicies(org.eclipse.gef.EditPart)

-	 */

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		super.createEditPolicies(editPart);

-

-		editPart.installEditPolicy(NavigationEditPolicy.NAVIGATION_POLICY, new NavigationEditPolicy());

-		if(!(editPart instanceof ConnectionEditPart)) {

-			editPart.installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

-		}

-

-		//if (editPart instanceof NamedElementEditPart)

-		editPart.installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new StereotypeNodeLabelDisplayEditPolicy());

-		editPart.installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new EncapsulatedClassifierResizableShapeEditPolicy());

-

-		if(editPart instanceof PortNameEditPart || editPart instanceof PropertyPartNameEditPartCN)

-			editPart.installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new CustomPropertyLabelEditPolicy());

-		else if(editPart instanceof PortEditPart) {

-			NotificationListener editPolicy = new PortNodeLabelDisplayEditPolicy();

-			editPart.installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, (EditPolicy)editPolicy);

-			Object model = editPart.getModel();

-			LayoutConstraint notifier = ((Shape)model).getLayoutConstraint();

-			if(model instanceof Shape) {

-				//to force the refresh the port icon when the diagram is opening

-				Notification notification = new ENotificationImpl((InternalEObject)notifier, Notification.SET, NotationPackage.eINSTANCE.getLocation_X(), 0, 0);

-				editPolicy.notifyChanged(notification);

-			}

-		}

-

-

-	}

-

-	@Override

-	public boolean provides(IOperation operation) {

-		// TODO Auto-generated method stub

-

-

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;

-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {

-			return false;

-		}

-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();

-		String diagramType = gep.getNotationView().getDiagram().getType();

-		if(!ArchitectureDiagramEditPart.DIAGRAM_ID.equals(diagramType)) {

-			return false;

-		}

-

-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart) {

-			return true;

-		}

-

-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartNameEditPartCN) {

-			return true;

-		}

-		return super.provides(operation);

-

-	}

-

-}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/.project b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/.project
index df5fc359a97..f3e097808d4 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/.project
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -24,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
index a91ef72557a..829a99aed16 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.properties;bundle-version="1.0.0",

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

  org.eclipse.gmf.runtime.gef.ui;bundle-version="1.4.1",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

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

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

  org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

@@ -16,7 +17,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.0",

  org.eclipse.emf.facet.infra.browser.uicore,

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

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

+ org.eclipse.gmf.runtime.notation.edit,

+ org.eclipse.papyrus.infra.gmfdiag.css,

+ org.eclipse.papyrus.uml.diagram.clazz

 Export-Package: org.eclipse.papyrus.robotml.diagram.common.commands,

  org.eclipse.papyrus.robotml.diagram.common.editpolicies

 Bundle-Vendor: %Bundle-Vendor

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties
index 01b33ef724c..a27337f278b 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/build.properties
@@ -6,5 +6,7 @@ bin.includes = META-INF/,\
                plugin.properties,\
                icons/,\
                build.properties,\
-               about.html
+               about.html,\
+               viewpoints/,\
+               diagrams/
 src.includes = about.html
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/css/style.css b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/css/style.css
new file mode 100644
index 00000000000..abcf14dcf50
--- /dev/null
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/css/style.css
@@ -0,0 +1,5 @@
+Property {maskLabel:name; elementIcon:false;}

+Property[type] {maskLabel:name type; }

+Port>Label {maskLabel:name; elementIcon:flase;}

+Port>Label:stereotype{visible: false;}

+Class {elementIcon:false;}
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/architecture.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/architecture/architecture.gif
index 417288a907f..417288a907f 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/icons/obj16/architecture.gif
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/architecture/architecture.gif
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/palettes/architecture.palette.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/architecture/architecture.palette.xml
index 0a7fdfb5d02..0a7fdfb5d02 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/palettes/architecture.palette.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/architecture/architecture.palette.xml
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/icons/obj16/componentdef.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/componentdef/componentdef.gif
index b4f43edbd7f..b4f43edbd7f 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/icons/obj16/componentdef.gif
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/componentdef/componentdef.gif
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/componentdef/componentdef.palette.xml
index d85152667e3..fd2ed580e3b 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/componentdef/componentdef.palette.xml
@@ -5,10 +5,7 @@
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.robotml.diagram.componentdef.ROBOTML_Componentdef__Tools"
 			name="Systems- Properties">
-			<aspectTool description="Create a new Package" id="componentdef.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			
+						
 			<aspectTool description="Create a new Hardware System" id="componentdef.tool.system"
 				name="Robot" refToolId="composite.tool.class"
 				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/03_robot_system.png">
@@ -116,6 +113,53 @@
 			</drawer>
 			<drawer
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+			id="org.eclipse.papyrus.robotml.diagram.componentdef.ROBOTML_Componentdef__Actuators"
+			name="Actuators">
+			<aspectTool description="Create a new ActuatorSystem"
+				id="componentdef.tool.actuator" name="Actuator"
+				refToolId="composite.tool.class"
+				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/13_action.png">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="RobotML::ActuatorSystem"></stereotype>
+					</stereotypesToApply>
+				</postAction>
+				<postAction
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"
+					displayKind="IconStereotype" displayPlace="Compartment"></postAction>
+			</aspectTool>
+			
+			<aspectTool description="Create a new WheelSystem"
+				id="componentdef.tool.WheelSystem" name="WheelSystem"
+				refToolId="composite.tool.class"
+				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/15_wheel_system.png">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="RobotML::SteeredWheelSystem"></stereotype>
+					</stereotypesToApply>
+				</postAction>
+				<postAction
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"
+					displayKind="IconStereotype" displayPlace="Compartment"></postAction>
+			</aspectTool>
+			<aspectTool description="Create a new EngineSystem"
+				id="componentdef.tool.EngineSystem" name="EngineSystem"
+				refToolId="composite.tool.class"
+				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/14_engine_system.png">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="RobotML::EngineSystem">
+						
+						</stereotype>
+					</stereotypesToApply>
+				</postAction>
+				<postAction
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"
+					displayKind="IconStereotype" displayPlace="Compartment"></postAction>
+			</aspectTool>
+			</drawer>
+			<drawer
+			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.robotml.diagram.componentdef.ROBOTML_Componentdef__Humanoid"
 			name="Humanoid Components">
 			<aspectTool description="Create a new LegSystem"
@@ -296,9 +340,18 @@
 				id="componentdef.tool.link" name="Comment/Constraint link"
 				refToolId="composite.tool.link">
 			</aspectTool>
-			<!-- <aspectTool description="Create a new Connector" id="componentdef.tool.connector" -->
-			<!-- name="Connector" refToolId="composite.tool.connector"> -->
-			<!-- </aspectTool> -->
+			
+		</drawer>
+		<drawer
+			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+			id="org.eclipse.papyrus.robotml.diagram.componentdef.ROBOTML_Componentdef__Links"
+			name="Edges">
+			
+			 <aspectTool description="Create a Generalization link" id="componentdef.tool.generalization" 
+			 name="Generalization" refToolId="composite.tool.generalization">
+			 </aspectTool>
+			 
+			 
 		</drawer>
 	</content>
 </paletteDefinition>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/datatypeD.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/datatypedef/datatypeD.gif
index 233cdc7b22b..233cdc7b22b 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/datatypeD.gif
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/datatypedef/datatypeD.gif
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/palettes/datatypedef.palette.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/datatypedef/datatypedef.palette.xml
index 8bbfec1d9de..8bbfec1d9de 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/palettes/datatypedef.palette.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/datatypedef/datatypedef.palette.xml
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/icons/obj16/interfaceI.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/interfacedef/interfaceI.gif
index 232980f668e..232980f668e 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/icons/obj16/interfaceI.gif
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/interfacedef/interfaceI.gif
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/palettes/interfacedef.palette.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/interfacedef/interfacedef.palette.xml
index 36b6bea6c24..15997977459 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/palettes/interfacedef.palette.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/diagrams/interfacedef/interfacedef.palette.xml
@@ -16,6 +16,12 @@
 			<aspectTool description="Create a new Operation" id="interfacedef.tool.operation"
 				name="Operation" refToolId="clazz.tool.operation">
 			</aspectTool>
+			<aspectTool description="Create a new Signal" id="interfacedef.tool.signal"
+				name="Signal" refToolId="clazz.tool.signal">
+			</aspectTool>
+			<aspectTool description="Create a new Reception" id="interfacedef.tool.reception"
+				name="Signal" refToolId="clazz.tool.reception">
+			</aspectTool>
 				<aspectTool description="Create a new Comment" id="interfacedef.tool.comment"
 				name="Comment" refToolId="clazz.tool.comment">
 			</aspectTool>
@@ -26,29 +32,18 @@
 			<drawer
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.robotml.diagram.interfacedef.ROBOTML_InterfaceDef__Edges" name="Edges">
-			<aspectTool description="Create a new InterfaceRealization" id="interfacedef.tool.interfacerealization"
-				name="InterfaceRealization" refToolId="clazz.tool.interfacerealization">
-			</aspectTool>		
 			
-			<aspectTool description="Create a new PackageImport" id="interfacedef.tool.packageimport"
-				name="PackageImport" refToolId="clazz.tool.packageimport">
+			
+			<aspectTool description="Create a new Usage" id="interfacedef.tool.packageimport"
+				name="Usage" refToolId="clazz.tool.usage">
 			</aspectTool>
 			
-			<aspectTool description="Create a new PackageMerge" id="interfacedef.tool.packagemerge"
-				name="PackageMerge" refToolId="clazz.tool.packagemerge">
+			<aspectTool description="Create a new Realization" id="interfacedef.tool.packagemerge"
+				name="Realization" refToolId="clazz.tool.realization">
 			</aspectTool>
 			<aspectTool description="Create a new Link (Comment/Constraint)" id="interfacedef.tool.link"
 				name="Comment/Constraint link" refToolId="clazz.tool.link">
 			</aspectTool>
-<!--			<aspectTool description="Create a new CommentAnnotatedElement" id="interfacedef.tool.commentannotatedelement"-->
-<!--				name="CommentAnnotatedElement" refToolId="clazz.tool.link">-->
-<!--			</aspectTool>-->
-<!--			<aspectTool description="Create a new ConstraintConstrainedElement" id="interfacedef.tool.constraintconstrainedelement"-->
-<!--				name="ConstraintConstrainedElement" refToolId="clazz.tool.link">-->
-<!--			</aspectTool>-->
-<!--			<aspectTool description="Create a new Generalization" id="interfacedef.tool.generalization"-->
-<!--				name="Generalization" refToolId="clazz.tool.generalization">-->
-<!--			</aspectTool>-->
 			
 		</drawer>
 	</content>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/default.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/code_generation.gif
index 6a04c491b29..6a04c491b29 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/default.gif
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/code_generation.gif
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/proteus-24x24.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/proteus-24x24.gif
deleted file mode 100644
index 0d12622309f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/proteus-24x24.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/proteus-32x32.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/proteus-32x32.gif
deleted file mode 100644
index d6533c1526a..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/proteus-32x32.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/robotml_16x16.png b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/robotml_16x16.png
new file mode 100644
index 00000000000..02d225bf284
--- /dev/null
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/icons/robotml_16x16.png
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/plugin.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/plugin.xml
index 925631d81a9..f1673ab4e63 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/plugin.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/plugin.xml
@@ -47,7 +47,7 @@
 <extension id="papyrus.robotML.menuspapyrus.generate" name="Generate to Middleware/Simulator" point="org.eclipse.ui.menus">

       <menuContribution allPopups="false" locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.views.modelexplorer.popupmenu.createchild">

          <menu

-               icon="icons/default.gif"

+               icon="icons/code_generation.gif"

                id="org.eclipse.papyrus.robotML.modelexplorer.popupmenu.generate"

                label="Generate to Middleware/Simulator"

                mnemonic="&amp;G"

@@ -60,6 +60,52 @@
             </visibleWhen>

          </menu>     

        </menuContribution>

+      <menuContribution

+            allPopups="false"

+            locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">

+         <menu

+               icon="icons/robotml_16x16.png"

+               id="org.eclipse.papyrus.robotml.diagram.migrate"

+               label="RobotML">

+               <visibleWhen

+                  checkEnabled="false">

+                  <reference

+                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">

+               </reference>

+            </visibleWhen>

+            <command

+                  commandId="org.eclipse.papyrus.robotml.diagram.migrate"

+                  style="push">

+                  <visibleWhen

+                     checkEnabled="false">

+                  <with

+                        variable="selection">

+                     <iterate

+                           ifEmpty="false"

+                           operator="and">

+                        <adapt

+                              type="org.eclipse.core.resources.IFile">

+                           <or>

+                              <test

+                                    property="org.eclipse.core.resources.extension"

+                                    value="di">

+                              </test>

+                              <test

+                                    property="org.eclipse.core.resources.extension"

+                                    value="uml">

+                              </test>

+                              <test

+                                    property="org.eclipse.core.resources.extension"

+                                    value="notation">

+                              </test>

+                           </or>

+                        </adapt>

+                     </iterate>

+                  </with>

+               </visibleWhen>

+            </command>

+         </menu>

+      </menuContribution>

  </extension>    

  <extension

          point="org.eclipse.ui.commands">

@@ -68,6 +114,11 @@
             id="org.eclipse.papyrus.robotML.generation.category"

             name="RobotML generation Category">

       </category>

+      <command

+            defaultHandler="org.eclipse.papyrus.robotml.diagram.common.migration.MigrateDiagramsHandler"

+            id="org.eclipse.papyrus.robotml.diagram.migrate"

+            name="Migrate RobotML diagrams from 0.9 to 1.0 version">

+      </command>

    </extension>

  <extension

        point="org.eclipse.papyrus.uml.properties.languageEditor">

@@ -76,4 +127,18 @@
           language="alf">

     </editor>

  </extension>

+ <extension

+       point="org.eclipse.papyrus.infra.viewpoints.policy.custom">

+    <contribution

+          file="viewpoints/robotml.configuration"

+          original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">

+    </contribution>

+ </extension>

+ <extension

+	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">

+	<editpolicyProvider

+		class="org.eclipse.papyrus.robotml.diagram.common.editpolicy.provider.RobotMLDiagramsEditPolicyProvider">

+		<Priority name="Low"/>

+	</editpolicyProvider>

+</extension>

 </plugin>

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/Activator.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/Activator.java
index d9859a9d797..9fd9541672f 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/Activator.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/Activator.java
@@ -19,7 +19,7 @@ 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.robotml.diagram.common"; //$NON-NLS-1$

 

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/CustomPropertyLabelEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/CustomPropertyLabelEditPolicy.java
deleted file mode 100644
index 2e3f8cf6f17..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/CustomPropertyLabelEditPolicy.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:

- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.robotml.diagram.common.editpolicies;

-

-

-

-import java.util.Arrays;

-import java.util.Collection;

-

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.uml.tools.utils.ICustomAppearance;

-

-

-public class CustomPropertyLabelEditPolicy extends PropertyLabelEditPolicy {

-

-

-	public final static Collection<String> DEFAULT_ROBOTML_PROPERTY = Arrays.asList(ICustomAppearance.DISP_NAME, ICustomAppearance.DISP_TYPE);

-

-	@Override

-	public Collection<String> getDefaultDisplayValue() {

-		// TODO Auto-generated method stub

-		return DEFAULT_ROBOTML_PROPERTY;

-	}

-

-	//	@Override

-	//	public int getCurrentDisplayValue() {

-	//		// TODO Auto-generated method stub

-	//		 return DEFAULT_ROBOTML_PROPERTY;

-	//	}

-

-

-

-}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/PortNodeLabelDisplayEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/PortNodeLabelDisplayEditPolicy.java
index b77aa846b19..2b482e68fee 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/PortNodeLabelDisplayEditPolicy.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/PortNodeLabelDisplayEditPolicy.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.communication.custom.helper.RotationHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

@@ -25,7 +26,7 @@ import org.eclipse.uml2.uml.Stereotype;
 

 

 

-public class PortNodeLabelDisplayEditPolicy extends StereotypeNodeLabelDisplayEditPolicy {

+public class PortNodeLabelDisplayEditPolicy extends AppliedStereotypeNodeLabelDisplayEditPolicy {

 

 

 

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/StereotypeNodeLabelDisplayEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/StereotypeNodeLabelDisplayEditPolicy.java
deleted file mode 100644
index cbc6b5a6957..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicies/StereotypeNodeLabelDisplayEditPolicy.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:

- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.robotml.diagram.common.editpolicies;

-

-import org.eclipse.papyrus.uml.diagram.common.Activator;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.swt.graphics.Image;

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

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

-

-// TODO: Auto-generated Javadoc

-/**

- * The Class StereotypeNodeLabelDisplayEditPolicy forces the display if the stereotype icons of all the nodes of robotml diagrams

- */

-public class StereotypeNodeLabelDisplayEditPolicy extends AppliedStereotypeNodeLabelDisplayEditPolicy {

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy#stereotypeIconToDisplay()

-	 */

-	@Override

-	public Image stereotypeIconToDisplay() {

-

-		// retrieve the first stereotype in the list of displayed stereotype

-		if(getUMLElement() instanceof Element) {

-			if(getUMLElement().getAppliedStereotypes().size() > 0) {

-				Stereotype stereotypesToDisplay = getUMLElement().getAppliedStereotypes().get(0);

-				return Activator.getIconElement(getUMLElement(), stereotypesToDisplay, false);

-

-			}

-		}

-		return null;

-

-

-	}

-

-}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicy/provider/RobotMLDiagramsEditPolicyProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicy/provider/RobotMLDiagramsEditPolicyProvider.java
new file mode 100644
index 00000000000..4799ce927c4
--- /dev/null
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/editpolicy/provider/RobotMLDiagramsEditPolicyProvider.java
@@ -0,0 +1,92 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *    

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.robotml.diagram.common.editpolicy.provider;

+

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

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

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

+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

+import org.eclipse.gmf.runtime.notation.LayoutConstraint;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.Shape;

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

+import org.eclipse.papyrus.robotml.diagram.common.editpolicies.PortNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart;

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

+

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

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+public class RobotMLDiagramsEditPolicyProvider extends AbstractProvider

+		implements IEditPolicyProvider {

+

+	public static String ROBOTML_ID = "RobotML";

+

+	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 (!CompositeStructureDiagramEditPart.MODEL_ID.equals(diagramType)) {

+			return false;

+		}

+

+		if (gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart) {

+			return true;

+		}

+

+		return false;

+	}

+

+	public void createEditPolicies(EditPart editPart) {

+

+		if (editPart.getModel() instanceof View) {

+			EObject element = ((View) editPart.getModel()).getElement();

+			if (element instanceof Element) {

+				if (((Element) element).getNearestPackage().getAppliedProfile(

+						ROBOTML_ID) != null)

+

+					// System.err.println(list.get(i).getProfile().getName());

+					if (editPart instanceof PortEditPart) {

+						NotificationListener editPolicy = new PortNodeLabelDisplayEditPolicy();

+						editPart.installEditPolicy(

+								AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+								(EditPolicy) editPolicy);

+						Object model = editPart.getModel();

+						LayoutConstraint notifier = ((Shape) model)

+								.getLayoutConstraint();

+						if (model instanceof Shape) {

+							// to force refreshing the port icon when the

+							// diagram is opening

+							Notification notification = new ENotificationImpl(

+									(InternalEObject) notifier,

+									Notification.SET,

+									NotationPackage.eINSTANCE.getLocation_X(),

+									0, 0);

+							editPolicy.notifyChanged(notification);

+						}

+					}

+			}

+		}

+	}

+

+}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/migration/MigrateDiagramsHandler.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/migration/MigrateDiagramsHandler.java
new file mode 100644
index 00000000000..712d5f2b1f4
--- /dev/null
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/migration/MigrateDiagramsHandler.java
@@ -0,0 +1,156 @@
+package org.eclipse.papyrus.robotml.diagram.common.migration;

+

+import java.io.IOException;

+

+import java.util.Iterator;

+

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

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

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

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

+import org.eclipse.core.runtime.IPath;

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

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

+import org.eclipse.core.runtime.Platform;

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

+import org.eclipse.core.runtime.jobs.Job;

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

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

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

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.resource.ModelsReader;

+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

+import org.eclipse.papyrus.robotml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+

+import org.eclipse.ui.handlers.HandlerUtil;

+

+public class MigrateDiagramsHandler extends AbstractHandler {

+

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

+		if(currentSelection.isEmpty() || !(currentSelection instanceof IStructuredSelection)) {

+			return null;

+		}

+

+		IStructuredSelection selection = (IStructuredSelection)currentSelection;

+

+		Object selectedElement = selection.getFirstElement();

+

+		Object selectedAdapter = Platform.getAdapterManager().getAdapter(selectedElement, IFile.class);

+

+		

+		

+		if(selectedAdapter instanceof IFile) {

+			final IFile selectedFile = (IFile)selectedAdapter;

+

+			//Load the model in background and add a user information

+			Job openDialogJob = new Job("Switch profile") {

+

+				@Override

+				protected IStatus run(IProgressMonitor monitor) {

+					monitor.beginTask("Migrating model...", IProgressMonitor.UNKNOWN);

+					ModelSet modelSet = new ModelSet();

+					ModelsReader reader = new ModelsReader();

+					reader.readModel(modelSet);

+		

+

+					IPath workspacePath = selectedFile.getFullPath();

+

+					URI workspaceURI = URI.createPlatformResourceURI(workspacePath.toString(), true);

+

+					ViewPrototype protoArchitecture = null;

+					ViewPrototype protoDatatypeDef = null;

+					ViewPrototype protoInterfaceDef = null;

+					ViewPrototype protoComponentDef = null;

+					for (ViewPrototype proto : PolicyChecker.getCurrent().getAllPrototypes()) {

+						if (proto.getLabel().contains("RobotML Architecture"))

+							protoArchitecture = proto;

+						else if (proto.getLabel().contains("RobotML Component")){

+							protoComponentDef = proto;

+						}else if (proto.getLabel().contains("RobotML Interface")){

+							protoInterfaceDef = proto;

+							

+						}else if (proto.getLabel().contains("RobotML Datatype")){

+							protoDatatypeDef = proto;

+						}

+					}

+					

+					

+					try {

+						modelSet.loadModels(workspaceURI);			

+						//do the diagrams migration

+						NotationModel notationModel = (NotationModel)modelSet.getModel(NotationModel.MODEL_ID);

+						if(notationModel != null) {

+							Resource mainNotationResource = notationModel.getResource();

+

+							Iterator<EObject> allContents = mainNotationResource.getAllContents();

+

+							while(allContents.hasNext()) {

+								EObject currentElement = allContents.next();

+								

+								if (currentElement instanceof CSSDiagramImpl){

+									// 1. Changing the type of the diagram

+									//System.err.println(currentElement);

+									if (((CSSDiagramImpl) currentElement).getType().equalsIgnoreCase("architecture")  )

+									{

+										((CSSDiagramImpl) currentElement).setType(CompositeStructureDiagramEditPart.MODEL_ID);

+										DiagramUtils.setPrototype((CSSDiagramImpl) currentElement, protoArchitecture);

+										DiagramUtils.setOwner(((CSSDiagramImpl) currentElement), ((CSSDiagramImpl) currentElement).getElement());

+										

+									}else if(((CSSDiagramImpl) currentElement).getType().equalsIgnoreCase("componentdef")){

+										((CSSDiagramImpl) currentElement).setType(CompositeStructureDiagramEditPart.MODEL_ID);

+										DiagramUtils.setPrototype((CSSDiagramImpl) currentElement, protoComponentDef);

+										DiagramUtils.setOwner(((CSSDiagramImpl) currentElement), ((CSSDiagramImpl) currentElement).getElement());

+									}

+									

+									else if (((CSSDiagramImpl) currentElement).getType().equalsIgnoreCase("datatypedef")  )

+									{

+										((CSSDiagramImpl) currentElement).setType(ModelEditPart.MODEL_ID);

+										DiagramUtils.setPrototype((CSSDiagramImpl) currentElement, protoDatatypeDef);

+										DiagramUtils.setOwner(((CSSDiagramImpl) currentElement), ((CSSDiagramImpl) currentElement).getElement());

+										

+									}else if(((CSSDiagramImpl) currentElement).getType().equalsIgnoreCase("interfacedef")){

+										((CSSDiagramImpl) currentElement).setType(ModelEditPart.MODEL_ID);

+										DiagramUtils.setPrototype((CSSDiagramImpl) currentElement, protoInterfaceDef);

+										DiagramUtils.setOwner(((CSSDiagramImpl) currentElement), ((CSSDiagramImpl) currentElement).getElement());

+									}								

+									

+								}

+							

+

+							}//end while

+							mainNotationResource.save(null);

+							

+						}

+						

+					} catch (ModelMultiException e) {

+						Activator.log.error(e);

+						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);

+					} catch (IOException e) {

+						

+						Activator.log.error(e);

+						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);

+					}

+

+					return Status.OK_STATUS;

+				}

+			};

+

+			openDialogJob.setUser(true);

+

+			openDialogJob.schedule();

+		}

+

+		return null;

+	}

+

+}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java
index 2b79a800891..20f490570c1 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java
@@ -12,13 +12,24 @@
 package org.eclipse.papyrus.robotml.diagram.common.utils;

 

 import org.eclipse.core.expressions.PropertyTester;

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

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Platform;

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

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.RobotML.RobotMLPackage;

 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.resource.ModelsReader;

 import org.eclipse.papyrus.infra.core.resource.NotFoundException;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForSelection;

+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

 import org.eclipse.papyrus.robotml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;

 import org.eclipse.papyrus.uml.tools.model.UmlModel;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.PlatformUI;

@@ -66,6 +77,8 @@ public class RobotmlSelectionTester extends PropertyTester {
 	protected boolean testRobotmlModelNature(Object receiver) {

 		boolean isRobotmlModel = false;

 

+

+		

 		EObject root = getRoot(receiver);

 		if(root instanceof Package) {

 			return (((Package)root).getAppliedProfile("RobotML") != null);

@@ -95,15 +108,46 @@ public class RobotmlSelectionTester extends PropertyTester {
 			}

 

 			try {

+				//this is the case where the selection is on the Project Explorer

+				IStructuredSelection selectionstructured = (IStructuredSelection)selection;

+

+				Object selectedElement = selectionstructured.getFirstElement();

+

+				Object selectedAdapter = Platform.getAdapterManager().getAdapter(selectedElement, IFile.class);

+						

+				

+				if(selectedAdapter instanceof IFile) {

+					final IFile selectedFile = (IFile)selectedAdapter;

+					ModelSet modelSet = new ModelSet();

+					ModelsReader reader = new ModelsReader();

+					reader.readModel(modelSet);

+		

+

+					IPath workspacePath = selectedFile.getFullPath();

+

+					URI workspaceURI = URI.createPlatformResourceURI(workspacePath.toString(), true);

+					modelSet.loadModels(workspaceURI);			

+					

+					UmlModel openedModel = (UmlModel)modelSet.getModel(UmlModel.MODEL_ID);

+					if(openedModel != null) {

+						root = openedModel.lookupRoot();

+					}

+				}else{

+					//this is the case where the selection is on the Model Explorer

 				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

+				//The selection cannot be used to retrieve the ServicesRegistry

+				Activator.log.error(e);

 			} catch (NotFoundException e) {

 				Activator.log.error(e);

+			} catch (ModelMultiException e) {

+				// TODO Auto-generated catch block

+				e.printStackTrace();

 			}

 		}

 

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/viewpoints/robotml.configuration b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/viewpoints/robotml.configuration
new file mode 100755
index 00000000000..0d82eda5809
--- /dev/null
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/viewpoints/robotml.configuration
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<configuration:PapyrusConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" defaultStakeholder="#//@stakeholders.0" metamodel="http://www.eclipse.org/uml2/5.0.0/UML#/">

+  <stakeholders name="RobotML Modeler"/>

+  <viewpoints xsi:type="configuration:PapyrusViewpoint" name="Default Papyrus Viewpoint">

+    <modelKinds xsi:type="configuration:PapyrusDiagram" name="RobotML Architecture Definition Diagram" icon="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/architecture/architecture.gif" profiles="http://Papyrus/RobotML/1#/" implementationID="CompositeStructure" categories="#//@categories.0" customPalette="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/architecture/architecture.palette.xml" customStyle="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/css/style.css">

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

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

+      <childRules/>

+      <paletteRules permit="false" element="composite.group.*"/>

+    </modelKinds>

+    <modelKinds xsi:type="configuration:PapyrusDiagram" name="RobotML Component Definition Diagram" icon="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/componentdef/componentdef.gif" profiles="http://Papyrus/RobotML/1#/" implementationID="CompositeStructure" categories="#//@categories.0" customPalette="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/componentdef/componentdef.palette.xml" customStyle="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/css/style.css">

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

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

+      <childRules/>

+      <paletteRules permit="false" element="composite.group.*"/>

+    </modelKinds>

+    <modelKinds xsi:type="configuration:PapyrusDiagram" name="RobotML Datatype Definition Diagram" icon="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/datatypedef/datatypeD.gif" profiles="http://Papyrus/RobotML/1#/" implementationID="PapyrusUMLClassDiagram" categories="#//@categories.0" customPalette="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/datatypedef/datatypedef.palette.xml">

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

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

+      <childRules/>

+      <paletteRules permit="false" element="clazz.group.*"/>

+      <paletteRules permit="false" element="org.eclipse.papyrus.robotml.diagram.clazz"/>

+    </modelKinds>

+    <modelKinds xsi:type="configuration:PapyrusDiagram" name="RobotML Interface Definition Diagram" icon="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/interfacedef/interfaceI.gif" profiles="http://Papyrus/RobotML/1#/" implementationID="PapyrusUMLClassDiagram" categories="#//@categories.0" customPalette="platform:/plugin/org.eclipse.papyrus.robotml.diagram.common/diagrams/interfacedef/interfacedef.palette.xml">

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

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

+      <childRules/>

+      <paletteRules permit="false" element="clazz.group.*"/>

+      <paletteRules permit="false" element="org.eclipse.papyrus.robotml.diagram.clazz"/>

+    </modelKinds>

+  </viewpoints>

+  <categories name="robotML"/>

+</configuration:PapyrusConfiguration>

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.classpath b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.classpath
deleted file mode 100644
index 59cf3977c7e..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.project b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.project
deleted file mode 100644
index 93f1bbdb8cc..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.robotml.diagram.componentdef</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.settings/org.eclipse.jdt.core.prefs b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2c0e9a14c38..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Feb 07 14:56:33 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/META-INF/MANIFEST.MF
deleted file mode 100644
index e228af79dd0..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

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

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

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

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

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

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

- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.componentdef.Act

- ivator

-Bundle-SymbolicName: org.eclipse.papyrus.robotml.diagram.componentdef;

- singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/META-INF/MANIFEST.gen.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/META-INF/MANIFEST.gen.MF
deleted file mode 100644
index 8f461338818..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/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.robotml.diagram.componentdef;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.componentdef.Activator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.papyrus.core.adaptor.gmf,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.diagram.composite,
- org.eclipse.papyrus.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/about.html b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/build.gen.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/build.gen.properties
deleted file mode 100644
index ca6d14e16f2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/build.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/build.properties
deleted file mode 100644
index 71bd08b3798..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/,\
-           src-gen/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               palettes/,\
-               model/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/model/Proteus.Componentdef.idgen b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/model/Proteus.Componentdef.idgen
deleted file mode 100644
index c2fe08434f3..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/model/Proteus.Componentdef.idgen
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<diagramcontent:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagramcontent="http://www.eclipse.org/papyrus/0.7.0/diagramcontent" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" name="Componentdef" label="Proteus Component Definition Diagram" icon="icons/obj16/componentdef.gif" hint="componentdef" javaPackagePrefix="org.eclipse.papyrus.robotml.diagram.componentdef" javaClassPrefix="ComponentdefDiagram" language="proteus" createCommandLabel="Create a new Proteus Component Definition Diagram">
-  <diagramEditPart name="ComponentdefEditPart">
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.composite.edit.policies.CompositeStructureDiagramItemSemanticEditPolicy" key="EditPolicyRoles.SEMANTIC_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy" key="&quot;RemoveOrphanView&quot;"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.robotml.diagram.componentdef.edit.policy.ComponentdefDiagramDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>
-  </diagramEditPart>
-  <inheritedDiagrams name="CompositeDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy" paletteToolPrefix="composite.tool">
-    <genInheritedEditor href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#CompositeStructure"/>
-    <genNodes name="Component">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.10"/>
-    </genNodes>
-    <genNodes name="" customPreferencePage="">
-      <genNode xsi:type="gmfgen:GenChildSideAffixedNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.0"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.48"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@topLevelNodes.53"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.2"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.19"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.27"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.15"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@childNodes.32"/>
-    </genNodes>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@links.2"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.composite/model/compositediagram.gmfgen#/0/@diagram/@links.1"/>
-    </genLinks>
-  </inheritedDiagrams>
-</diagramcontent:Diagram>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.gen.xml
deleted file mode 100644
index 5556da299d7..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.gen.xml
+++ /dev/null
@@ -1,45 +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.robotml.diagram.componentdef.PROTEUS_Componentdef__Tools" name="Tools">
-			<aspectTool description="Create a new Component" id="componentdef.tool.component"
-				name="Component" refToolId="composite.tool.class">
-			</aspectTool>
-			<aspectTool description="Create a new Port" id="componentdef.tool.port"
-				name="Port" refToolId="composite.tool.port">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="componentdef.tool.comment"
-				name="Comment" refToolId="composite.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="componentdef.tool.constraint"
-				name="Constraint" refToolId="composite.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new Property" id="componentdef.tool.property"
-				name="Property" refToolId="composite.tool.property">
-			</aspectTool>
-			<aspectTool description="Create a new Package" id="componentdef.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new Package" id="componentdef.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="componentdef.tool.comment"
-				name="Comment" refToolId="composite.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Class" id="componentdef.tool.class"
-				name="Class" refToolId="composite.tool.class">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="componentdef.tool.constraint"
-				name="Constraint" refToolId="composite.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintConstrainedElement" id="componentdef.tool.constraintconstrainedelement"
-				name="ConstraintConstrainedElement" refToolId="composite.tool.link">
-			</aspectTool>
-			<aspectTool description="Create a new CommentAnnotatedElement" id="componentdef.tool.commentannotatedelement"
-				name="CommentAnnotatedElement" refToolId="composite.tool.link">
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.gen.xml
deleted file mode 100644
index 4b249850c3c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.gen.xml
+++ /dev/null
@@ -1,409 +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.robotml.diagram.componentdef.ComponentdefDiagramCreateCommand"
-		icon="icons/obj16/componentdef.gif"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.CreateCommand"
-		language="proteus"
-		label="Proteus Component Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.componentdef.ComponentdefDiagramEditorFactory"
-		icon="icons/obj16/componentdef.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.componentdef.CreateCommand"
-		name="Create a new Proteus Component Definition Diagram"
-		description="Create a new Proteus Component Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.ComponentdefDiagramCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.CreateCommand"
-			icon="icons/obj16/componentdef.gif" label="Create a new Proteus Component Definition Diagram"
-			style="push" tooltip="Create a new Proteus Component Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</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.robotml.diagram.componentdef.CreateCommand"
-			icon="icons/obj16/componentdef.gif" label="Create a new Proteus Component Definition Diagram"
-			style="push" tooltip="Create a new Proteus Component Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.componentdef.CreateCommand"
-			icon="icons/obj16/componentdef.gif"
-			label="Create a new Proteus Component Definition Diagram"
-			style="push"
-			tooltip="Create a new Proteus Component Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.diagram.common.paletteDefinition"
-	name="PROTEUS_Componentdef">
-	
-	<paletteDefinition ID="PROTEUS_Componentdef"
-		class="org.eclipse.papyrus.diagram.common.service.PluginPaletteProvider"
-		name="PROTEUS_Componentdef" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/componentdef.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.componentdef"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.ComponentdefDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="componentdef"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from CompositeDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.InheritedCompositeDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- 
-			"2073" = CLASS
-			"3069" = PORT_CN
-			"2109" = COMMENT
-			"2114" = CONSTRAINT
-			"3070" = PROPERTY_CN
-			"3009" = PACKAGE_CN
-			"2007" = PACKAGE
-			"3097" = COMMENT_CN
-			"3085" = CLASS_CN
-			"3120" = CONSTRAINT_CN
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2073, 3069, 2109, 2114, 3070, 3009, 2007, 3097, 3085, 3120"/>
-		
-		<!-- 
-			"4003" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4002" = COMMENT_ANNOTATED_ELEMENT
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4003, 4002"/>
-		
-		<!-- 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>
-		
-		<!-- "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>
-		
-		<!-- "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.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>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Class, uml.Port, uml.Comment, uml.Constraint, uml.Property, uml.Package"/>
-			
-	</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.robotml.diagram.componentdef.provider.ComponentdefDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.componentdef.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="componentdef"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.InheritedCompositeDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2073" = CLASS
-			"5156" = CLASS_LABEL_COMPOSITE_NAME_HINT
-			"7073" = CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT
-			"3069" = PORT_CN
-			"5125" = PORT_CN_LABEL_NAME_HINT
-			"6029" = PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT
-			"2109" = COMMENT
-			"5192" = COMMENT_LABEL_BODY_HINT
-			"2114" = CONSTRAINT
-			"5197" = CONSTRAINT_LABEL_NAME_HINT
-			"6039" = CONSTRAINT_LABEL_SPECIFICATION_HINT
-			"3070" = PROPERTY_CN
-			"5126" = PROPERTY_CN_LABEL_PART_NAME_HINT
-			"7077" = PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT
-			"3009" = PACKAGE_CN
-			"5017" = PACKAGE_CN_LABEL_NAME_HINT
-			"7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"2007" = PACKAGE
-			"5026" = PACKAGE_LABEL_NAME_HINT
-			"7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"3097" = COMMENT_CN
-			"5150" = COMMENT_CN_LABEL_BODY_HINT
-			"3085" = CLASS_CN
-			"5155" = CLASS_CN_LABEL_COMPOSITE_NAME_HINT
-			"7060" = CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT
-			"3120" = CONSTRAINT_CN
-			"6048" = CONSTRAINT_CN_LABEL_NAME_HINT
-			"6049" = CONSTRAINT_CN_LABEL_SPECIFICATION_HINT
-		  -->
-		<object
-			id="CLASS"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2073, 5156, 7073"/>
-		</object>
-		<object
-			id="PORT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3069, 5125, 6029"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2109, 5192"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2114, 5197, 6039"/>
-		</object>
-		<object
-			id="PROPERTY_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3070, 5126, 7077"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3009, 5017, 7010"/>
-		</object>
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2007, 5026, 7016"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3097, 5150"/>
-		</object>
-		<object
-			id="CLASS_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3085, 5155, 7060"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3120, 6048, 6049"/>
-		</object>
-
-				
-		<!-- 	
-			"4003" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4002" = COMMENT_ANNOTATED_ELEMENT
-		  -->
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4003"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4002"/>
-		</object>
-
-		<context views="CLASS, PORT_CN, COMMENT, CONSTRAINT, PROPERTY_CN, PACKAGE_CN, PACKAGE, COMMENT_CN, CLASS_CN, CONSTRAINT_CN"/>
-		<context views="CONSTRAINT_CONSTRAINED_ELEMENT, COMMENT_ANNOTATED_ELEMENT"/>
-				
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.ComponentdefDiagramEditPolicyProvider">
-		<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.robotml.diagram.componentdef.preferences"
-		name="Componentdef Diagram"
-		category="org.eclipse.papyrus.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ComponentdefDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ComponentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ComponentPreferencePage"
-		name="Component">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PortPreferencePage"
-		name="Port">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ClassPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ClassPreferencePage"
-		name="Class">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintConstrainedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintConstrainedElementPreferencePage"
-		name="ConstraintConstrainedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
-	
-	
-</extension>
-
-</plugin>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.properties
deleted file mode 100644
index 9fe9194a1cd..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.properties
+++ /dev/null
@@ -1,10 +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
-#
-##################################################################################
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = RobotML profile and libraries (Incubation)
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.xml
deleted file mode 100644
index 93b627398d7..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/plugin.xml
+++ /dev/null
@@ -1,440 +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.robotml.diagram.componentdef.ComponentdefDiagramCreateCommand"
-		icon="icons/obj16/componentdef.gif"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.CreateCommand"
-		language="robotML"
-		label="RobotML Component Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.componentdef.ComponentdefDiagramEditorFactory"
-		icon="icons/obj16/componentdef.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.componentdef.CreateCommand"
-		name="Create a new RobotML Component Definition Diagram"
-		description="Create a new RobotML Component Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.ComponentdefDiagramCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.CreateCommand"
-			icon="icons/obj16/componentdef.gif" label="Create a new RobotML Component Definition Diagram"
-			style="push" tooltip="Create a new RobotML Component Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml"> 
-               </reference>							
-			</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.robotml.diagram.componentdef.CreateCommand"
-			icon="icons/obj16/componentdef.gif" label="Create a new Proteus Component Definition Diagram"
-			style="push" tooltip="Create a new Proteus Component Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution-->
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.robotml.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.componentdef.CreateCommand"
-			icon="icons/obj16/componentdef.gif" label="Create a new RobotML Component Definition Diagram"
-			style="push" tooltip="Create a new RobotML Component Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>								
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.componentdef.CreateCommand"
-			icon="icons/obj16/componentdef.gif"
-			label="Create a new RobotML Component Definition Diagram"
-			style="push"
-			tooltip="Create a new RobotML Component Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
-	name="PROTEUS_Componentdef">
-	
-	<paletteDefinition ID="ROBOTML_Componentdef"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="ROBOTML_Componentdef" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/componentdef.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.componentdef"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.ComponentdefDiagramViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="componentdef"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from CompositeDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.InheritedCompositeDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- 
-			"2073" = CLASS
-			"3069" = PORT_CN
-			"2109" = COMMENT
-			"2114" = CONSTRAINT
-			"3070" = PROPERTY_CN
-			"3009" = PACKAGE_CN
-			"2007" = PACKAGE
-			"3097" = COMMENT_CN
-			"3085" = CLASS_CN
-			"3120" = CONSTRAINT_CN
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2073, 3069, 2109, 2114, 3070, 3009, 2007, 3097, 3085, 3120"/>
-		
-		<!-- 
-			"4003" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4002" = COMMENT_ANNOTATED_ELEMENT
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4003, 4002"/>
-		
-		<!-- 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>
-		
-		<!-- "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>
-		
-		<!-- "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.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>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Class, uml.Port, uml.Comment, uml.Constraint, uml.Property, uml.Package"/>
-			
-	</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.robotml.diagram.componentdef.provider.ComponentdefDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.componentdef.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="componentdef"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from CompositeDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.InheritedCompositeDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2073" = CLASS
-			"5156" = CLASS_LABEL_COMPOSITE_NAME_HINT
-			"7073" = CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT
-			"3069" = PORT_CN
-			"5125" = PORT_CN_LABEL_NAME_HINT
-			"6029" = PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT
-			"2109" = COMMENT
-			"5192" = COMMENT_LABEL_BODY_HINT
-			"2114" = CONSTRAINT
-			"5197" = CONSTRAINT_LABEL_NAME_HINT
-			"6039" = CONSTRAINT_LABEL_SPECIFICATION_HINT
-			"3070" = PROPERTY_CN
-			"5126" = PROPERTY_CN_LABEL_PART_NAME_HINT
-			"7077" = PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT
-			"3009" = PACKAGE_CN
-			"5017" = PACKAGE_CN_LABEL_NAME_HINT
-			"7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"2007" = PACKAGE
-			"5026" = PACKAGE_LABEL_NAME_HINT
-			"7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"3097" = COMMENT_CN
-			"5150" = COMMENT_CN_LABEL_BODY_HINT
-			"3085" = CLASS_CN
-			"5155" = CLASS_CN_LABEL_COMPOSITE_NAME_HINT
-			"7060" = CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT
-			"3120" = CONSTRAINT_CN
-			"6048" = CONSTRAINT_CN_LABEL_NAME_HINT
-			"6049" = CONSTRAINT_CN_LABEL_SPECIFICATION_HINT
-		  -->
-		<object
-			id="CLASS"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2073, 5156, 7073"/>
-		</object>
-		<object
-			id="PORT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3069, 5125, 6029"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2109, 5192"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2114, 5197, 6039"/>
-		</object>
-		<object
-			id="PROPERTY_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3070, 5126, 7077"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3009, 5017, 7010"/>
-		</object>
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2007, 5026, 7016"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3097, 5150"/>
-		</object>
-		<object
-			id="CLASS_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3085, 5155, 7060"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3120, 6048, 6049"/>
-		</object>
-
-				
-		<!-- 	
-			"4003" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4002" = COMMENT_ANNOTATED_ELEMENT
-		  -->
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4003"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4002"/>
-		</object>
-
-		<context views="CLASS, PORT_CN, COMMENT, CONSTRAINT, PROPERTY_CN, PACKAGE_CN, PACKAGE, COMMENT_CN, CLASS_CN, CONSTRAINT_CN"/>
-		<context views="CONSTRAINT_CONSTRAINED_ELEMENT, COMMENT_ANNOTATED_ELEMENT"/>
-				
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.CustomComponentDefDiagramEditPolicyProvider">
-		<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.robotml.diagram.componentdef.preferences"
-		name="Componentdef Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ComponentdefDiagramGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ComponentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ComponentPreferencePage"
-		name="Component">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PortPreferencePage"
-		name="Port">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ClassPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ClassPreferencePage"
-		name="Class">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintConstrainedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintConstrainedElementPreferencePage"
-		name="ConstraintConstrainedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.componentdef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
-	
-	
-</extension>
-<extension
-      point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-   <decoratorProvider
-         class="org.eclipse.papyrus.robotml.diagram.componentdef.provider.UMLValidationDecoratorProvider">
-      <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>
-
-
-</plugin>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/Activator.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/Activator.java
deleted file mode 100644
index 3638db1e83b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/Activator.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef;
-
-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.robotml.diagram.componentdef.preferences.ComponentdefDiagramPreferenceInitializer;
-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.robotml.diagram.componentdef";
-
-	/** 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
-	 * )
-	 */
-	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
-		ComponentdefDiagramPreferenceInitializer diagramPreferenceInitializer = new ComponentdefDiagramPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
-	 * )
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator 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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramCreateCommand.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramCreateCommand.java
deleted file mode 100644
index 42faad73b28..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramCreateCommand.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class ComponentdefDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	@Override
-	protected String getDefaultDiagramName() {
-		return "ComponentsDiagram";
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return ComponentdefDiagramEditPart.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramEditorFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramEditorFactory.java
deleted file mode 100644
index f7674a0ce33..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramEditorFactory.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class ComponentdefDiagramEditorFactory extends GmfEditorFactory {
-
-	public ComponentdefDiagramEditorFactory() {
-		super(ComponentdefDiagramForMultiEditor.class, ComponentdefDiagramEditPart.DIAGRAM_ID);
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramForMultiEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramForMultiEditor.java
deleted file mode 100644
index df4d2b32a3d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/ComponentdefDiagramForMultiEditor.java
+++ /dev/null
@@ -1,114 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef;
-
-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.robotml.diagram.componentdef.part.ComponentdefDiagramEditor;
-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 ComponentdefDiagramForMultiEditor extends ComponentdefDiagramEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/componentdef.gif";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(ComponentdefDiagramForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 * 
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 * 
-	 */
-	public ComponentdefDiagramForMultiEditor(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(getDiagram().getName());
-		setTitleImage(DIAG_IMG_DESC.createImage());
-	}
-
-	/**
-	 * {@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.robotml.diagram.componentdef.EditingDomain";
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/edit/part/ComponentdefDiagramEditPart.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/edit/part/ComponentdefDiagramEditPart.java
deleted file mode 100644
index d1a36c8ab7d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/edit/part/ComponentdefDiagramEditPart.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.policy.ComponentdefDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CompositeStructureDiagramItemSemanticEditPolicy;
-
-public class ComponentdefDiagramEditPart extends DiagramEditPart {
-
-	public final static String DIAGRAM_ID = "componentdef"; //$NON-NLS-1$
-
-	public ComponentdefDiagramEditPart(View view) {
-		super(view);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CompositeStructureDiagramItemSemanticEditPolicy());
-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ComponentdefDiagramDragDropEditPolicy());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/ComponentdefDiagramDragDropEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/ComponentdefDiagramDragDropEditPolicy.java
deleted file mode 100644
index ed8991f07c1..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/ComponentdefDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,144 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-import org.eclipse.papyrus.robotml.diagram.componentdef.provider.ComponentdefDiagramElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-
-/** Customization of the DND edit policy for the Componentdef Diagram */
-public class ComponentdefDiagramDragDropEditPolicy extends CustomDiagramDragDropEditPolicy {
-
-	@Override
-	public int getNodeVisualID(View containerView, EObject domainElement) {
-		return new Integer(getNodeGraphicalHint(containerView, domainElement));
-	}
-
-	protected String getNodeGraphicalHint(View containerView, EObject domainElement) {
-		String UNDEFINED = "-1";
-
-		String containerGraphicalHint = containerView.getType();
-		if(containerGraphicalHint == null) {
-			// Cannot guess domain element graphical hint.
-			return UNDEFINED;
-		}
-
-		// Fill the semantic hint during the drop
-		// Elements inherited from CompositeDiagram
-		// Dropping Class
-		if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.CLASS.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint();
-			}
-
-		}
-		// Dropping Port
-		if(domainElement instanceof org.eclipse.uml2.uml.Port) {
-			if(ComponentdefDiagramElementTypes.CLASS.getSemanticHint().equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint().equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint().equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();
-			}
-
-		}
-		// Dropping Comment
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.COMMENT.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-		}
-		// Dropping Constraint
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-		}
-		// Dropping Property
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint();
-			}
-
-		}
-		// Dropping Package
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(ComponentdefDiagramElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return ComponentdefDiagramElementTypes.PACKAGE.getSemanticHint();
-			}
-
-		}
-
-		return UNDEFINED;
-	}
-
-	@Override
-	public int getLinkWithClassVisualID(EObject domainElement) {
-		return new Integer(getLinkGraphicalHint(domainElement));
-	}
-
-	protected String getLinkGraphicalHint(EObject domainElement) {
-		String UNDEFINED = "-1";
-
-
-		return UNDEFINED;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/factory/ComponentdefDiagramViewFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/factory/ComponentdefDiagramViewFactory.java
deleted file mode 100644
index 0f19c01a138..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/factory/ComponentdefDiagramViewFactory.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class ComponentdefDiagramViewFactory extends DiagramViewFactory {
-
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/part/ComponentdefDiagramEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/part/ComponentdefDiagramEditor.java
deleted file mode 100644
index 382f8200225..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/part/ComponentdefDiagramEditor.java
+++ /dev/null
@@ -1,485 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.part;
-
-import java.util.EventObject;
-import java.util.Set;
-
-import org.eclipse.core.commands.operations.IUndoableOperation;
-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.infra.core.editor.IMultiDiagramEditor;
-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.robotml.diagram.componentdef.Activator;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
-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 ComponentdefDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.robotml.diagram.componentdef.part.ComponentdefDiagramEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-
-	/**
-	 * @generated
-	 */
-	private IUndoableOperation savedOperation = null;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public ComponentdefDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, 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
-	 */
-	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
-	 */
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	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
-	 */
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isDirty() {
-		IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
-		return savedOperation != op;
-	}
-
-
-	/**
-	 * @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
-	 */
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	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.
-			 */
-			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());
-			}
-
-			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
-						 */
-						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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java
deleted file mode 100644
index 8971a69387a..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java
+++ /dev/null
@@ -1,97 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class ClassPreferencePage extends ComponentdefDiagramNodePreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_Class";
-
-	/** 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.FALSE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "ClassCompositeCompartment" };
-
-	public ClassPreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_Class"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		// set the true value for the compartment visibility
-		// 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));
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	/**
-	 * {@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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/CommentAnnotatedElementPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/CommentAnnotatedElementPreferencePage.java
deleted file mode 100644
index a127cde2b2b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/CommentAnnotatedElementPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class CommentAnnotatedElementPreferencePage extends ComponentdefDiagramLinkPreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_CommentAnnotatedElement";
-
-	public CommentAnnotatedElementPreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/CommentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/CommentPreferencePage.java
deleted file mode 100644
index 6cf4a9df4b4..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class CommentPreferencePage extends ComponentdefDiagramNodePreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_Comment";
-
-
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java
deleted file mode 100644
index ab4dac5b8ee..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-
-public class ComponentPreferencePage extends ComponentdefDiagramNodePreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_Class";
-
-	/** 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.FALSE); //$NON-NLS-1$
-
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Constructor */
-	public ComponentPreferencePage() {
-		super();
-		setPreferenceKey(prefKey); //$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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramGeneralPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramGeneralPreferencePage.java
deleted file mode 100644
index 9978f151360..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramGeneralPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.robotml.diagram.componentdef.Activator;
-
-public class ComponentdefDiagramGeneralPreferencePage extends DiagramPreferencePage {
-
-	public ComponentdefDiagramGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramLinkPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramLinkPreferencePage.java
deleted file mode 100644
index 45145d2f7d8..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramLinkPreferencePage.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.robotml.diagram.componentdef.Activator;
-
-public class ComponentdefDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramNodePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramNodePreferencePage.java
deleted file mode 100644
index 78a7b5ff873..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramNodePreferencePage.java
+++ /dev/null
@@ -1,117 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.Activator;
-import org.eclipse.swt.widgets.Composite;
-
-public class ComponentdefDiagramNodePreferencePage 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 ComponentdefDiagramNodePreferencePage() {
-		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());
-			addAbstractGroup(compartmentGroup);
-		}
-
-		// Add label visibility group
-		if(!labelsList.isEmpty()) {
-			OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
-			addAbstractGroup(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 void initializeCompartmentsList() {
-		compartmentsList = Collections.emptyList();
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramPreferenceInitializer.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramPreferenceInitializer.java
deleted file mode 100644
index 578f08dd632..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentdefDiagramPreferenceInitializer.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.componentdef.Activator;
-
-public class ComponentdefDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ComponentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PortPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PropertyPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ClassPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.ConstraintConstrainedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.componentdef.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ConstraintConstrainedElementPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ConstraintConstrainedElementPreferencePage.java
deleted file mode 100644
index 3a6e332f2c2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ConstraintConstrainedElementPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class ConstraintConstrainedElementPreferencePage extends ComponentdefDiagramLinkPreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_ConstraintConstrainedElement";
-
-	public ConstraintConstrainedElementPreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_ConstraintConstrainedElement"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ConstraintPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index bbac38b7a9d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class ConstraintPreferencePage extends ComponentdefDiagramNodePreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_Constraint";
-
-
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java
deleted file mode 100644
index cf7a560c739..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class PackagePreferencePage extends ComponentdefDiagramNodePreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_Package";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "PackageableElementCompartment" };
-
-	public PackagePreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_Package"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java
deleted file mode 100644
index 1b690d02dfe..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class PortPreferencePage extends ComponentdefDiagramNodePreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_Port";
-
-
-	public PortPreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_Port"); //$NON-NLS-1$
-	}
-
-	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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java
deleted file mode 100644
index 2394468a886..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class PropertyPreferencePage extends ComponentdefDiagramNodePreferencePage {
-
-	public static String prefKey = ComponentdefDiagramEditPart.DIAGRAM_ID + "_Property";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "PropertyPartCompartment" };
-
-	public PropertyPreferencePage() {
-		super();
-		setPreferenceKey(ComponentdefDiagramEditPart.DIAGRAM_ID + "_Property"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramEditPartProvider.java
deleted file mode 100644
index 3ccfe7dfe06..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramEditPartProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.Activator;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-
-public class ComponentdefDiagramEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
-
-			// Ensure current diagram is Componentdef Diagram
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-
-			//			nodeMap.put(AppliedStereotypeConpartmentEditPart.ID, AppliedStereotypeConpartmentEditPart.class);
-			//		    nodeMap.put(AppliedStereotypePropertyEditPart.ID, AppliedStereotypeMultilinePropertyEditPart.class);
-
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(view.getType())) {
-			return ComponentdefDiagramEditPart.class;
-		}
-
-		Activator.log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramEditPolicyProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramEditPolicyProvider.java
deleted file mode 100644
index 9e0872f04e4..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramEditPolicyProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.policy.ComponentdefDiagramDragDropEditPolicy;
-
-public class ComponentdefDiagramEditPolicyProvider 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(!ComponentdefDiagramEditPart.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart) {
-			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.ConstraintEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartCompartmentEditPartCN) {
-			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.ClassCompositeEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeCompartmentEditPartCN) {
-			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 ComponentdefDiagramDragDropEditPolicy());
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramElementTypes.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramElementTypes.java
deleted file mode 100644
index 5a6ecd6b46c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramElementTypes.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-public class ComponentdefDiagramElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** Proteus Component Definition Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** Proteus Component Definition Diagram :: Diagram */
-	public static final IHintedType COMPONENTDEF_DIAGRAM = (IHintedType)getElementType("componentdef"); //$NON-NLS-1$
-
-
-
-
-	/** ********************************************************* */
-	/** Proteus Component Definition Diagram - CompositeDiagram related elements */
-	/** ********************************************************* */
-
-
-	/** CompositeDiagram :: CLASS */
-	public static final IHintedType CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_2073"); //$NON-NLS-1$
-
-	public static final String CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT = "7073";
-
-	public static final String CLASS_LABEL_COMPOSITE_NAME_HINT = "5156";
-
-	/** CompositeDiagram :: PORT_CN */
-	public static final IHintedType PORT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Port_3069"); //$NON-NLS-1$
-
-	public static final String PORT_CN_LABEL_NAME_HINT = "5125";
-
-	public static final String PORT_CN_LABEL_APPLIED_STEREOTYPE_HINT = "6029";
-
-	/** CompositeDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
-
-	public static final String COMMENT_LABEL_BODY_HINT = "5192";
-
-	/** CompositeDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = "5197";
-
-	public static final String CONSTRAINT_LABEL_SPECIFICATION_HINT = "6039";
-
-	/** CompositeDiagram :: PROPERTY_CN */
-	public static final IHintedType PROPERTY_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3070"); //$NON-NLS-1$
-
-	public static final String PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT = "7077";
-
-	public static final String PROPERTY_CN_LABEL_PART_NAME_HINT = "5126";
-
-	/** CompositeDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
-
-	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010";
-
-	public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017";
-
-	/** CompositeDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
-
-	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016";
-
-	public static final String PACKAGE_LABEL_NAME_HINT = "5026";
-
-	/** CompositeDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
-
-	public static final String COMMENT_CN_LABEL_BODY_HINT = "5150";
-
-	/** CompositeDiagram :: CLASS_CN */
-	public static final IHintedType CLASS_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_3085"); //$NON-NLS-1$
-
-	public static final String CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT = "7060";
-
-	public static final String CLASS_CN_LABEL_COMPOSITE_NAME_HINT = "5155";
-
-	/** CompositeDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
-
-	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "6048";
-
-	public static final String CONSTRAINT_CN_LABEL_SPECIFICATION_HINT = "6049";
-
-
-	/** CompositeDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$
-
-	/** CompositeDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
-
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramViewProvider.java
deleted file mode 100644
index 46b01ff8b8f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/ComponentdefDiagramViewProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.Activator;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-import org.eclipse.papyrus.robotml.diagram.componentdef.factory.ComponentdefDiagramViewFactory;
-
-public class ComponentdefDiagramViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(diagramKind)) {
-			return ComponentdefDiagramViewFactory.class;
-		}
-
-		Activator.log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/InheritedCompositeDiagramEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/InheritedCompositeDiagramEditPartProvider.java
deleted file mode 100644
index da53342f4b9..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/InheritedCompositeDiagramEditPartProvider.java
+++ /dev/null
@@ -1,76 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-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 Componentdef Diagram
-			if(!ComponentdefDiagramEditPart.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.Class) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Port) {
-				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.Package) {
-				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.
-			String hint = view.getType();
-
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(ComponentdefDiagramElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(ComponentdefDiagramElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/InheritedCompositeDiagramViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/InheritedCompositeDiagramViewProvider.java
deleted file mode 100644
index 872ec2be0ba..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/InheritedCompositeDiagramViewProvider.java
+++ /dev/null
@@ -1,402 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.Activator;
-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider;
-
-public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		// No need to override here, assuming provides is correctly implemented.
-		Edge createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-
-		if(createdEdge == null) {
-			Activator.log.error(new Exception("Could not create Edge."));
-		}
-
-		return createdEdge;
-	}
-
-	protected boolean provides(CreateViewForKindOperation op) {
-
-		// This provider is registered for Internal Block Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ComponentdefDiagramEditPart.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 Componentdef Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ComponentdefDiagramEditPart.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == ComponentdefDiagramElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
-			return true;
-		}
-		if(elementType == ComponentdefDiagramElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			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 Componentdef Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!ComponentdefDiagramEditPart.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 == ComponentdefDiagramElementTypes.CLASS) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.PORT_CN) {
-			if(ComponentdefDiagramElementTypes.CLASS.getSemanticHint().equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint().equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint().equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.COMMENT) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.CONSTRAINT) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.PROPERTY_CN) {
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.PACKAGE_CN) {
-			if(ComponentdefDiagramElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.PACKAGE) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.COMMENT_CN) {
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.CLASS_CN) {
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == ComponentdefDiagramElementTypes.CONSTRAINT_CN) {
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_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);
-			if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-				if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Class TopNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Class ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Class ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Port) {
-				if(ComponentdefDiagramElementTypes.CLASS.getSemanticHint().equals(containerGraphicalType)) { // Port ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint().equals(containerGraphicalType)) { // Port ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint().equals(containerGraphicalType)) { // Port ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Port ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Port ChildNode
-					return false;
-				}
-				if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) { // Port ChildNode
-					return false;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-				if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Comment TopNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-				if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Constraint TopNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-				if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Property ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Property ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) { // Property ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-				if(ComponentdefDiagramElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-					return true;
-				}
-				if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Package TopNode
-					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);
-		}
-
-		// SemanticHint may be null when the element is created indirectly by
-		// DND from model explorer
-		// ex: Drag and drop a Connector may require to show ConnectorEnd first.
-		EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-
-		// Get the type of the container
-		String containerGraphicalType = containerView.getType();
-
-		if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Class TopNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.CLASS.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Class ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Class ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Port) {
-			if(ComponentdefDiagramElementTypes.CLASS.getSemanticHint().equals(containerGraphicalType)) { // Port ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN.getSemanticHint().equals(containerGraphicalType)) { // Port ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint().equals(containerGraphicalType)) { // Port ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Port ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Port ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) { // Port ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Comment TopNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.COMMENT.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.COMMENT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.COMMENT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.COMMENT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Constraint TopNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.CONSTRAINT.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.CONSTRAINT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.CONSTRAINT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-			if(ComponentdefDiagramElementTypes.CLASS_CN_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Property ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalType)) { // Property ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalType)) { // Property ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(ComponentdefDiagramElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PACKAGE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PACKAGE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Package TopNode
-				return super.createNode(semanticAdapter, containerView, ComponentdefDiagramElementTypes.PACKAGE.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-
-		Activator.log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if(!ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", ComponentdefDiagramEditPart.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/UMLValidationDecoratorProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/UMLValidationDecoratorProvider.java
deleted file mode 100644
index 40998e31aa6..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/provider/UMLValidationDecoratorProvider.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:

- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.robotml.diagram.componentdef.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.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;

-import org.eclipse.papyrus.robotml.diagram.componentdef.part.ComponentdefDiagramEditor;

-import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-

-/**

- * @generated

- */

-public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider implements IDecoratorProvider {

-

-	/**

-	 * @generated

-	 */

-	@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 ComponentdefDiagramEditor) {

-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@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 && ComponentdefDiagramEditPart.DIAGRAM_ID.equals(UMLVisualIDRegistry.getModelID(view));

-	}

-}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/CustomComponentdefDiagramDragDropEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/CustomComponentdefDiagramDragDropEditPolicy.java
deleted file mode 100644
index 91bb70950dd..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/CustomComponentdefDiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,90 +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:

- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.robotml.diagram.componentdef.edit.policy;

-

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

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

-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;

-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.policy.ComponentdefDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.componentdef.provider.ComponentdefDiagramElementTypes;

-

-

-/**

- * @author SD226317

- * 

- */

-public class CustomComponentdefDiagramDragDropEditPolicy extends ComponentdefDiagramDragDropEditPolicy {

-

-	@Override

-	protected String getNodeGraphicalHint(View containerView, EObject domainElement) {

-		String UNDEFINED = "-1"; //$NON-NLS-1$

-

-		String containerGraphicalHint = containerView.getType();

-		if(containerGraphicalHint == null) {

-			// Cannot guess domain element graphical hint.

-			return UNDEFINED;

-		}

-

-		// Fill the semantic hint during the drop

-		// Elements inherited from CompositeDiagram

-		// Dropping Class

-		if(domainElement instanceof org.eclipse.uml2.uml.Class) {

-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.CLASS.getSemanticHint();

-			}

-

-		} else

-		// Dropping Port

-		if(domainElement instanceof org.eclipse.uml2.uml.Port) {

-			if(ComponentdefDiagramElementTypes.CLASS.getSemanticHint().equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();

-			}

-			if(ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint().equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();

-			}

-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();

-			}

-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.PORT_CN.getSemanticHint();

-			}

-

-		} else

-		// Dropping Comment

-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {

-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.COMMENT.getSemanticHint();

-			}

-

-		} else

-		// Dropping Constraint

-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {

-			if(ComponentdefDiagramEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.CONSTRAINT.getSemanticHint();

-			}

-

-		} else

-		// Dropping Property

-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {

-			if(ComponentdefDiagramElementTypes.CLASS_COMPARTMENT_CLASS_COMPOSITE_HINT.equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint();

-			}

-			if(ComponentdefDiagramElementTypes.PROPERTY_CN_COMPARTMENT_PROPERTY_PART_HINT.equals(containerGraphicalHint)) {

-				return ComponentdefDiagramElementTypes.PROPERTY_CN.getSemanticHint();

-			}

-

-		}

-

-		return UNDEFINED;

-	}

-

-}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/StereotypeNodeLabelDisplayEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/StereotypeNodeLabelDisplayEditPolicy.java
deleted file mode 100644
index 649dbeb1e34..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/edit/policy/StereotypeNodeLabelDisplayEditPolicy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the CeCILL-C Free Software License v1.0
- * which accompanies this distribution, and is available at
- * http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html
- *
- * Contributors:
- *  Saadia DHOUIB (CEA LIST) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.componentdef.edit.policy;
-
-//import org.eclipse.papyrus.uml.diagram.common.Activator;
-//import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-//import org.eclipse.swt.graphics.Image;
-//import org.eclipse.uml2.uml.Element;
-//import org.eclipse.uml2.uml.Stereotype;
-
-//public class StereotypeNodeLabelDisplayEditPolicy extends AppliedStereotypeNodeLabelDisplayEditPolicy {
-//
-//	// Always show the stereotype as icon
-//	@Override
-//	public Image stereotypeIconToDisplay() {
-//
-//		// retrieve the first stereotype in the list of displayed stereotype
-//		if(getUMLElement() instanceof Element) {
-//			if(getUMLElement().getAppliedStereotypes().size()>0){
-//				Stereotype stereotypesToDisplay = getUMLElement().getAppliedStereotypes().get(0);
-//				return Activator.getIconElement(getUMLElement(), stereotypesToDisplay, false);
-//
-//			}
-//		}
-//		return null;
-//	}
-
-
-//}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/provider/CustomComponentDefDiagramEditPolicyProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/provider/CustomComponentDefDiagramEditPolicyProvider.java
deleted file mode 100644
index d1e3e794230..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src/org/eclipse/papyrus/robotml/diagram/componentdef/provider/CustomComponentDefDiagramEditPolicyProvider.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:

- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.robotml.diagram.componentdef.provider;

-

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-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.core.listener.NotificationListener;

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

-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.notation.LayoutConstraint;

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies.NavigationEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.common.editpolicies.CustomPropertyLabelEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.common.editpolicies.PortNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.common.editpolicies.StereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.EncapsulatedClassifierResizableShapeEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart;

-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartNameEditPartCN;

-

-

-

-public class CustomComponentDefDiagramEditPolicyProvider extends ComponentdefDiagramEditPolicyProvider {

-

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		super.createEditPolicies(editPart);

-

-		editPart.installEditPolicy(NavigationEditPolicy.NAVIGATION_POLICY, new NavigationEditPolicy());

-		if(!(editPart instanceof ConnectionEditPart)) {

-			editPart.installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

-		}

-

-		editPart.installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new StereotypeNodeLabelDisplayEditPolicy());

-		editPart.installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new EncapsulatedClassifierResizableShapeEditPolicy());

-

-		if(editPart instanceof PortNameEditPart || editPart instanceof PropertyPartNameEditPartCN) {

-			editPart.installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new CustomPropertyLabelEditPolicy());

-		} else if(editPart instanceof PortEditPart) {

-			NotificationListener editPolicy = new PortNodeLabelDisplayEditPolicy();

-			editPart.installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, (EditPolicy)editPolicy);

-			Object model = editPart.getModel();

-			LayoutConstraint notifier = ((Shape)model).getLayoutConstraint();

-			if(model instanceof Shape) {

-				//to force the refresh the port icon when the diagram is opening

-				Notification notification = new ENotificationImpl((InternalEObject)notifier, Notification.SET, NotationPackage.eINSTANCE.getLocation_X(), 0, 0);

-				editPolicy.notifyChanged(notification);

-			}

-		}

-

-	}

-

-	@Override

-	public boolean provides(IOperation operation) {

-		// TODO Auto-generated method stub

-

-

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation)operation;

-		if(!(epOperation.getEditPart() instanceof GraphicalEditPart)) {

-			return false;

-		}

-		GraphicalEditPart gep = (GraphicalEditPart)epOperation.getEditPart();

-		String diagramType = gep.getNotationView().getDiagram().getType();

-		if(!ComponentdefDiagramEditPart.DIAGRAM_ID.equals(diagramType)) {

-			return false;

-		}

-

-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart) {

-			return true;

-		}

-

-		if(gep instanceof org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartNameEditPartCN) {

-			return true;

-		}

-		return super.provides(operation);

-

-	}

-

-

-

-}

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.classpath b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.classpath
deleted file mode 100644
index 1bdc2a0ba05..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.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-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.project b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.project
deleted file mode 100644
index ee1b7fbad63..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.robotml.diagram.datatypedef</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.settings/org.eclipse.jdt.core.prefs b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eeb9600f461..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 08 14:54:16 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/META-INF/MANIFEST.MF
deleted file mode 100644
index 186934f4960..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0",

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

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

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

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

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0"

-Export-Package: org.eclipse.papyrus.robotml.diagram.datatypedef.provid

- er

-Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.datatypedef.Acti

- vator

-Bundle-SymbolicName: org.eclipse.papyrus.robotml.diagram.datatypedef;s

- ingleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/META-INF/MANIFEST.gen.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/META-INF/MANIFEST.gen.MF
deleted file mode 100644
index e4e2651a49b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/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.robotml.diagram.datatypedef;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.datatypedef.Activator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.papyrus.core.adaptor.gmf,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.diagram.clazz,
- org.eclipse.papyrus.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/about.html b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/build.gen.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/build.gen.properties
deleted file mode 100644
index ca6d14e16f2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/build.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/build.properties
deleted file mode 100644
index 9fe825bebfb..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src-gen/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               palettes/,\
-               model/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/Diagram_DomainModel.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/Diagram_DomainModel.gif
deleted file mode 100644
index 6d18ce49bd3..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/Diagram_DomainModel.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/datatypeDiagram.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/datatypeDiagram.gif
deleted file mode 100644
index 0bbbb57754f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/icons/obj16/datatypeDiagram.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/model/Proteus.datatypedef.idgen b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/model/Proteus.datatypedef.idgen
deleted file mode 100644
index ad7641867b8..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/model/Proteus.datatypedef.idgen
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<diagramcontent:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagramcontent="http://www.eclipse.org/papyrus/0.7.0/diagramcontent" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" name="DatatypeDef" label="Datatype Definition Diagram" icon="icons/obj16/datatypeD.gif" hint="DatatypeDef" javaPackagePrefix="org.eclipse.papyrus.robotml.diagram.datatypedef" javaClassPrefix="DatatypeDef" language="proteus" createCommandLabel="Create a new Proteus Datatype Definition Diagram">
-  <diagramEditPart name="DatattypeDefEditPart">
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy" key="EditPolicyRoles.SEMANTIC_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy" key="&quot;RemoveOrphanView&quot;"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.robotml.diagram.datatypedef.edit.policy.DatatypeDefDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>
-  </diagramEditPart>
-  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy" paletteToolPrefix="clazz.tool">
-    <genInheritedEditor href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>
-    <genNodes>
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>
-    </genNodes>
-    <genNodes generatePreferencePage="false" generateTool="false">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.8"/>
-    </genNodes>
-    <genNodes>
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.14"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.13"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.12"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.11"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.5"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.19"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.26"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.17"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.25"/>
-    </genNodes>
-    <genNodes name="" customPreferencePage="">
-      <genNode xsi:type="gmfgen:GenChildLabelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.18"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.14"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.29"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.30"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.15"/>
-    </genNodes>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.10"/>
-    </genLinks>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>
-    </genLinks>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.17"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.14"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.12"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.2"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.4"/>
-    </genLinks>
-  </inheritedDiagrams>
-</diagramcontent:Diagram>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/palettes/datatypedef.palette.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/palettes/datatypedef.palette.gen.xml
deleted file mode 100644
index 4fc87ca6df7..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/palettes/datatypedef.palette.gen.xml
+++ /dev/null
@@ -1,87 +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.robotml.diagram.datatypedef.PROTEUS_DatatypeDef__Tools" name="Tools">
-			<aspectTool description="Create a new Package" id="datatypedef.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="datatypedef.tool.comment"
-				name="Comment" refToolId="clazz.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="datatypedef.tool.constraint"
-				name="Constraint" refToolId="clazz.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new DataType" id="datatypedef.tool.datatype"
-				name="DataType" refToolId="clazz.tool.datatype">
-			</aspectTool>
-			<aspectTool description="Create a new PrimitiveType" id="datatypedef.tool.primitivetype"
-				name="PrimitiveType" refToolId="clazz.tool.primitivetype">
-			</aspectTool>
-			<aspectTool description="Create a new Signal" id="datatypedef.tool.signal"
-				name="Signal" refToolId="clazz.tool.signal">
-			</aspectTool>
-			<aspectTool description="Create a new Package" id="datatypedef.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new DataType" id="datatypedef.tool.datatype"
-				name="DataType" refToolId="clazz.tool.datatype">
-			</aspectTool>
-			<aspectTool description="Create a new Enumeration" id="datatypedef.tool.enumeration"
-				name="Enumeration" refToolId="clazz.tool.enumeration">
-			</aspectTool>
-			<aspectTool description="Create a new PrimitiveType" id="datatypedef.tool.primitivetype"
-				name="PrimitiveType" refToolId="clazz.tool.primitivetype">
-			</aspectTool>
-			<aspectTool description="Create a new EnumerationLiteral" id="datatypedef.tool.enumerationliteral"
-				name="EnumerationLiteral" refToolId="clazz.tool.enumerationliteral">
-			</aspectTool>
-			<aspectTool description="Create a new Signal" id="datatypedef.tool.signal"
-				name="Signal" refToolId="clazz.tool.signal">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="datatypedef.tool.comment"
-				name="Comment" refToolId="clazz.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="datatypedef.tool.constraint"
-				name="Constraint" refToolId="clazz.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new Diagram" id="datatypedef.tool.diagram"
-				name="Diagram" refToolId=>
-			</aspectTool>
-			<aspectTool description="Create a new Enumeration literal" id="datatypedef.tool.enumeration literal"
-				name="Enumeration literal" refToolId="clazz.tool.enumerationliteral">
-			</aspectTool>
-			<aspectTool description="Create a new Property" id="datatypedef.tool.property"
-				name="Property" refToolId="clazz.tool.property">
-			</aspectTool>
-			<aspectTool description="Create a new Operation" id="datatypedef.tool.operation"
-				name="Operation" refToolId="clazz.tool.operation">
-			</aspectTool>
-			<aspectTool description="Create a new Dependency" id="datatypedef.tool.dependency"
-				name="Dependency" refToolId="clazz.tool.dependency">
-			</aspectTool>
-			<aspectTool description="Create a new PackageImport" id="datatypedef.tool.packageimport"
-				name="PackageImport" refToolId="clazz.tool.packageimport">
-			</aspectTool>
-			<aspectTool description="Create a new CommentAnnotatedElement" id="datatypedef.tool.commentannotatedelement"
-				name="CommentAnnotatedElement" refToolId="clazz.tool.link">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintConstrainedElement" id="datatypedef.tool.constraintconstrainedelement"
-				name="ConstraintConstrainedElement" refToolId="clazz.tool.link">
-			</aspectTool>
-			<aspectTool description="Create a new PackageMerge" id="datatypedef.tool.packagemerge"
-				name="PackageMerge" refToolId="clazz.tool.packagemerge">
-			</aspectTool>
-			<aspectTool description="Create a new ElementImport" id="datatypedef.tool.elementimport"
-				name="ElementImport" refToolId="clazz.tool.elementimport">
-			</aspectTool>
-			<aspectTool description="Create a new Association" id="datatypedef.tool.association"
-				name="Association" refToolId="clazz.tool.association">
-			</aspectTool>
-			<aspectTool description="Create a new Generalization" id="datatypedef.tool.generalization"
-				name="Generalization" refToolId="clazz.tool.generalization">
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.gen.xml
deleted file mode 100644
index 3000df0515b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.gen.xml
+++ /dev/null
@@ -1,700 +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.robotml.diagram.datatypedef.DatatypeDefCreateCommand"
-		icon="icons/obj16/datatypeD.gif"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.CreateCommand"
-		language="proteus"
-		label="Datatype Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.datatypedef.DatatypeDefEditorFactory"
-		icon="icons/obj16/datatypeD.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.datatypedef.CreateCommand"
-		name="Create a new Proteus Datatype Definition Diagram"
-		description="Create a new Proteus Datatype Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.DatatypeDefCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.datatypedef.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.robotml.diagram.datatypedef.CreateCommand"
-			icon="icons/obj16/datatypeD.gif" label="Create a new Proteus Datatype Definition Diagram"
-			style="push" tooltip="Create a new Proteus Datatype Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</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.robotml.diagram.datatypedef.CreateCommand"
-			icon="icons/obj16/datatypeD.gif" label="Create a new Proteus Datatype Definition Diagram"
-			style="push" tooltip="Create a new Proteus Datatype Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.datatypedef.CreateCommand"
-			icon="icons/obj16/datatypeD.gif"
-			label="Create a new Proteus Datatype Definition Diagram"
-			style="push"
-			tooltip="Create a new Proteus Datatype Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.diagram.common.paletteDefinition"
-	name="PROTEUS_DatatypeDef">
-	
-	<paletteDefinition ID="PROTEUS_DatatypeDef"
-		class="org.eclipse.papyrus.diagram.common.service.PluginPaletteProvider"
-		name="PROTEUS_DatatypeDef" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/datatypedef.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.datatypedef"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.DatatypeDefViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="DatatypeDef"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.InheritedClassDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- 
-			"2007" = PACKAGE
-			"2006" = ENUMERATION
-			"2012" = COMMENT
-			"2011" = CONSTRAINT
-			"2010" = DATA_TYPE
-			"2009" = PRIMITIVE_TYPE
-			"2003" = SIGNAL
-			"3009" = PACKAGE_CN
-			"3027" = DATA_TYPE_CN
-			"3025" = ENUMERATION_CN
-			"3026" = PRIMITIVE_TYPE_CN
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3022" = SIGNAL_CN
-			"3028" = COMMENT_CN
-			"3029" = CONSTRAINT_CN
-			"2016" = SHORT_CUT_DIAGRAM
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 2006, 2012, 2011, 2010, 2009, 2003, 3009, 3027, 3025, 3026, 3017, 3022, 3028, 3029, 2016"/>
-		
-		<!-- 
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3018" = DATA_TYPE_PROPERTY_CLN
-			"3019" = DATA_TYPE_OPERATION_CLN
-			"3005" = SIGNAL_PROPERTY_CLN
-		  -->	  
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3017, 3018, 3019, 3005"/>
-		
-		<!-- 
-			"4008" = DEPENDENCY
-			"4010" = PACKAGE_IMPORT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"4009" = ELEMENT_IMPORT
-			"4001" = ASSOCIATION
-			"4002" = GENERALIZATION
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008, 4010, 4013, 4014, 4011, 4009, 4001, 4002"/>
-		
-		<!-- 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.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.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.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.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.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.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>
-		
-		<!-- "notation.Diagram" -->
-		<object id="notation.Diagram" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="notation.Diagram"/>
-		</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.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.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.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>
-		
-		<!-- "uml.PackageMerge" -->
-		<object id="uml.PackageMerge" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PackageMerge"/>
-		</object>
-		
-		<!-- "uml.ElementImport" -->
-		<object id="uml.ElementImport" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.ElementImport"/>
-		</object>
-		
-		<!-- "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>
-		
-		<!-- "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>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Package, uml.Enumeration, uml.Comment, uml.Constraint, uml.DataType, uml.PrimitiveType, uml.Signal, uml.EnumerationLiteral, notation.Diagram, uml.Property, uml.Operation"/>
-		
-		<!-- Additional activation contexts for edges semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
-			elements="uml.Dependency, uml.PackageImport, uml.PackageMerge, uml.ElementImport, uml.Association, uml.Generalization"/>
-			
-	</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.robotml.diagram.datatypedef.provider.DatatypeDefEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.datatypedef.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="DatatypeDef"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2007" = PACKAGE
-			"5026" = PACKAGE_LABEL_NAME_HINT
-			"7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"2006" = ENUMERATION
-			"5023" = ENUMERATION_LABEL_NAME_HINT
-			"7015" = ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT
-			"2012" = COMMENT
-			"5038" = COMMENT_LABEL_BODY_HINT
-			"2011" = CONSTRAINT
-			"5037" = CONSTRAINT_LABEL_NAME_HINT
-			"5159" = CONSTRAINT_LABEL_BODY_HINT
-			"2010" = DATA_TYPE
-			"5035" = DATA_TYPE_LABEL_NAME_HINT
-			"7020" = DATA_TYPE_COMPARTMENT_ATTRIBUTE_HINT
-			"7021" = DATA_TYPE_COMPARTMENT_OPERATION_HINT
-			"2009" = PRIMITIVE_TYPE
-			"5032" = PRIMITIVE_TYPE_LABEL_NAME_HINT
-			"2003" = SIGNAL
-			"5008" = SIGNAL_LABEL_NAME_HINT
-			"7005" = SIGNAL_COMPARTMENT_ATTRIBUTE_HINT
-			"3009" = PACKAGE_CN
-			"5017" = PACKAGE_CN_LABEL_NAME_HINT
-			"7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"3027" = DATA_TYPE_CN
-			"5061" = DATA_TYPE_CN_LABEL_NAME_HINT
-			"7032" = DATA_TYPE_CN_COMPARTMENT_ATTRIBUTE_HINT
-			"7033" = DATA_TYPE_CN_COMPARTMENT_OPERATION_HINT
-			"3025" = ENUMERATION_CN
-			"5055" = ENUMERATION_CN_LABEL_NAME_HINT
-			"7031" = ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT
-			"3026" = PRIMITIVE_TYPE_CN
-			"5058" = PRIMITIVE_TYPE_CN_LABEL_NAME_HINT
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3022" = SIGNAL_CN
-			"5046" = SIGNAL_CN_LABEL_NAME_HINT
-			"7026" = SIGNAL_CN_COMPARTMENT_ATTRIBUTE_HINT
-			"3028" = COMMENT_CN
-			"5063" = COMMENT_CN_LABEL_BODY2_HINT
-			"3029" = CONSTRAINT_CN
-			"5064" = CONSTRAINT_CN_LABEL_NAME2_HINT
-			"5160" = CONSTRAINT_CN_LABEL_BODY_HINT
-			"2016" = SHORT_CUT_DIAGRAM
-			"0" = SHORT_CUT_DIAGRAM_LABEL_DIAGRAM_NAME_HINT
-		  -->
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2007, 5026, 7016"/>
-		</object>
-		<object
-			id="ENUMERATION"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2006, 5023, 7015"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2012, 5038"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2011, 5037, 5159"/>
-		</object>
-		<object
-			id="DATA_TYPE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2010, 5035, 7020, 7021"/>
-		</object>
-		<object
-			id="PRIMITIVE_TYPE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2009, 5032"/>
-		</object>
-		<object
-			id="SIGNAL"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2003, 5008, 7005"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3009, 5017, 7010"/>
-		</object>
-		<object
-			id="DATA_TYPE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3027, 5061, 7032, 7033"/>
-		</object>
-		<object
-			id="ENUMERATION_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3025, 5055, 7031"/>
-		</object>
-		<object
-			id="PRIMITIVE_TYPE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3026, 5058"/>
-		</object>
-		<object
-			id="ENUMERATION_ENUMERATION_LITERAL_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3017"/>
-		</object>
-		<object
-			id="SIGNAL_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3022, 5046, 7026"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3028, 5063"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3029, 5064, 5160"/>
-		</object>
-		<object
-			id="SHORT_CUT_DIAGRAM"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2016, 0"/>
-		</object>
-
-		<!-- 	
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3018" = DATA_TYPE_PROPERTY_CLN
-			"3019" = DATA_TYPE_OPERATION_CLN
-			"3005" = SIGNAL_PROPERTY_CLN
-		  -->
-		<object
-			id="ENUMERATION_ENUMERATION_LITERAL_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3017"/>
-		</object>
-		<object
-			id="DATA_TYPE_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3018"/>
-		</object>
-		<object
-			id="DATA_TYPE_OPERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3019"/>
-		</object>
-		<object
-			id="SIGNAL_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3005"/>
-		</object>
-				
-		<!-- 	
-			"4008" = DEPENDENCY
-			"6026" = DEPENDENCY_LABEL_NAME_HINT
-			"6027" = DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT
-			"4010" = PACKAGE_IMPORT
-			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"6030" = PACKAGE_MERGE_LABEL_APPLIED_STEREOTYPE_HINT
-			"4009" = ELEMENT_IMPORT
-			"6020" = ELEMENT_IMPORT_LABEL_ALIAS_HINT
-			"6021" = ELEMENT_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
-			"4001" = ASSOCIATION
-			"6001" = ASSOCIATION_LABEL_APPLIED_STEREOTYPE_HINT
-			"6002" = ASSOCIATION_LABEL_NAME2_HINT
-			"6003" = ASSOCIATION_LABEL_NAME3_HINT
-			"6005" = ASSOCIATION_LABEL_NAME5_HINT
-			"6033" = ASSOCIATION_LABEL_MULTIPLICTY_SOURCE_HINT
-			"6034" = ASSOCIATION_LABEL_MULTIPLICTY_TARGET_HINT
-			"4002" = GENERALIZATION
-			"6007" = GENERALIZATION_LABEL_APPLIED_STEREOTYPER_HINT
-		  -->
-		<object
-			id="DEPENDENCY"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4008, 6026, 6027"/>
-		</object>
-		<object
-			id="PACKAGE_IMPORT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4010, 6022"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4013"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4014"/>
-		</object>
-		<object
-			id="PACKAGE_MERGE"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4011, 6030"/>
-		</object>
-		<object
-			id="ELEMENT_IMPORT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4009, 6020, 6021"/>
-		</object>
-		<object
-			id="ASSOCIATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4001, 6001, 6002, 6003, 6005, 6033, 6034"/>
-		</object>
-		<object
-			id="GENERALIZATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4002, 6007"/>
-		</object>
-
-		<context views="PACKAGE, ENUMERATION, COMMENT, CONSTRAINT, DATA_TYPE, PRIMITIVE_TYPE, SIGNAL, PACKAGE_CN, DATA_TYPE_CN, ENUMERATION_CN, PRIMITIVE_TYPE_CN, ENUMERATION_ENUMERATION_LITERAL_CLN, SIGNAL_CN, COMMENT_CN, CONSTRAINT_CN, DIAGRAM"/>
-		<context views="ENUMERATION_ENUMERATION_LITERAL_CLN, DATA_TYPE_PROPERTY_CLN, DATA_TYPE_OPERATION_CLN, SIGNAL_PROPERTY_CLN"/>
-		<context views="DEPENDENCY, PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, PACKAGE_MERGE, ELEMENT_IMPORT, ASSOCIATION, GENERALIZATION"/>
-				
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.DatatypeDefEditPolicyProvider">
-		<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.robotml.diagram.datatypedef.preferences"
-		name="DatatypeDef Diagram"
-		category="org.eclipse.papyrus.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DatatypeDefGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		name="DataType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		name="PrimitiveType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		name="Signal">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		name="DataType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationPreferencePage"
-		name="Enumeration">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		name="PrimitiveType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationLiteralPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationLiteralPreferencePage"
-		name="EnumerationLiteral">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		name="Signal">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DiagramPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DiagramPreferencePage"
-		name="Diagram">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DependencyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DependencyPreferencePage"
-		name="Dependency">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageImportPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageImportPreferencePage"
-		name="PackageImport">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintConstrainedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintConstrainedElementPreferencePage"
-		name="ConstraintConstrainedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageMergePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageMergePreferencePage"
-		name="PackageMerge">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ElementImportPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ElementImportPreferencePage"
-		name="ElementImport">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.AssociationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.AssociationPreferencePage"
-		name="Association">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.GeneralizationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.GeneralizationPreferencePage"
-		name="Generalization">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.OperationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.OperationPreferencePage"
-		name="Operation">
-	</page>
-			
-</extension>
-
-</plugin>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.properties
deleted file mode 100644
index 9fe9194a1cd..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.properties
+++ /dev/null
@@ -1,10 +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
-#
-##################################################################################
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = RobotML profile and libraries (Incubation)
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.xml
deleted file mode 100644
index 398fe3633c8..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/plugin.xml
+++ /dev/null
@@ -1,702 +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.robotml.diagram.datatypedef.DatatypeDefCreateCommand"
-		icon="icons/obj16/datatypeD.gif"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.CreateCommand"
-		language="robotML"
-		label="Datatype Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.datatypedef.DatatypeDefEditorFactory"
-		icon="icons/obj16/datatypeD.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.datatypedef.CreateCommand"
-		name="Create a new RobotML Datatype Definition Diagram"
-		description="Create a new RobotML Datatype Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.DatatypeDefCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.datatypedef.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.robotml.diagram.datatypedef.CreateCommand"
-			icon="icons/obj16/datatypeD.gif" label="Create a new RobotML Datatype Definition Diagram"
-			style="push" tooltip="Create a new RobotML Datatype Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-					
-		</command>
-	</menu>
-	</menuContribution>
-	
-	
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.robotml.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.datatypedef.CreateCommand"
-			icon="icons/obj16/datatypeD.gif" label="Create a new RobotML Datatype Definition Diagram"
-			style="push" tooltip="Create a new RobotML Datatype Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.datatypedef.CreateCommand"
-			icon="icons/obj16/datatypeD.gif"
-			label="Create a new RobotML Datatype Definition Diagram"
-			style="push"
-			tooltip="Create a new RobotML Datatype Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
-	name="RobotML_DatatypeDef">
-	
-	<paletteDefinition ID="RobotML_DatatypeDef"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="RobotML_DatatypeDef" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/datatypedef.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.datatypedef"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.DatatypeDefViewProvider">
-		<Priority name="High"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="DatatypeDef"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.InheritedClassDiagramViewProvider">
-		<Priority name="High"/>
-		
-		<!-- 
-			"2007" = PACKAGE
-			"2006" = ENUMERATION
-			"2012" = COMMENT
-			"2011" = CONSTRAINT
-			"2010" = DATA_TYPE
-			"2009" = PRIMITIVE_TYPE
-			"2003" = SIGNAL
-			"3009" = PACKAGE_CN
-			"3027" = DATA_TYPE_CN
-			"3025" = ENUMERATION_CN
-			"3026" = PRIMITIVE_TYPE_CN
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3022" = SIGNAL_CN
-			"3028" = COMMENT_CN
-			"3029" = CONSTRAINT_CN
-			"2016" = SHORT_CUT_DIAGRAM
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 2006, 2012, 2011, 2010, 2009, 2003, 3009, 3027, 3025, 3026, 3017, 3022, 3028, 3029, 2016"/>
-		
-		<!-- 
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3018" = DATA_TYPE_PROPERTY_CLN
-			"3019" = DATA_TYPE_OPERATION_CLN
-			"3005" = SIGNAL_PROPERTY_CLN
-		  -->	  
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3017, 3018, 3019, 3005"/>
-		
-		<!-- 
-			"4008" = DEPENDENCY
-			"4010" = PACKAGE_IMPORT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"4009" = ELEMENT_IMPORT
-			"4001" = ASSOCIATION
-			"4002" = GENERALIZATION
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008, 4010, 4013, 4014, 4011, 4009, 4001, 4002"/>
-		
-		<!-- 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.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.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.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.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.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.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>
-		
-		<!-- "notation.Diagram" -->
-		<object id="notation.Diagram" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="notation.Diagram"/>
-		</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.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.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.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>
-		
-		<!-- "uml.PackageMerge" -->
-		<object id="uml.PackageMerge" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PackageMerge"/>
-		</object>
-		
-		<!-- "uml.ElementImport" -->
-		<object id="uml.ElementImport" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.ElementImport"/>
-		</object>
-		
-		<!-- "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>
-		
-		<!-- "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>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Package, uml.Enumeration, uml.Comment, uml.Constraint, uml.DataType, uml.PrimitiveType, uml.Signal, uml.EnumerationLiteral, notation.Diagram, uml.Property, uml.Operation"/>
-		
-		<!-- Additional activation contexts for edges semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
-			elements="uml.Dependency, uml.PackageImport, uml.PackageMerge, uml.ElementImport, uml.Association, uml.Generalization"/>
-			
-	</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.robotml.diagram.datatypedef.provider.DatatypeDefEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.datatypedef.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="DatatypeDef"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2007" = PACKAGE
-			"5026" = PACKAGE_LABEL_NAME_HINT
-			"7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"2006" = ENUMERATION
-			"5023" = ENUMERATION_LABEL_NAME_HINT
-			"7015" = ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT
-			"2012" = COMMENT
-			"5038" = COMMENT_LABEL_BODY_HINT
-			"2011" = CONSTRAINT
-			"5037" = CONSTRAINT_LABEL_NAME_HINT
-			"5159" = CONSTRAINT_LABEL_BODY_HINT
-			"2010" = DATA_TYPE
-			"5035" = DATA_TYPE_LABEL_NAME_HINT
-			"7020" = DATA_TYPE_COMPARTMENT_ATTRIBUTE_HINT
-			"7021" = DATA_TYPE_COMPARTMENT_OPERATION_HINT
-			"2009" = PRIMITIVE_TYPE
-			"5032" = PRIMITIVE_TYPE_LABEL_NAME_HINT
-			"2003" = SIGNAL
-			"5008" = SIGNAL_LABEL_NAME_HINT
-			"7005" = SIGNAL_COMPARTMENT_ATTRIBUTE_HINT
-			"3009" = PACKAGE_CN
-			"5017" = PACKAGE_CN_LABEL_NAME_HINT
-			"7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"3027" = DATA_TYPE_CN
-			"5061" = DATA_TYPE_CN_LABEL_NAME_HINT
-			"7032" = DATA_TYPE_CN_COMPARTMENT_ATTRIBUTE_HINT
-			"7033" = DATA_TYPE_CN_COMPARTMENT_OPERATION_HINT
-			"3025" = ENUMERATION_CN
-			"5055" = ENUMERATION_CN_LABEL_NAME_HINT
-			"7031" = ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT
-			"3026" = PRIMITIVE_TYPE_CN
-			"5058" = PRIMITIVE_TYPE_CN_LABEL_NAME_HINT
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3022" = SIGNAL_CN
-			"5046" = SIGNAL_CN_LABEL_NAME_HINT
-			"7026" = SIGNAL_CN_COMPARTMENT_ATTRIBUTE_HINT
-			"3028" = COMMENT_CN
-			"5063" = COMMENT_CN_LABEL_BODY2_HINT
-			"3029" = CONSTRAINT_CN
-			"5064" = CONSTRAINT_CN_LABEL_NAME2_HINT
-			"5160" = CONSTRAINT_CN_LABEL_BODY_HINT
-			"2016" = SHORT_CUT_DIAGRAM
-			"0" = SHORT_CUT_DIAGRAM_LABEL_DIAGRAM_NAME_HINT
-		  -->
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2007, 5026, 7016"/>
-		</object>
-		<object
-			id="ENUMERATION"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2006, 5023, 7015"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2012, 5038"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2011, 5037, 5159"/>
-		</object>
-		<object
-			id="DATA_TYPE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2010, 5035, 7020, 7021"/>
-		</object>
-		<object
-			id="PRIMITIVE_TYPE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2009, 5032"/>
-		</object>
-		<object
-			id="SIGNAL"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2003, 5008, 7005"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3009, 5017, 7010"/>
-		</object>
-		<object
-			id="DATA_TYPE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3027, 5061, 7032, 7033"/>
-		</object>
-		<object
-			id="ENUMERATION_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3025, 5055, 7031"/>
-		</object>
-		<object
-			id="PRIMITIVE_TYPE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3026, 5058"/>
-		</object>
-		<object
-			id="ENUMERATION_ENUMERATION_LITERAL_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3017"/>
-		</object>
-		<object
-			id="SIGNAL_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3022, 5046, 7026"/>
-		</object>
-		<object
-			id="COMMENT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3028, 5063"/>
-		</object>
-		<object
-			id="CONSTRAINT_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3029, 5064, 5160"/>
-		</object>
-		<object
-			id="SHORT_CUT_DIAGRAM"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2016, 0"/>
-		</object>
-
-		<!-- 	
-			"3017" = ENUMERATION_ENUMERATION_LITERAL_CLN
-			"3018" = DATA_TYPE_PROPERTY_CLN
-			"3019" = DATA_TYPE_OPERATION_CLN
-			"3005" = SIGNAL_PROPERTY_CLN
-		  -->
-		<object
-			id="ENUMERATION_ENUMERATION_LITERAL_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3017"/>
-		</object>
-		<object
-			id="DATA_TYPE_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3018"/>
-		</object>
-		<object
-			id="DATA_TYPE_OPERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3019"/>
-		</object>
-		<object
-			id="SIGNAL_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3005"/>
-		</object>
-				
-		<!-- 	
-			"4008" = DEPENDENCY
-			"6026" = DEPENDENCY_LABEL_NAME_HINT
-			"6027" = DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT
-			"4010" = PACKAGE_IMPORT
-			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"6030" = PACKAGE_MERGE_LABEL_APPLIED_STEREOTYPE_HINT
-			"4009" = ELEMENT_IMPORT
-			"6020" = ELEMENT_IMPORT_LABEL_ALIAS_HINT
-			"6021" = ELEMENT_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
-			"4001" = ASSOCIATION
-			"6001" = ASSOCIATION_LABEL_APPLIED_STEREOTYPE_HINT
-			"6002" = ASSOCIATION_LABEL_NAME2_HINT
-			"6003" = ASSOCIATION_LABEL_NAME3_HINT
-			"6005" = ASSOCIATION_LABEL_NAME5_HINT
-			"6033" = ASSOCIATION_LABEL_MULTIPLICTY_SOURCE_HINT
-			"6034" = ASSOCIATION_LABEL_MULTIPLICTY_TARGET_HINT
-			"4002" = GENERALIZATION
-			"6007" = GENERALIZATION_LABEL_APPLIED_STEREOTYPER_HINT
-		  -->
-		<object
-			id="DEPENDENCY"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4008, 6026, 6027"/>
-		</object>
-		<object
-			id="PACKAGE_IMPORT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4010, 6022"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4013"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4014"/>
-		</object>
-		<object
-			id="PACKAGE_MERGE"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4011, 6030"/>
-		</object>
-		<object
-			id="ELEMENT_IMPORT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4009, 6020, 6021"/>
-		</object>
-		<object
-			id="ASSOCIATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4001, 6001, 6002, 6003, 6005, 6033, 6034"/>
-		</object>
-		<object
-			id="GENERALIZATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4002, 6007"/>
-		</object>
-
-		<context views="PACKAGE, ENUMERATION, COMMENT, CONSTRAINT, DATA_TYPE, PRIMITIVE_TYPE, SIGNAL, PACKAGE_CN, DATA_TYPE_CN, ENUMERATION_CN, PRIMITIVE_TYPE_CN, ENUMERATION_ENUMERATION_LITERAL_CLN, SIGNAL_CN, COMMENT_CN, CONSTRAINT_CN, SHORT_CUT_DIAGRAM"/>
-		<context views="ENUMERATION_ENUMERATION_LITERAL_CLN, DATA_TYPE_PROPERTY_CLN, DATA_TYPE_OPERATION_CLN, SIGNAL_PROPERTY_CLN"/>
-		<context views="DEPENDENCY, PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, PACKAGE_MERGE, ELEMENT_IMPORT, ASSOCIATION, GENERALIZATION"/>
-				
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.provider.DatatypeDefEditPolicyProvider">
-		<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.robotml.diagram.datatypedef.preferences"
-		name="DatatypeDef Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DatatypeDefGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		name="DataType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		name="PrimitiveType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		name="Signal">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage"
-		name="DataType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationPreferencePage"
-		name="Enumeration">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage"
-		name="PrimitiveType">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationLiteralPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationLiteralPreferencePage"
-		name="EnumerationLiteral">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage"
-		name="Signal">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DiagramPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DiagramPreferencePage"
-		name="Diagram">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DependencyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DependencyPreferencePage"
-		name="Dependency">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageImportPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageImportPreferencePage"
-		name="PackageImport">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintConstrainedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintConstrainedElementPreferencePage"
-		name="ConstraintConstrainedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageMergePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageMergePreferencePage"
-		name="PackageMerge">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ElementImportPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ElementImportPreferencePage"
-		name="ElementImport">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.AssociationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.AssociationPreferencePage"
-		name="Association">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.GeneralizationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.GeneralizationPreferencePage"
-		name="Generalization">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.OperationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.OperationPreferencePage"
-		name="Operation">
-	</page>
-			
-</extension>
-
-</plugin>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/Activator.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/Activator.java
deleted file mode 100644
index 79219fffa02..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/Activator.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef;
-
-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.robotml.diagram.datatypedef.preferences.DatatypeDefPreferenceInitializer;
-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.robotml.diagram.datatypedef";
-
-	/** 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)
-	 */
-	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
-		DatatypeDefPreferenceInitializer diagramPreferenceInitializer = new DatatypeDefPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator 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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefCreateCommand.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefCreateCommand.java
deleted file mode 100644
index f412244be69..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefCreateCommand.java
+++ /dev/null
@@ -1,40 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class DatatypeDefCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	@Override
-	protected String getDefaultDiagramName() {
-		return "DataTypesDiagram";
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return DatatypeDefEditPart.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefEditorFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefEditorFactory.java
deleted file mode 100644
index d0444671561..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefEditorFactory.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class DatatypeDefEditorFactory extends GmfEditorFactory {
-
-	public DatatypeDefEditorFactory() {
-		super(DatatypeDefForMultiEditor.class, DatatypeDefEditPart.DIAGRAM_ID);
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefForMultiEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefForMultiEditor.java
deleted file mode 100644
index 963f3c3f8a3..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/DatatypeDefForMultiEditor.java
+++ /dev/null
@@ -1,114 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef;
-
-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.robotml.diagram.datatypedef.part.DatatypeDefEditor;
-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 DatatypeDefForMultiEditor extends DatatypeDefEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/datatypeD.gif";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(DatatypeDefForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 * 
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 * 
-	 */
-	public DatatypeDefForMultiEditor(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(getDiagram().getName());
-		setTitleImage(DIAG_IMG_DESC.createImage());
-	}
-
-	/**
-	 * {@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.robotml.diagram.datatypedef.EditingDomain";
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/edit/part/DatatypeDefEditPart.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/edit/part/DatatypeDefEditPart.java
deleted file mode 100644
index 41c43ecbc20..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/edit/part/DatatypeDefEditPart.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.policy.DatatypeDefDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-
-public class DatatypeDefEditPart extends DiagramEditPart {
-
-	public final static String DIAGRAM_ID = "DatatypeDef"; //$NON-NLS-1$
-
-	public DatatypeDefEditPart(View view) {
-		super(view);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelItemSemanticEditPolicy());
-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DatatypeDefDragDropEditPolicy());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/edit/policy/DatatypeDefDragDropEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/edit/policy/DatatypeDefDragDropEditPolicy.java
deleted file mode 100644
index 5d29b6a0c18..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/edit/policy/DatatypeDefDragDropEditPolicy.java
+++ /dev/null
@@ -1,212 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.provider.DatatypeDefElementTypes;
-
-/** Customization of the DND edit policy for the DatatypeDef Diagram */
-public class DatatypeDefDragDropEditPolicy extends ClassDiagramDragDropEditPolicy {
-
-	@Override
-	public int getNodeVisualID(View containerView, EObject domainElement) {
-		return new Integer(getNodeGraphicalHint(containerView, domainElement));
-	}
-
-	protected String getNodeGraphicalHint(View containerView, EObject domainElement) {
-		String UNDEFINED = "-1";
-
-		String containerGraphicalHint = containerView.getType();
-		if(containerGraphicalHint == null) {
-			// Cannot guess domain element graphical hint.
-			return UNDEFINED;
-		}
-
-		// Fill the semantic hint during the drop
-		// Elements inherited from ClassDiagram
-		// Dropping Package
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.PACKAGE.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping Enumeration
-		if(domainElement instanceof org.eclipse.uml2.uml.Enumeration) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.ENUMERATION.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.ENUMERATION_CN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.ENUMERATION_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping Comment
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.COMMENT.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.COMMENT_CN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.COMMENT_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping Constraint
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.CONSTRAINT.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.CONSTRAINT_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping DataType
-
-		// Dropping PrimitiveType
-		if(domainElement instanceof org.eclipse.uml2.uml.PrimitiveType) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.PRIMITIVE_TYPE.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.PRIMITIVE_TYPE_CN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.PRIMITIVE_TYPE_CN.getSemanticHint();
-			}
-
-		} else if(domainElement instanceof org.eclipse.uml2.uml.DataType) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.DATA_TYPE.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.DATA_TYPE_CN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.DATA_TYPE_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping Signal
-		if(domainElement instanceof org.eclipse.uml2.uml.Signal) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.SIGNAL.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.SIGNAL_CN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.SIGNAL_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping EnumerationLiteral
-		if(domainElement instanceof org.eclipse.uml2.uml.EnumerationLiteral) {
-			if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint();
-			}
-
-			if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint();
-			}
-		} else
-		// Dropping Diagram
-		if(domainElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.SHORT_CUT_DIAGRAM.getSemanticHint();
-			}
-
-		} else
-		// Dropping Property
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-
-			if(DatatypeDefElementTypes.SIGNAL_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.SIGNAL_PROPERTY_CLN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.SIGNAL_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.SIGNAL_PROPERTY_CLN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.DATA_TYPE_PROPERTY_CLN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.DATA_TYPE_PROPERTY_CLN.getSemanticHint();
-			}
-		} else
-		// Dropping Operation
-		if(domainElement instanceof org.eclipse.uml2.uml.Operation) {
-
-			if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.DATA_TYPE_OPERATION_CLN.getSemanticHint();
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalHint)) {
-				return DatatypeDefElementTypes.DATA_TYPE_OPERATION_CLN.getSemanticHint();
-			}
-		}
-
-		return UNDEFINED;
-	}
-
-	@Override
-	public int getLinkWithClassVisualID(EObject domainElement) {
-		return new Integer(getLinkGraphicalHint(domainElement));
-	}
-
-	protected String getLinkGraphicalHint(EObject domainElement) {
-		String UNDEFINED = "-1";
-
-		if(domainElement instanceof org.eclipse.uml2.uml.Dependency) {
-			return DatatypeDefElementTypes.DEPENDENCY.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.PackageImport) {
-			return DatatypeDefElementTypes.PACKAGE_IMPORT.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.PackageMerge) {
-			return DatatypeDefElementTypes.PACKAGE_MERGE.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.ElementImport) {
-			return DatatypeDefElementTypes.ELEMENT_IMPORT.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Association) {
-			return DatatypeDefElementTypes.ASSOCIATION.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Generalization) {
-			return DatatypeDefElementTypes.GENERALIZATION.getSemanticHint();
-		}
-
-		return UNDEFINED;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/factory/DatatypeDefViewFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/factory/DatatypeDefViewFactory.java
deleted file mode 100644
index 1e8b37158cd..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/factory/DatatypeDefViewFactory.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class DatatypeDefViewFactory extends DiagramViewFactory {
-
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/part/DatatypeDefEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/part/DatatypeDefEditor.java
deleted file mode 100644
index e794b2294cb..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/part/DatatypeDefEditor.java
+++ /dev/null
@@ -1,485 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.part;
-
-import java.util.EventObject;
-import java.util.Set;
-
-import org.eclipse.core.commands.operations.IUndoableOperation;
-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.infra.core.editor.IMultiDiagramEditor;
-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.robotml.diagram.datatypedef.Activator;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
-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 DatatypeDefEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.robotml.diagram.datatypedef.part.DatatypeDefEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-
-	/**
-	 * @generated
-	 */
-	private IUndoableOperation savedOperation = null;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public DatatypeDefEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, 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
-	 */
-	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
-	 */
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	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
-	 */
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isDirty() {
-		IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
-		return savedOperation != op;
-	}
-
-
-	/**
-	 * @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
-	 */
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	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.
-			 */
-			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());
-			}
-
-			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
-						 */
-						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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/AssociationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/AssociationPreferencePage.java
deleted file mode 100644
index 3b64bcfe105..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/AssociationPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class AssociationPreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Association";
-
-	public AssociationPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Association"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/CommentAnnotatedElementPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/CommentAnnotatedElementPreferencePage.java
deleted file mode 100644
index 9faf93cc5ef..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/CommentAnnotatedElementPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class CommentAnnotatedElementPreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_CommentAnnotatedElement";
-
-	public CommentAnnotatedElementPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/CommentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/CommentPreferencePage.java
deleted file mode 100644
index ddbf4c6882a..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class CommentPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Comment";
-
-
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ConstraintConstrainedElementPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ConstraintConstrainedElementPreferencePage.java
deleted file mode 100644
index ed81d14051d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ConstraintConstrainedElementPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class ConstraintConstrainedElementPreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_ConstraintConstrainedElement";
-
-	public ConstraintConstrainedElementPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_ConstraintConstrainedElement"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ConstraintPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index 2f1f1b30805..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class ConstraintPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Constraint";
-
-
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java
deleted file mode 100644
index c52d20a4966..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class DataTypePreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_DataType";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment" };
-
-	public DataTypePreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_DataType"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefGeneralPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefGeneralPreferencePage.java
deleted file mode 100644
index 1809c2a50dd..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefGeneralPreferencePage.java
+++ /dev/null
@@ -1,21 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.papyrus.robotml.diagram.datatypedef.Activator;
-
-public class DatatypeDefGeneralPreferencePage extends DiagramPreferencePage {
-
-	public DatatypeDefGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefLinkPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefLinkPreferencePage.java
deleted file mode 100644
index dd84a3c94ee..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefLinkPreferencePage.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.Activator;
-
-public class DatatypeDefLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefNodePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefNodePreferencePage.java
deleted file mode 100644
index c1abbd83ba1..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefNodePreferencePage.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.Activator;
-
-public class DatatypeDefNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefPreferenceInitializer.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefPreferenceInitializer.java
deleted file mode 100644
index f1bbf2964ca..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DatatypeDefPreferenceInitializer.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.Activator;
-
-public class DatatypeDefPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DataTypePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PrimitiveTypePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.EnumerationLiteralPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.SignalPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DiagramPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.DependencyPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageImportPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ConstraintConstrainedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.PackageMergePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.ElementImportPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.AssociationPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.datatypedef.preferences.GeneralizationPreferencePage.initDefaults(store);
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DependencyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DependencyPreferencePage.java
deleted file mode 100644
index 22fa3265fff..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DependencyPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class DependencyPreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Dependency";
-
-	public DependencyPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Dependency"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java
deleted file mode 100644
index 9f2781b2caf..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class DiagramPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Diagram";
-
-
-	public DiagramPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Diagram"); //$NON-NLS-1$
-	}
-
-	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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ElementImportPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ElementImportPreferencePage.java
deleted file mode 100644
index e003471c744..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/ElementImportPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class ElementImportPreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_ElementImport";
-
-	public ElementImportPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_ElementImport"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationLiteralPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationLiteralPreferencePage.java
deleted file mode 100644
index 3da0bc8b0e7..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationLiteralPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class EnumerationLiteralPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_EnumerationLiteral";
-
-
-	public EnumerationLiteralPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_EnumerationLiteral"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java
deleted file mode 100644
index e1bd4d08e50..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class EnumerationPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Enumeration";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "EnumerationLiteralCompartment" };
-
-	public EnumerationPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Enumeration"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/GeneralizationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/GeneralizationPreferencePage.java
deleted file mode 100644
index 31757413f6f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/GeneralizationPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class GeneralizationPreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Generalization";
-
-	public GeneralizationPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Generalization"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/OperationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/OperationPreferencePage.java
deleted file mode 100644
index 9c0415bb925..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/OperationPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class OperationPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Operation";
-
-	public OperationPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Operation"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackageImportPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackageImportPreferencePage.java
deleted file mode 100644
index 7a3c2612a6e..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackageImportPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class PackageImportPreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_PackageImport";
-
-	public PackageImportPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_PackageImport"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackageMergePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackageMergePreferencePage.java
deleted file mode 100644
index 3ff3d67261c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackageMergePreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class PackageMergePreferencePage extends DatatypeDefLinkPreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_PackageMerge";
-
-	public PackageMergePreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_PackageMerge"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java
deleted file mode 100644
index 8fd621a0b79..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class PackagePreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Package";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "PackageableElementCompartment" };
-
-	public PackagePreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Package"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java
deleted file mode 100644
index 144dbf82999..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class PrimitiveTypePreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_PrimitiveType";
-
-
-	public PrimitiveTypePreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_PrimitiveType"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 50);
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PropertyPreferencePage.java
deleted file mode 100644
index 4172ec28545..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PropertyPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class PropertyPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Property";
-
-	public PropertyPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Property"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java
deleted file mode 100644
index 7a3dc0e8a94..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class SignalPreferencePage extends DatatypeDefNodePreferencePage {
-
-	public static String prefKey = DatatypeDefEditPart.DIAGRAM_ID + "_Signal";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "AttributeCompartment" };
-
-	public SignalPreferencePage() {
-		super();
-		setPreferenceKey(DatatypeDefEditPart.DIAGRAM_ID + "_Signal"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefEditPartProvider.java
deleted file mode 100644
index f4b2b5f15f6..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefEditPartProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.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.robotml.diagram.datatypedef.Activator;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class DatatypeDefEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
-
-			// Ensure current diagram is DatatypeDef Diagram
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if(DatatypeDefEditPart.DIAGRAM_ID.equals(view.getType())) {
-			return DatatypeDefEditPart.class;
-		}
-
-		Activator.log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefEditPolicyProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefEditPolicyProvider.java
deleted file mode 100644
index 7e551f40743..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefEditPolicyProvider.java
+++ /dev/null
@@ -1,124 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.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.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.policy.DatatypeDefDragDropEditPolicy;
-
-public class DatatypeDefEditPolicyProvider 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(!DatatypeDefEditPart.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.EnumerationEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart) {
-			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.ConstraintEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart) {
-			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.PackagePackageableElementCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeAttributeCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeOperationCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalAttributeCompartmentEditPart) {
-			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.ConstraintEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShortCutDiagramEditPart) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public void createEditPolicies(EditPart editPart) {
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DatatypeDefDragDropEditPolicy());
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefElementTypes.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefElementTypes.java
deleted file mode 100644
index d4c91094e89..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefElementTypes.java
+++ /dev/null
@@ -1,195 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-public class DatatypeDefElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** Datatype Definition Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** Datatype Definition Diagram :: Diagram */
-	public static final IHintedType DATATYPE_DEF_DIAGRAM = (IHintedType)getElementType("DatatypeDef"); //$NON-NLS-1$
-
-
-
-
-	/** ********************************************************* */
-	/** Datatype Definition Diagram - ClassDiagram related elements */
-	/** ********************************************************* */
-
-
-	/** ClassDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
-
-	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016";
-
-	public static final String PACKAGE_LABEL_NAME_HINT = "5026";
-
-	/** ClassDiagram :: ENUMERATION */
-	public static final IHintedType ENUMERATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006"); //$NON-NLS-1$
-
-	public static final String ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT = "7015";
-
-	public static final String ENUMERATION_LABEL_NAME_HINT = "5023";
-
-	/** ClassDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
-
-	public static final String COMMENT_LABEL_BODY_HINT = "5038";
-
-	/** ClassDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = "5037";
-
-	public static final String CONSTRAINT_LABEL_BODY_HINT = "5159";
-
-	/** ClassDiagram :: DATA_TYPE */
-	public static final IHintedType DATA_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_2010"); //$NON-NLS-1$
-
-	public static final String DATA_TYPE_COMPARTMENT_ATTRIBUTE_HINT = "7020";
-
-	public static final String DATA_TYPE_COMPARTMENT_OPERATION_HINT = "7021";
-
-	public static final String DATA_TYPE_LABEL_NAME_HINT = "5035";
-
-	/** ClassDiagram :: PRIMITIVE_TYPE */
-	public static final IHintedType PRIMITIVE_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009"); //$NON-NLS-1$
-
-	public static final String PRIMITIVE_TYPE_LABEL_NAME_HINT = "5032";
-
-	/** ClassDiagram :: SIGNAL */
-	public static final IHintedType SIGNAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"); //$NON-NLS-1$
-
-	public static final String SIGNAL_COMPARTMENT_ATTRIBUTE_HINT = "7005";
-
-	public static final String SIGNAL_LABEL_NAME_HINT = "5008";
-
-	/** ClassDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
-
-	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010";
-
-	public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017";
-
-	/** ClassDiagram :: DATA_TYPE_CN */
-	public static final IHintedType DATA_TYPE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"); //$NON-NLS-1$
-
-	public static final String DATA_TYPE_CN_COMPARTMENT_ATTRIBUTE_HINT = "7032";
-
-	public static final String DATA_TYPE_CN_COMPARTMENT_OPERATION_HINT = "7033";
-
-	public static final String DATA_TYPE_CN_LABEL_NAME_HINT = "5061";
-
-	/** ClassDiagram :: ENUMERATION_CN */
-	public static final IHintedType ENUMERATION_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"); //$NON-NLS-1$
-
-	public static final String ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT = "7031";
-
-	public static final String ENUMERATION_CN_LABEL_NAME_HINT = "5055";
-
-	/** ClassDiagram :: PRIMITIVE_TYPE_CN */
-	public static final IHintedType PRIMITIVE_TYPE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"); //$NON-NLS-1$
-
-	public static final String PRIMITIVE_TYPE_CN_LABEL_NAME_HINT = "5058";
-
-
-
-	/** ClassDiagram :: SIGNAL_CN */
-	public static final IHintedType SIGNAL_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"); //$NON-NLS-1$
-
-	public static final String SIGNAL_CN_COMPARTMENT_ATTRIBUTE_HINT = "7026";
-
-	public static final String SIGNAL_CN_LABEL_NAME_HINT = "5046";
-
-	/** ClassDiagram :: COMMENT_CN */
-	public static final IHintedType COMMENT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$
-
-	public static final String COMMENT_CN_LABEL_BODY2_HINT = "5063";
-
-	/** ClassDiagram :: CONSTRAINT_CN */
-	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
-
-	public static final String CONSTRAINT_CN_LABEL_NAME2_HINT = "5064";
-
-	public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5160";
-
-	/** ClassDiagram :: SHORT_CUT_DIAGRAM */
-	public static final IHintedType SHORT_CUT_DIAGRAM = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"); //$NON-NLS-1$
-
-	public static final String SHORT_CUT_DIAGRAM_LABEL_DIAGRAM_NAME_HINT = "0";
-
-
-	/** ClassDiagram :: DEPENDENCY */
-	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
-
-	public static final String DEPENDENCY_LABEL_NAME_HINT = "6026";
-
-	public static final String DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT = "6027";
-
-	/** ClassDiagram :: PACKAGE_IMPORT */
-	public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$
-
-	public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = "6022";
-
-	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
-
-	/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
-
-	/** ClassDiagram :: PACKAGE_MERGE */
-	public static final IHintedType PACKAGE_MERGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"); //$NON-NLS-1$
-
-	public static final String PACKAGE_MERGE_LABEL_APPLIED_STEREOTYPE_HINT = "6030";
-
-	/** ClassDiagram :: ELEMENT_IMPORT */
-	public static final IHintedType ELEMENT_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009"); //$NON-NLS-1$
-
-	public static final String ELEMENT_IMPORT_LABEL_ALIAS_HINT = "6020";
-
-	public static final String ELEMENT_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = "6021";
-
-	/** ClassDiagram :: ASSOCIATION */
-	public static final IHintedType ASSOCIATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Association_4001"); //$NON-NLS-1$
-
-	public static final String ASSOCIATION_LABEL_APPLIED_STEREOTYPE_HINT = "6001";
-
-	public static final String ASSOCIATION_LABEL_NAME2_HINT = "6002";
-
-	public static final String ASSOCIATION_LABEL_NAME3_HINT = "6003";
-
-	public static final String ASSOCIATION_LABEL_NAME5_HINT = "6005";
-
-	public static final String ASSOCIATION_LABEL_MULTIPLICTY_SOURCE_HINT = "6033";
-
-	public static final String ASSOCIATION_LABEL_MULTIPLICTY_TARGET_HINT = "6034";
-
-	/** ClassDiagram :: GENERALIZATION */
-	public static final IHintedType GENERALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"); //$NON-NLS-1$
-
-	public static final String GENERALIZATION_LABEL_APPLIED_STEREOTYPER_HINT = "6007";
-
-	/** ClassDiagram :: ChildLabelNodes */
-	public static final IHintedType ENUMERATION_ENUMERATION_LITERAL_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"); //$NON-NLS-1$
-
-	public static final IHintedType DATA_TYPE_PROPERTY_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3018"); //$NON-NLS-1$
-
-	public static final IHintedType DATA_TYPE_OPERATION_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3019"); //$NON-NLS-1$
-
-	public static final IHintedType SIGNAL_PROPERTY_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3005"); //$NON-NLS-1$
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefViewProvider.java
deleted file mode 100644
index b479840b0a8..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/DatatypeDefViewProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.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.robotml.diagram.datatypedef.Activator;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.factory.DatatypeDefViewFactory;
-
-public class DatatypeDefViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if(DatatypeDefEditPart.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if(DatatypeDefEditPart.DIAGRAM_ID.equals(diagramKind)) {
-			return DatatypeDefViewFactory.class;
-		}
-
-		Activator.log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/InheritedClassDiagramEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/InheritedClassDiagramEditPartProvider.java
deleted file mode 100644
index c8cfc922e70..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/InheritedClassDiagramEditPartProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.datatypedef.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.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-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 DatatypeDef Diagram
-			if(!DatatypeDefEditPart.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.Enumeration) {
-				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.DataType) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.PrimitiveType) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Signal) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.EnumerationLiteral) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Property) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Operation) {
-				return true;
-			}
-
-			/** Edges *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.Dependency) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.PackageImport) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.PackageMerge) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.ElementImport) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Association) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Generalization) {
-				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.
-			String hint = view.getType();
-
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(DatatypeDefElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(DatatypeDefElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/InheritedClassDiagramViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/InheritedClassDiagramViewProvider.java
deleted file mode 100644
index e275fe1a9b9..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/provider/InheritedClassDiagramViewProvider.java
+++ /dev/null
@@ -1,564 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.datatypedef.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.uml.diagram.clazz.providers.UMLViewProvider;
-import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
-
-public class InheritedClassDiagramViewProvider extends UMLViewProvider {
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		// No need to override here, assuming provides is correctly implemented.
-		Edge createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-
-		if(createdEdge == null) {
-			log.error(new Exception("Could not create Edge."));
-		}
-
-		return createdEdge;
-	}
-
-	protected boolean provides(CreateViewForKindOperation op) {
-
-		// This provider is registered for Internal Block Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!DatatypeDefEditPart.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 DatatypeDef Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!DatatypeDefEditPart.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == DatatypeDefElementTypes.DEPENDENCY) {
-			return true;
-		}
-		if(elementType == DatatypeDefElementTypes.PACKAGE_IMPORT) {
-			return true;
-		}
-		if(elementType == DatatypeDefElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			return true;
-		}
-		if(elementType == DatatypeDefElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
-			return true;
-		}
-		if(elementType == DatatypeDefElementTypes.PACKAGE_MERGE) {
-			return true;
-		}
-		if(elementType == DatatypeDefElementTypes.ELEMENT_IMPORT) {
-			return true;
-		}
-		if(elementType == DatatypeDefElementTypes.ASSOCIATION) {
-			return true;
-		}
-		if(elementType == DatatypeDefElementTypes.GENERALIZATION) {
-			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 DatatypeDef Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!DatatypeDefEditPart.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 == DatatypeDefElementTypes.PACKAGE) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.ENUMERATION) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.COMMENT) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.CONSTRAINT) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.DATA_TYPE) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.PRIMITIVE_TYPE) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.SIGNAL) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.PACKAGE_CN) {
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.DATA_TYPE_CN) {
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.ENUMERATION_CN) {
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.PRIMITIVE_TYPE_CN) {
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN) {
-			if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.SIGNAL_CN) {
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.COMMENT_CN) {
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.CONSTRAINT_CN) {
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.SHORT_CUT_DIAGRAM) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN) {
-			if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.DATA_TYPE_PROPERTY_CLN) {
-			if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.DATA_TYPE_OPERATION_CLN) {
-			if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == DatatypeDefElementTypes.SIGNAL_PROPERTY_CLN) {
-			if(DatatypeDefElementTypes.SIGNAL_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(DatatypeDefElementTypes.SIGNAL_COMPARTMENT_ATTRIBUTE_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);
-			if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Package TopNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Enumeration) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Enumeration TopNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Enumeration ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Enumeration ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Comment TopNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Constraint TopNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.DataType) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // DataType TopNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // DataType ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // DataType ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.PrimitiveType) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // PrimitiveType TopNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // PrimitiveType ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // PrimitiveType ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Signal) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Signal TopNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Signal ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Signal ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.EnumerationLiteral) {
-				if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildNode
-					return true;
-				}
-
-				if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildLabelNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildLabelNode
-					return true;
-				}
-			}
-			if(domainElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-				if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Diagram TopNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-
-				if(DatatypeDefElementTypes.SIGNAL_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.SIGNAL_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-					return true;
-				}
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Operation) {
-
-				if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-					return true;
-				}
-				if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-					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);
-		}
-
-		// SemanticHint may be null when the element is created indirectly by
-		// DND from model explorer
-		// ex: Drag and drop a Connector may require to show ConnectorEnd first.
-		EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-
-		// Get the type of the container
-		String containerGraphicalType = containerView.getType();
-
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Package TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.PACKAGE.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.PACKAGE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.PACKAGE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Enumeration) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Enumeration TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.ENUMERATION.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Enumeration ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.ENUMERATION_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Enumeration ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.ENUMERATION_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Comment TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.COMMENT.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.COMMENT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Comment ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.COMMENT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Constraint TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.CONSTRAINT.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.CONSTRAINT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Constraint ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.CONSTRAINT_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.DataType) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // DataType TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.DATA_TYPE.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // DataType ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.DATA_TYPE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // DataType ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.DATA_TYPE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.PrimitiveType) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // PrimitiveType TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.PRIMITIVE_TYPE.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // PrimitiveType ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.PRIMITIVE_TYPE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // PrimitiveType ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.PRIMITIVE_TYPE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Signal) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Signal TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.SIGNAL.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Signal ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.SIGNAL_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Signal ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.SIGNAL_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.EnumerationLiteral) {
-			if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-			if(DatatypeDefElementTypes.ENUMERATION_CN_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.ENUMERATION_COMPARTMENT_ENUMERATION_LITERAL_HINT.equals(containerGraphicalType)) { // EnumerationLiteral ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.ENUMERATION_ENUMERATION_LITERAL_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-		}
-		if(domainElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			if(DatatypeDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Diagram TopNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.SHORT_CUT_DIAGRAM.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-
-			if(DatatypeDefElementTypes.SIGNAL_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.SIGNAL_PROPERTY_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.SIGNAL_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.SIGNAL_PROPERTY_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.DATA_TYPE_PROPERTY_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.DATA_TYPE_PROPERTY_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Operation) {
-
-			if(DatatypeDefElementTypes.DATA_TYPE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.DATA_TYPE_OPERATION_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(DatatypeDefElementTypes.DATA_TYPE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, DatatypeDefElementTypes.DATA_TYPE_OPERATION_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-		}
-
-		log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if(!DatatypeDefEditPart.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", DatatypeDefEditPart.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.classpath b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.classpath
deleted file mode 100644
index 1bdc2a0ba05..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.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-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.project b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.project
deleted file mode 100644
index 327fed55d77..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.robotml.diagram.interfacedef</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.settings/org.eclipse.jdt.core.prefs b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0f6c4f5af03..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Feb 16 09:06:49 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/META-INF/MANIFEST.MF
deleted file mode 100644
index d8260b2bd0e..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",

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

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0",

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

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

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

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

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.interfacedef.Act

- ivator

-Bundle-SymbolicName: org.eclipse.papyrus.robotml.diagram.interfacedef;

- singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/META-INF/MANIFEST.gen.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/META-INF/MANIFEST.gen.MF
deleted file mode 100644
index e9940c39e42..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/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.robotml.diagram.interfacedef;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.robotml.diagram.interfacedef.Activator
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.papyrus.core.adaptor.gmf,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.diagram.clazz,
- org.eclipse.papyrus.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/about.html b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/build.gen.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/build.gen.properties
deleted file mode 100644
index ca6d14e16f2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/build.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/build.properties
deleted file mode 100644
index 5b7fa539491..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src-gen/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               palettes/,\
-               model/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
-
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/icons/obj16/interfaceDiagram.gif b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/icons/obj16/interfaceDiagram.gif
deleted file mode 100644
index 0bbbb57754f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/icons/obj16/interfaceDiagram.gif
+++ /dev/null
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/model/Proteus.interfacedef.idgen b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/model/Proteus.interfacedef.idgen
deleted file mode 100644
index e200f08749f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/model/Proteus.interfacedef.idgen
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<diagramcontent:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagramcontent="http://www.eclipse.org/papyrus/0.7.0/diagramcontent" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" name="InterfaceDef" label="Interface Definition Diagram" icon="icons/obj16/interfaceDiagram.gif" hint="InterfaceDef" javaPackagePrefix="org.eclipse.papyrus.robotml.diagram.interfacedef" javaClassPrefix="InterfaceDef" language="proteus" createCommandLabel="Create a new Proteus Interface Definition Diagram">
-  <diagramEditPart name="InterfaceDefEditPart">
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy" key="EditPolicyRoles.SEMANTIC_ROLE"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy" key="&quot;RemoveOrphanView&quot;"/>
-    <behaviors javaClassQualifiedName="org.eclipse.papyrus.robotml.diagram.interfacedef.edit.policy.InterfaceDefDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>
-  </diagramEditPart>
-  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy" paletteToolPrefix="clazz.tool">
-    <genInheritedEditor href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>
-    <genNodes>
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>
-    </genNodes>
-    <genNodes>
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.14"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.13"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.19"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.15"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.6"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.15"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.29"/>
-    </genNodes>
-    <genNodes name="">
-      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.30"/>
-    </genNodes>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>
-    </genLinks>
-    <genLinks>
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.17"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.14"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.4"/>
-    </genLinks>
-    <genLinks name="">
-      <genLink href="../../org.eclipse.papyrus.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.5"/>
-    </genLinks>
-  </inheritedDiagrams>
-</diagramcontent:Diagram>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/palettes/interfacedef.palette.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/palettes/interfacedef.palette.gen.xml
deleted file mode 100644
index da894e7df53..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/palettes/interfacedef.palette.gen.xml
+++ /dev/null
@@ -1,57 +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.robotml.diagram.interfacedef.PROTEUS_InterfaceDef__Tools" name="Tools">
-			<aspectTool description="Create a new Package" id="interfacedef.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new Comment" id="interfacedef.tool.comment"
-				name="Comment" refToolId="clazz.tool.comment">
-			</aspectTool>
-			<aspectTool description="Create a new Constraint" id="interfacedef.tool.constraint"
-				name="Constraint" refToolId="clazz.tool.constraint">
-			</aspectTool>
-			<aspectTool description="Create a new Package" id="interfacedef.tool.package"
-				name="Package" refToolId="clazz.tool.package">
-			</aspectTool>
-			<aspectTool description="Create a new Interface" id="interfacedef.tool.interface"
-				name="Interface" refToolId="clazz.tool.interface">
-			</aspectTool>
-			<aspectTool description="Create a new Interface" id="interfacedef.tool.interface"
-				name="Interface" refToolId="clazz.tool.interface">
-			</aspectTool>
-			<aspectTool description="Create a new Diagram" id="interfacedef.tool.diagram"
-				name="Diagram" refToolId=>
-			</aspectTool>
-			<aspectTool description="Create a new Property" id="interfacedef.tool.property"
-				name="Property" refToolId="clazz.tool.property">
-			</aspectTool>
-			<aspectTool description="Create a new Operation" id="interfacedef.tool.operation"
-				name="Operation" refToolId="clazz.tool.operation">
-			</aspectTool>
-			<aspectTool description="Create a new Class" id="interfacedef.tool.class"
-				name="Class" refToolId="clazz.tool.class">
-			</aspectTool>
-			<aspectTool description="Create a new PackageImport" id="interfacedef.tool.packageimport"
-				name="PackageImport" refToolId="clazz.tool.packageimport">
-			</aspectTool>
-			<aspectTool description="Create a new CommentAnnotatedElement" id="interfacedef.tool.commentannotatedelement"
-				name="CommentAnnotatedElement" refToolId="clazz.tool.link">
-			</aspectTool>
-			<aspectTool description="Create a new ConstraintConstrainedElement" id="interfacedef.tool.constraintconstrainedelement"
-				name="ConstraintConstrainedElement" refToolId="clazz.tool.link">
-			</aspectTool>
-			<aspectTool description="Create a new PackageMerge" id="interfacedef.tool.packagemerge"
-				name="PackageMerge" refToolId="clazz.tool.packagemerge">
-			</aspectTool>
-			<aspectTool description="Create a new Generalization" id="interfacedef.tool.generalization"
-				name="Generalization" refToolId="clazz.tool.generalization">
-			</aspectTool>
-			<aspectTool description="Create a new InterfaceRealization" id="interfacedef.tool.interfacerealization"
-				name="InterfaceRealization" refToolId="clazz.tool.interfacerealization">
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.gen.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.gen.xml
deleted file mode 100644
index b3be730c444..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.gen.xml
+++ /dev/null
@@ -1,506 +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.robotml.diagram.interfacedef.InterfaceDefCreateCommand"
-		icon="icons/obj16/interfaceDiagram.gif"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.CreateCommand"
-		language="proteus"
-		label="Interface Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.interfacedef.InterfaceDefEditorFactory"
-		icon="icons/obj16/interfaceDiagram.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.interfacedef.CreateCommand"
-		name="Create a new Proteus Interface Definition Diagram"
-		description="Create a new Proteus Interface Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.InterfaceDefCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.interfacedef.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.robotml.diagram.interfacedef.CreateCommand"
-			icon="icons/obj16/interfaceDiagram.gif" label="Create a new Proteus Interface Definition Diagram"
-			style="push" tooltip="Create a new Proteus Interface Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</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.robotml.diagram.interfacedef.CreateCommand"
-			icon="icons/obj16/interfaceDiagram.gif" label="Create a new Proteus Interface Definition Diagram"
-			style="push" tooltip="Create a new Proteus Interface Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.interfacedef.CreateCommand"
-			icon="icons/obj16/interfaceDiagram.gif"
-			label="Create a new Proteus Interface Definition Diagram"
-			style="push"
-			tooltip="Create a new Proteus Interface Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.diagram.common.paletteDefinition"
-	name="PROTEUS_InterfaceDef">
-	
-	<paletteDefinition ID="PROTEUS_InterfaceDef"
-		class="org.eclipse.papyrus.diagram.common.service.PluginPaletteProvider"
-		name="PROTEUS_InterfaceDef" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/interfacedef.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.interfacedef"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InterfaceDefViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="InterfaceDef"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InheritedClassDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- 
-			"2007" = PACKAGE
-			"2012" = COMMENT
-			"2011" = CONSTRAINT
-			"3009" = PACKAGE_CN
-			"3023" = INTERFACE_CN
-			"2004" = INTERFACE
-			"2016" = SHORT_CUT_DIAGRAM
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 2012, 2011, 3009, 3023, 2004, 2016"/>
-		
-		<!-- 
-			"3006" = INTERFACE_PROPERTY_CLN
-			"3007" = INTERFACE_OPERATION_CLN
-			"3008" = INTERFACE_CLASS_CLN
-		  -->	  
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3006, 3007, 3008"/>
-		
-		<!-- 
-			"4010" = PACKAGE_IMPORT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"4002" = GENERALIZATION
-			"4003" = INTERFACE_REALIZATION
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4010, 4013, 4014, 4011, 4002, 4003"/>
-		
-		<!-- 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.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.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>
-		
-		<!-- "notation.Diagram" -->
-		<object id="notation.Diagram" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="notation.Diagram"/>
-		</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.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.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.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>
-		
-		<!-- "uml.PackageMerge" -->
-		<object id="uml.PackageMerge" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PackageMerge"/>
-		</object>
-		
-		<!-- "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>
-		
-		<!-- "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>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Package, uml.Comment, uml.Constraint, uml.Interface, notation.Diagram, uml.Property, uml.Operation, uml.Class"/>
-		
-		<!-- Additional activation contexts for edges semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
-			elements="uml.PackageImport, uml.PackageMerge, uml.Generalization, uml.InterfaceRealization"/>
-			
-	</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.robotml.diagram.interfacedef.provider.InterfaceDefEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.interfacedef.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="InterfaceDef"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2007" = PACKAGE
-			"5026" = PACKAGE_LABEL_NAME_HINT
-			"7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"2012" = COMMENT
-			"5038" = COMMENT_LABEL_BODY_HINT
-			"2011" = CONSTRAINT
-			"5037" = CONSTRAINT_LABEL_NAME_HINT
-			"5159" = CONSTRAINT_LABEL_BODY_HINT
-			"3009" = PACKAGE_CN
-			"5017" = PACKAGE_CN_LABEL_NAME_HINT
-			"7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"3023" = INTERFACE_CN
-			"5049" = INTERFACE_CN_LABEL_NAME_HINT
-			"7027" = INTERFACE_CN_COMPARTMENT_ATTRIBUTE_HINT
-			"7028" = INTERFACE_CN_COMPARTMENT_OPERATION_HINT
-			"7029" = INTERFACE_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT
-			"2004" = INTERFACE
-			"5011" = INTERFACE_LABEL_NAME_HINT
-			"7006" = INTERFACE_COMPARTMENT_ATTRIBUTE_HINT
-			"7007" = INTERFACE_COMPARTMENT_OPERATION_HINT
-			"7008" = INTERFACE_COMPARTMENT_NESTED_CLASSIFIER_HINT
-			"2016" = SHORT_CUT_DIAGRAM
-			"0" = SHORT_CUT_DIAGRAM_LABEL_DIAGRAM_NAME_HINT
-		  -->
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2007, 5026, 7016"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2012, 5038"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2011, 5037, 5159"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3009, 5017, 7010"/>
-		</object>
-		<object
-			id="INTERFACE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3023, 5049, 7027, 7028, 7029"/>
-		</object>
-		<object
-			id="INTERFACE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2004, 5011, 7006, 7007, 7008"/>
-		</object>
-		<object
-			id="SHORT_CUT_DIAGRAM"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2016, 0"/>
-		</object>
-
-		<!-- 	
-			"3006" = INTERFACE_PROPERTY_CLN
-			"3007" = INTERFACE_OPERATION_CLN
-			"3008" = INTERFACE_CLASS_CLN
-		  -->
-		<object
-			id="INTERFACE_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3006"/>
-		</object>
-		<object
-			id="INTERFACE_OPERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3007"/>
-		</object>
-		<object
-			id="INTERFACE_CLASS_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3008"/>
-		</object>
-				
-		<!-- 	
-			"4010" = PACKAGE_IMPORT
-			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"6030" = PACKAGE_MERGE_LABEL_APPLIED_STEREOTYPE_HINT
-			"4002" = GENERALIZATION
-			"6007" = GENERALIZATION_LABEL_APPLIED_STEREOTYPER_HINT
-			"4003" = INTERFACE_REALIZATION
-			"6008" = INTERFACE_REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT
-			"6009" = INTERFACE_REALIZATION_LABEL_NAME2_HINT
-		  -->
-		<object
-			id="PACKAGE_IMPORT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4010, 6022"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4013"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4014"/>
-		</object>
-		<object
-			id="PACKAGE_MERGE"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4011, 6030"/>
-		</object>
-		<object
-			id="GENERALIZATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4002, 6007"/>
-		</object>
-		<object
-			id="INTERFACE_REALIZATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4003, 6008, 6009"/>
-		</object>
-
-		<context views="PACKAGE, COMMENT, CONSTRAINT, PACKAGE_CN, INTERFACE_CN, INTERFACE, DIAGRAM"/>
-		<context views="INTERFACE_PROPERTY_CLN, INTERFACE_OPERATION_CLN, INTERFACE_CLASS_CLN"/>
-		<context views="PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, PACKAGE_MERGE, GENERALIZATION, INTERFACE_REALIZATION"/>
-				
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InterfaceDefEditPolicyProvider">
-		<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.robotml.diagram.interfacedef.preferences"
-		name="InterfaceDef Diagram"
-		category="org.eclipse.papyrus.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfaceDefGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		name="Interface">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		name="Interface">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.DiagramPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.DiagramPreferencePage"
-		name="Diagram">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageImportPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageImportPreferencePage"
-		name="PackageImport">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintConstrainedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintConstrainedElementPreferencePage"
-		name="ConstraintConstrainedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageMergePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageMergePreferencePage"
-		name="PackageMerge">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.GeneralizationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.GeneralizationPreferencePage"
-		name="Generalization">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfaceRealizationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfaceRealizationPreferencePage"
-		name="InterfaceRealization">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.OperationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.OperationPreferencePage"
-		name="Operation">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ClassPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ClassPreferencePage"
-		name="Class">
-	</page>
-			
-</extension>
-
-</plugin>
\ No newline at end of file
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.properties b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.properties
deleted file mode 100644
index 9fe9194a1cd..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.properties
+++ /dev/null
@@ -1,10 +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
-#
-##################################################################################
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = RobotML profile and libraries (Incubation)
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.xml
deleted file mode 100644
index 64469e0f89e..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/plugin.xml
+++ /dev/null
@@ -1,525 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.contexts">
-      <context
-            id="org.eclipse.papyrus.robotml.diagram.interfacedef.diagramContext"
-            name="InterfaceDefDiagramContext"
-            parentId="org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext">
-      </context>
-   </extension>
- <!-- Diagram declaration -->
-<extension point="org.eclipse.papyrus.infra.core.papyrusDiagram">
-	<creationCommand
-		creationCommandClass="org.eclipse.papyrus.robotml.diagram.interfacedef.InterfaceDefCreateCommand"
-		icon="icons/obj16/interfaceI.gif"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.CreateCommand"
-		language="robotML"
-		label="Interface Definition Diagram"/>
-	<editorDiagram
-		actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
-		factoryClass="org.eclipse.papyrus.robotml.diagram.interfacedef.InterfaceDefEditorFactory"
-		icon="icons/obj16/interfaceI.gif" />
-</extension>
-
-<!-- Diagram creation command and handler -->
-<extension point="org.eclipse.ui.commands">
-	<command id="org.eclipse.papyrus.robotml.diagram.interfacedef.CreateCommand"
-		name="Create a new RobotML Interface Definition Diagram"
-		description="Create a new RobotML Interface Definition Diagram"
-		categoryId="org.eclipse.papyrus.editor.category"/>
-</extension>
-
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.InterfaceDefCreateCommand"
-		commandId="org.eclipse.papyrus.robotml.diagram.interfacedef.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.robotml.diagram.interfacedef.CreateCommand"
-			icon="icons/obj16/interfaceI.gif" label="Create a new RobotML Interface Definition Diagram"
-			style="push" tooltip="Create a new RobotML Interface Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>							
-			</visibleWhen>						
-					
-		</command>
-	</menu>
-	</menuContribution>
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<menu id="org.eclipse.robotml.ui.toolbar" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.interfacedef.CreateCommand"
-			icon="icons/obj16/interfaceI.gif" label="Create a new RobotML Interface Definition Diagram"
-			style="push" tooltip="Create a new RobotML Interface Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>						
-			</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.robotml.diagram.interfacedef.CreateCommand"
-			icon="icons/obj16/interfaceI.gif" label="Create a new Proteus Interface Definition Diagram"
-			style="push" tooltip="Create a new Proteus Interface Definition Diagram">
-			<visibleWhen>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.papyrus.core.papyrusEditor"/>
-				</with>							
-			</visibleWhen>						
-				
-		</command>
-	</toolbar>
-	</menuContribution-->
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.robotml.diagram.interfacedef.CreateCommand"
-			icon="icons/obj16/interfaceI.gif"
-			label="Create a new RobotML Interface Definition Diagram"
-			style="push"
-			tooltip="Create a new RobotML Interface Definition Diagram">
-			<visibleWhen>
-				<reference
-                     definitionId="org.eclipse.papyrus.robotml.diagram.common.IsPapyrusActiveWithRobotml">
-               </reference>						
-			</visibleWhen>						
-			
-		</command>
-	</menuContribution>
-		
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
-	name="ROBOTML_InterfaceDef">
-	
-	<paletteDefinition ID="ROBOTML_InterfaceDef"
-		class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-		name="ROBOTML_InterfaceDef" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" 
-		path="palettes/interfacedef.palette.xml"
-		provider="CEA LIST">
-		<Priority name="Low"/>
-		
-		<!-- Specify diagram this palette tools relate to -->						
-		<editor id="org.eclipse.papyrus.robotml.diagram.interfacedef"/>
-	</paletteDefinition>
-</extension>
-
-
-<!-- Diagram view providers declaration -->
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-
-	<!-- Diagram view provider -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InterfaceDefViewProvider">
-		<Priority name="Low"/>
-		<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="InterfaceDef"/>
-	</viewProvider>
-	
-	<!-- ViewProvider for inherited elements (from ClassDiagram ViewProvider) -->
-	<viewProvider class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InheritedClassDiagramViewProvider">
-		<Priority name="Low"/>
-		
-		<!-- 
-			"2007" = PACKAGE
-			"2012" = COMMENT
-			"2011" = CONSTRAINT
-			"3009" = PACKAGE_CN
-			"3023" = INTERFACE_CN
-			"2004" = INTERFACE
-			"2016" = SHORT_CUT_DIAGRAM
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 2012, 2011, 3009, 3023, 2004, 2016"/>
-		
-		<!-- 
-			"3006" = INTERFACE_PROPERTY_CLN
-			"3007" = INTERFACE_OPERATION_CLN
-			"3008" = INTERFACE_CLASS_CLN
-		  -->	  
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3006, 3007, 3008"/>
-		
-		<!-- 
-			"4010" = PACKAGE_IMPORT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"4002" = GENERALIZATION
-			"4003" = INTERFACE_REALIZATION
-		  -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4010, 4013, 4014, 4011, 4002, 4003"/>
-		
-		<!-- 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.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.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>
-		
-		<!-- "notation.Diagram" -->
-		<object id="notation.Diagram" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="notation.Diagram"/>
-		</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.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.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.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>
-		
-		<!-- "uml.PackageMerge" -->
-		<object id="uml.PackageMerge" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
-			<method name="getProxyClassID()" value="uml.PackageMerge"/>
-		</object>
-		
-		<!-- "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>
-		
-		<!-- "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>
-		
-		<!-- Additional activation contexts for nodes semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
-			elements="uml.Package, uml.Comment, uml.Constraint, uml.Interface, notation.Diagram, uml.Property, uml.Operation, uml.Class"/>
-		
-		<!-- Additional activation contexts for edges semantic objects -->
-		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
-			elements="uml.PackageImport, uml.PackageMerge, uml.Generalization, uml.InterfaceRealization"/>
-			
-	</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.robotml.diagram.interfacedef.provider.InterfaceDefEditPartProvider">
-		<Priority name="Low"/>
-		<object 
-			id="org.eclipse.papyrus.robotml.diagram.interfacedef.Diagram"
-			class="org.eclipse.gmf.runtime.notation.Diagram">
-			<method name="getType()" value="InterfaceDef"/>
-		</object>
-	</editpartProvider>
-
-
-	<!-- EditPartProvider for inherited elements (from ClassDiagram) -->
-	<editpartProvider class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InheritedClassDiagramEditPartProvider">
-		<Priority name="Low"/>
-		<!-- 
-			The semantic hints given here are used in case the provider is not already loaded.
-			As soon as the provider is loaded its provides method is used.		
-			"2007" = PACKAGE
-			"5026" = PACKAGE_LABEL_NAME_HINT
-			"7016" = PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"2012" = COMMENT
-			"5038" = COMMENT_LABEL_BODY_HINT
-			"2011" = CONSTRAINT
-			"5037" = CONSTRAINT_LABEL_NAME_HINT
-			"5159" = CONSTRAINT_LABEL_BODY_HINT
-			"3009" = PACKAGE_CN
-			"5017" = PACKAGE_CN_LABEL_NAME_HINT
-			"7010" = PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
-			"3023" = INTERFACE_CN
-			"5049" = INTERFACE_CN_LABEL_NAME_HINT
-			"7027" = INTERFACE_CN_COMPARTMENT_ATTRIBUTE_HINT
-			"7028" = INTERFACE_CN_COMPARTMENT_OPERATION_HINT
-			"7029" = INTERFACE_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT
-			"2004" = INTERFACE
-			"5011" = INTERFACE_LABEL_NAME_HINT
-			"7006" = INTERFACE_COMPARTMENT_ATTRIBUTE_HINT
-			"7007" = INTERFACE_COMPARTMENT_OPERATION_HINT
-			"7008" = INTERFACE_COMPARTMENT_NESTED_CLASSIFIER_HINT
-			"2016" = SHORT_CUT_DIAGRAM
-			"0" = SHORT_CUT_DIAGRAM_LABEL_DIAGRAM_NAME_HINT
-		  -->
-		<object
-			id="PACKAGE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2007, 5026, 7016"/>
-		</object>
-		<object
-			id="COMMENT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2012, 5038"/>
-		</object>
-		<object
-			id="CONSTRAINT"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2011, 5037, 5159"/>
-		</object>
-		<object
-			id="PACKAGE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3009, 5017, 7010"/>
-		</object>
-		<object
-			id="INTERFACE_CN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3023, 5049, 7027, 7028, 7029"/>
-		</object>
-		<object
-			id="INTERFACE"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2004, 5011, 7006, 7007, 7008"/>
-		</object>
-		<object
-			id="SHORT_CUT_DIAGRAM"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="2016, 0"/>
-		</object>
-
-		<!-- 	
-			"3006" = INTERFACE_PROPERTY_CLN
-			"3007" = INTERFACE_OPERATION_CLN
-			"3008" = INTERFACE_CLASS_CLN
-		  -->
-		<object
-			id="INTERFACE_PROPERTY_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3006"/>
-		</object>
-		<object
-			id="INTERFACE_OPERATION_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3007"/>
-		</object>
-		<object
-			id="INTERFACE_CLASS_CLN"
-			class="org.eclipse.gmf.runtime.notation.Node">
-			<method name="getType()" value="3008"/>
-		</object>
-				
-		<!-- 	
-			"4010" = PACKAGE_IMPORT
-			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
-			"4013" = COMMENT_ANNOTATED_ELEMENT
-			"4014" = CONSTRAINT_CONSTRAINED_ELEMENT
-			"4011" = PACKAGE_MERGE
-			"6030" = PACKAGE_MERGE_LABEL_APPLIED_STEREOTYPE_HINT
-			"4002" = GENERALIZATION
-			"6007" = GENERALIZATION_LABEL_APPLIED_STEREOTYPER_HINT
-			"4003" = INTERFACE_REALIZATION
-			"6008" = INTERFACE_REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT
-			"6009" = INTERFACE_REALIZATION_LABEL_NAME2_HINT
-		  -->
-		<object
-			id="PACKAGE_IMPORT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4010, 6022"/>
-		</object>
-		<object
-			id="COMMENT_ANNOTATED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4013"/>
-		</object>
-		<object
-			id="CONSTRAINT_CONSTRAINED_ELEMENT"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4014"/>
-		</object>
-		<object
-			id="PACKAGE_MERGE"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4011, 6030"/>
-		</object>
-		<object
-			id="GENERALIZATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4002, 6007"/>
-		</object>
-		<object
-			id="INTERFACE_REALIZATION"
-			class="org.eclipse.gmf.runtime.notation.Edge">
-			<method name="getType()" value="4003, 6008, 6009"/>
-		</object>
-
-		<context views="PACKAGE, COMMENT, CONSTRAINT, PACKAGE_CN, INTERFACE_CN, INTERFACE, SHORT_CUT_DIAGRAM"/>
-		<context views="INTERFACE_PROPERTY_CLN, INTERFACE_OPERATION_CLN, INTERFACE_CLASS_CLN"/>
-		<context views="PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, PACKAGE_MERGE, GENERALIZATION, INTERFACE_REALIZATION"/>
-				
-	</editpartProvider>
-			
-</extension>
-
-<!-- Diagram edit policy provider -->	
-<extension
-	point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-	<editpolicyProvider
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InterfaceDefEditPolicyProvider">
-		<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.robotml.diagram.interfacedef.preferences"
-		name="InterfaceDef Diagram"
-		category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfaceDefGeneralPreferencePage">
-	</page>
-
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		name="Interface">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage"
-		name="Interface">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.DiagramPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.DiagramPreferencePage"
-		name="Diagram">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageImportPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageImportPreferencePage"
-		name="PackageImport">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintConstrainedElementPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintConstrainedElementPreferencePage"
-		name="ConstraintConstrainedElement">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageMergePreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageMergePreferencePage"
-		name="PackageMerge">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.GeneralizationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.GeneralizationPreferencePage"
-		name="Generalization">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfaceRealizationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfaceRealizationPreferencePage"
-		name="InterfaceRealization">
-	</page>
-	
-	
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.OperationPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.OperationPreferencePage"
-		name="Operation">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences"
-		class="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ClassPreferencePage"
-		id="org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ClassPreferencePage"
-		name="Class">
-	</page>
-			
-</extension>
-</plugin>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/Activator.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/Activator.java
deleted file mode 100644
index 6d5582b43b8..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/Activator.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef;
-
-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.robotml.diagram.interfacedef.preferences.InterfaceDefPreferenceInitializer;
-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.robotml.diagram.interfacedef";
-
-	/** 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)
-	 */
-	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
-		InterfaceDefPreferenceInitializer diagramPreferenceInitializer = new InterfaceDefPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator 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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefCreateCommand.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefCreateCommand.java
deleted file mode 100644
index 471810f56f2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefCreateCommand.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class InterfaceDefCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
-	@Override
-	protected String getDefaultDiagramName() {
-		return openDiagramNameDialog("InterfacesDiagram");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getDiagramNotationID() {
-		return InterfaceDefEditPart.DIAGRAM_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected PreferencesHint getPreferenceHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefEditorFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefEditorFactory.java
deleted file mode 100644
index 2ee1f376c47..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefEditorFactory.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef;
-
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class InterfaceDefEditorFactory extends GmfEditorFactory {
-
-	public InterfaceDefEditorFactory() {
-		super(InterfaceDefForMultiEditor.class, InterfaceDefEditPart.DIAGRAM_ID);
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefForMultiEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefForMultiEditor.java
deleted file mode 100644
index cb59c024859..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/InterfaceDefForMultiEditor.java
+++ /dev/null
@@ -1,114 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef;
-
-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.robotml.diagram.interfacedef.part.InterfaceDefEditor;
-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 InterfaceDefForMultiEditor extends InterfaceDefEditor {
-
-	/**
-	 * The location of diagram icon in the plug-in
-	 */
-	private static final String DIAG_IMG_PATH = "icons/obj16/interfaceDiagram.gif";
-
-	/**
-	 * The image descriptor of the diagram icon
-	 */
-	private static final ImageDescriptor DIAG_IMG_DESC = Activator.getBundledImageDescriptor(InterfaceDefForMultiEditor.DIAG_IMG_PATH);
-
-	/** The editor splitter. */
-	private Composite splitter;
-
-	/**
-	 * Constructor for SashSystem v2. Context and required objects are retrieved from the
-	 * ServiceRegistry.
-	 * 
-	 * @throws BackboneException
-	 * @throws ServiceException
-	 * 
-	 */
-	public InterfaceDefForMultiEditor(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(getDiagram().getName());
-		setTitleImage(DIAG_IMG_DESC.createImage());
-	}
-
-	/**
-	 * {@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.robotml.diagram.interfacedef.EditingDomain";
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/edit/part/InterfaceDefEditPart.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/edit/part/InterfaceDefEditPart.java
deleted file mode 100644
index 5f4373803f2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/edit/part/InterfaceDefEditPart.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.policy.InterfaceDefDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-
-public class InterfaceDefEditPart extends DiagramEditPart {
-
-	public final static String DIAGRAM_ID = "InterfaceDef"; //$NON-NLS-1$
-
-	public InterfaceDefEditPart(View view) {
-		super(view);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelItemSemanticEditPolicy());
-		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new InterfaceDefDragDropEditPolicy());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/edit/policy/InterfaceDefDragDropEditPolicy.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/edit/policy/InterfaceDefDragDropEditPolicy.java
deleted file mode 100644
index 1d65b3b9acb..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/edit/policy/InterfaceDefDragDropEditPolicy.java
+++ /dev/null
@@ -1,143 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.edit.policy;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.provider.InterfaceDefElementTypes;
-import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;
-
-/** Customization of the DND edit policy for the InterfaceDef Diagram */
-public class InterfaceDefDragDropEditPolicy extends ClassDiagramDragDropEditPolicy {
-
-	@Override
-	public int getNodeVisualID(View containerView, EObject domainElement) {
-		return new Integer(getNodeGraphicalHint(containerView, domainElement));
-	}
-
-	protected String getNodeGraphicalHint(View containerView, EObject domainElement) {
-		String UNDEFINED = "-1";
-
-		String containerGraphicalHint = containerView.getType();
-		if(containerGraphicalHint == null) {
-			// Cannot guess domain element graphical hint.
-			return UNDEFINED;
-		}
-
-		// Fill the semantic hint during the drop
-		// Elements inherited from ClassDiagram
-		// Dropping Package
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.PACKAGE.getSemanticHint();
-			}
-			if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-			if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.PACKAGE_CN.getSemanticHint();
-			}
-
-		} else
-		// Dropping Comment
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.COMMENT.getSemanticHint();
-			}
-
-		} else
-		// Dropping Constraint
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.CONSTRAINT.getSemanticHint();
-			}
-
-		} else
-		// Dropping Interface
-		if(domainElement instanceof org.eclipse.uml2.uml.Interface) {
-			if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_CN.getSemanticHint();
-			}
-			if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_CN.getSemanticHint();
-			}
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE.getSemanticHint();
-			}
-
-		} else
-		// Dropping Diagram
-		if(domainElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.SHORT_CUT_DIAGRAM.getSemanticHint();
-			}
-
-		} else
-		// Dropping Property
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_PROPERTY_CLN.getSemanticHint();
-			}
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_PROPERTY_CLN.getSemanticHint();
-			}
-		} else
-		// Dropping Operation
-		if(domainElement instanceof org.eclipse.uml2.uml.Operation) {
-
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_OPERATION_CLN.getSemanticHint();
-			}
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_OPERATION_CLN.getSemanticHint();
-			}
-		} else
-		// Dropping Class
-		if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_CLASS_CLN.getSemanticHint();
-			}
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalHint)) {
-				return InterfaceDefElementTypes.INTERFACE_CLASS_CLN.getSemanticHint();
-			}
-		}
-
-		return UNDEFINED;
-	}
-
-	@Override
-	public int getLinkWithClassVisualID(EObject domainElement) {
-		return new Integer(getLinkGraphicalHint(domainElement));
-	}
-
-	protected String getLinkGraphicalHint(EObject domainElement) {
-		String UNDEFINED = "-1";
-
-		if(domainElement instanceof org.eclipse.uml2.uml.PackageImport) {
-			return InterfaceDefElementTypes.PACKAGE_IMPORT.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.PackageMerge) {
-			return InterfaceDefElementTypes.PACKAGE_MERGE.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Generalization) {
-			return InterfaceDefElementTypes.GENERALIZATION.getSemanticHint();
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.InterfaceRealization) {
-			return InterfaceDefElementTypes.INTERFACE_REALIZATION.getSemanticHint();
-		}
-
-		return UNDEFINED;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/factory/InterfaceDefViewFactory.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/factory/InterfaceDefViewFactory.java
deleted file mode 100644
index 09bf56468ff..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/factory/InterfaceDefViewFactory.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.factory;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-public class InterfaceDefViewFactory extends DiagramViewFactory {
-
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.PIXEL_LITERAL;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/part/InterfaceDefEditor.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/part/InterfaceDefEditor.java
deleted file mode 100644
index 9fb334aa651..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/part/InterfaceDefEditor.java
+++ /dev/null
@@ -1,485 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.part;
-
-import java.util.EventObject;
-import java.util.Set;
-
-import org.eclipse.core.commands.operations.IUndoableOperation;
-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.infra.core.editor.IMultiDiagramEditor;
-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.robotml.diagram.interfacedef.Activator;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
-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 InterfaceDefEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.robotml.diagram.interfacedef.part.InterfaceDefEditorID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-
-	/**
-	 * @generated
-	 */
-	private IUndoableOperation savedOperation = null;
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceDefEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, 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
-	 */
-	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
-	 */
-	protected PreferencesHint getPreferencesHint() {
-		return Activator.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getContributorId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	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
-	 */
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isDirty() {
-		IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
-		return savedOperation != op;
-	}
-
-
-	/**
-	 * @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
-	 */
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	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.
-			 */
-			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());
-			}
-
-			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
-						 */
-						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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ClassPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ClassPreferencePage.java
deleted file mode 100644
index 1cf3c46f9de..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ClassPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class ClassPreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Class";
-
-	public ClassPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Class"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/CommentAnnotatedElementPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/CommentAnnotatedElementPreferencePage.java
deleted file mode 100644
index 10feeaa284c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/CommentAnnotatedElementPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class CommentAnnotatedElementPreferencePage extends InterfaceDefLinkPreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_CommentAnnotatedElement";
-
-	public CommentAnnotatedElementPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/CommentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/CommentPreferencePage.java
deleted file mode 100644
index 43f7ebbd698..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class CommentPreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Comment";
-
-
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ConstraintConstrainedElementPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ConstraintConstrainedElementPreferencePage.java
deleted file mode 100644
index b78ec056fe2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ConstraintConstrainedElementPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class ConstraintConstrainedElementPreferencePage extends InterfaceDefLinkPreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_ConstraintConstrainedElement";
-
-	public ConstraintConstrainedElementPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_ConstraintConstrainedElement"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ConstraintPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index 7001332cb00..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,30 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class ConstraintPreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Constraint";
-
-
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java
deleted file mode 100644
index d5ff1b1b0de..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class DiagramPreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Diagram";
-
-
-	public DiagramPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Diagram"); //$NON-NLS-1$
-	}
-
-	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/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/GeneralizationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/GeneralizationPreferencePage.java
deleted file mode 100644
index 925b78dcc80..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/GeneralizationPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class GeneralizationPreferencePage extends InterfaceDefLinkPreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Generalization";
-
-	public GeneralizationPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Generalization"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefGeneralPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefGeneralPreferencePage.java
deleted file mode 100644
index ff15322865f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefGeneralPreferencePage.java
+++ /dev/null
@@ -1,21 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.papyrus.robotml.diagram.interfacedef.Activator;
-
-public class InterfaceDefGeneralPreferencePage extends DiagramPreferencePage {
-
-	public InterfaceDefGeneralPreferencePage() {
-		setPreferenceStore(Activator.getInstance().getPreferenceStore());
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefLinkPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefLinkPreferencePage.java
deleted file mode 100644
index 129ee4c3f53..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefLinkPreferencePage.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.Activator;
-
-public class InterfaceDefLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefNodePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefNodePreferencePage.java
deleted file mode 100644
index 8e00bef0efa..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefNodePreferencePage.java
+++ /dev/null
@@ -1,23 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.Activator;
-
-public class InterfaceDefNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefPreferenceInitializer.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefPreferenceInitializer.java
deleted file mode 100644
index 032aee4249f..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceDefPreferenceInitializer.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.Activator;
-
-public class InterfaceDefPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackagePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfacePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.DiagramPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageImportPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.ConstraintConstrainedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.PackageMergePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.GeneralizationPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.robotml.diagram.interfacedef.preferences.InterfaceRealizationPreferencePage.initDefaults(store);
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java
deleted file mode 100644
index 418ace190c6..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class InterfacePreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Interface";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "AttributeCompartment", "OperationCompartment", "NestedClassifierCompartment" };
-
-	public InterfacePreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Interface"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceRealizationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceRealizationPreferencePage.java
deleted file mode 100644
index b7699f540f1..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfaceRealizationPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class InterfaceRealizationPreferencePage extends InterfaceDefLinkPreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_InterfaceRealization";
-
-	public InterfaceRealizationPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_InterfaceRealization"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/OperationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/OperationPreferencePage.java
deleted file mode 100644
index 2958c0ebd7d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/OperationPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class OperationPreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Operation";
-
-	public OperationPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Operation"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackageImportPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackageImportPreferencePage.java
deleted file mode 100644
index b3148315a9a..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackageImportPreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class PackageImportPreferencePage extends InterfaceDefLinkPreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_PackageImport";
-
-	public PackageImportPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_PackageImport"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackageMergePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackageMergePreferencePage.java
deleted file mode 100644
index ebb8d560412..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackageMergePreferencePage.java
+++ /dev/null
@@ -1,29 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class PackageMergePreferencePage extends InterfaceDefLinkPreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_PackageMerge";
-
-	public PackageMergePreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_PackageMerge"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java
deleted file mode 100644
index 36b92ad4487..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class PackagePreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Package";
-
-	/**
-	 * the list of the compartments for this node
-	 */
-	public static final String compartments[] = { "PackageableElementCompartment" };
-
-	public PackagePreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Package"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
-		// set the true value for the compartment visibility
-		for(String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage#initializeCompartmentsList()
-	 * 
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for(String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PropertyPreferencePage.java
deleted file mode 100644
index bdb1d3b6030..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PropertyPreferencePage.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class PropertyPreferencePage extends InterfaceDefNodePreferencePage {
-
-	public static String prefKey = InterfaceDefEditPart.DIAGRAM_ID + "_Property";
-
-	public PropertyPreferencePage() {
-		super();
-		setPreferenceKey(InterfaceDefEditPart.DIAGRAM_ID + "_Property"); //$NON-NLS-1$
-	}
-
-	public static void initDefaults(IPreferenceStore store) {
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InheritedClassDiagramEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InheritedClassDiagramEditPartProvider.java
deleted file mode 100644
index d8f481dc88c..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InheritedClassDiagramEditPartProvider.java
+++ /dev/null
@@ -1,93 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.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.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-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 InterfaceDef Diagram
-			if(!InterfaceDefEditPart.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.Comment) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Interface) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Property) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Operation) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Class) {
-				return true;
-			}
-
-			/** Edges *********** */
-			if(eobject instanceof org.eclipse.uml2.uml.PackageImport) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.PackageMerge) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.Generalization) {
-				return true;
-			}
-			if(eobject instanceof org.eclipse.uml2.uml.InterfaceRealization) {
-				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.
-			String hint = view.getType();
-
-			/** Edges (Feature) : COMMENT_ANNOTATED_ELEMENT *********** */
-			if(InterfaceDefElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-			/** Edges (Feature) : CONSTRAINT_CONSTRAINED_ELEMENT *********** */
-			if(InterfaceDefElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(hint)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InheritedClassDiagramViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InheritedClassDiagramViewProvider.java
deleted file mode 100644
index da053da7c2d..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InheritedClassDiagramViewProvider.java
+++ /dev/null
@@ -1,363 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.papyrus.robotml.diagram.interfacedef.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.robotml.diagram.interfacedef.Activator;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider;
-
-public class InheritedClassDiagramViewProvider extends UMLViewProvider {
-
-	@Override
-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
-		// No need to override here, assuming provides is correctly implemented.
-		Edge createdEdge = super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
-
-		if(createdEdge == null) {
-			Activator.log.error(new Exception("Could not create Edge."));
-		}
-
-		return createdEdge;
-	}
-
-	protected boolean provides(CreateViewForKindOperation op) {
-
-		// This provider is registered for Internal Block Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!InterfaceDefEditPart.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 InterfaceDef Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!InterfaceDefEditPart.DIAGRAM_ID.equals(diagramType)) {
-			return false;
-		}
-
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if(elementType == InterfaceDefElementTypes.PACKAGE_IMPORT) {
-			return true;
-		}
-		if(elementType == InterfaceDefElementTypes.COMMENT_ANNOTATED_ELEMENT) {
-			return true;
-		}
-		if(elementType == InterfaceDefElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
-			return true;
-		}
-		if(elementType == InterfaceDefElementTypes.PACKAGE_MERGE) {
-			return true;
-		}
-		if(elementType == InterfaceDefElementTypes.GENERALIZATION) {
-			return true;
-		}
-		if(elementType == InterfaceDefElementTypes.INTERFACE_REALIZATION) {
-			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 InterfaceDef Diagram only
-		String diagramType = op.getContainerView().getDiagram().getType();
-		if(!InterfaceDefEditPart.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 == InterfaceDefElementTypes.PACKAGE) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.COMMENT) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.CONSTRAINT) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.PACKAGE_CN) {
-			if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.INTERFACE_CN) {
-			if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.INTERFACE) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.SHORT_CUT_DIAGRAM) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.INTERFACE_PROPERTY_CLN) {
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.INTERFACE_OPERATION_CLN) {
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-		}
-		if(elementType == InterfaceDefElementTypes.INTERFACE_CLASS_CLN) {
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) {
-				return true;
-			}
-			if(InterfaceDefElementTypes.INTERFACE_CN_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);
-			if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-				if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Package TopNode
-					return true;
-				}
-				if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-					return true;
-				}
-				if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-				if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Comment TopNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-				if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Constraint TopNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Interface) {
-				if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Interface ChildNode
-					return true;
-				}
-				if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Interface ChildNode
-					return true;
-				}
-				if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Interface TopNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-				if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Diagram TopNode
-					return true;
-				}
-
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-
-				if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-					return true;
-				}
-				if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-					return true;
-				}
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Operation) {
-
-				if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-					return true;
-				}
-				if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-					return true;
-				}
-			}
-			if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-
-				if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) { // Class ChildLabelNode
-					return true;
-				}
-				if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) { // Class ChildLabelNode
-					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);
-		}
-
-		// SemanticHint may be null when the element is created indirectly by
-		// DND from model explorer
-		// ex: Drag and drop a Connector may require to show ConnectorEnd first.
-		EObject domainElement = (EObject)semanticAdapter.getAdapter(EObject.class);
-
-		// Get the type of the container
-		String containerGraphicalType = containerView.getType();
-
-		if(domainElement instanceof org.eclipse.uml2.uml.Package) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Package TopNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.PACKAGE.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.PACKAGE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Package ChildNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.PACKAGE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Comment) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Comment TopNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.COMMENT.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Constraint TopNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.CONSTRAINT.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Interface) {
-			if(InterfaceDefElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Interface ChildNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(InterfaceDefElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { // Interface ChildNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_CN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Interface TopNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(containerGraphicalType)) { // Diagram TopNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.SHORT_CUT_DIAGRAM.getSemanticHint(), index, persisted, preferencesHint);
-			}
-
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Property) {
-
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_PROPERTY_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_ATTRIBUTE_HINT.equals(containerGraphicalType)) { // Property ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_PROPERTY_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Operation) {
-
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_OPERATION_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_OPERATION_HINT.equals(containerGraphicalType)) { // Operation ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_OPERATION_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-		}
-		if(domainElement instanceof org.eclipse.uml2.uml.Class) {
-
-			if(InterfaceDefElementTypes.INTERFACE_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) { // Class ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_CLASS_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-			if(InterfaceDefElementTypes.INTERFACE_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT.equals(containerGraphicalType)) { // Class ChildLabelNode
-				return super.createNode(semanticAdapter, containerView, InterfaceDefElementTypes.INTERFACE_CLASS_CLN.getSemanticHint(), index, persisted, preferencesHint);
-			}
-		}
-
-		Activator.log.error(new Exception("Could not create Node."));
-		return null;
-	}
-
-	@Override
-	protected void stampShortcut(View containerView, Node target) {
-		if(!InterfaceDefEditPart.DIAGRAM_ID.equals(containerView.getDiagram().getType())) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", InterfaceDefEditPart.DIAGRAM_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefEditPartProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefEditPartProvider.java
deleted file mode 100644
index 8e2db8a17c2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefEditPartProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.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.robotml.diagram.interfacedef.Activator;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-
-public class InterfaceDefEditPartProvider extends AbstractEditPartProvider {
-
-	@Override
-	public boolean provides(IOperation operation) {
-		if(operation instanceof CreateGraphicEditPartOperation) {
-			View view = ((IEditPartOperation)operation).getView();
-
-			// Ensure current diagram is InterfaceDef Diagram
-			if(InterfaceDefEditPart.DIAGRAM_ID.equals(view.getType())) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramEditPartClass(View view) {
-		if(InterfaceDefEditPart.DIAGRAM_ID.equals(view.getType())) {
-			return InterfaceDefEditPart.class;
-		}
-
-		Activator.log.error(new Exception("Could not create EditPart."));
-		return null;
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefEditPolicyProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefEditPolicyProvider.java
deleted file mode 100644
index cc065bfcef2..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefEditPolicyProvider.java
+++ /dev/null
@@ -1,91 +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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.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.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.policy.InterfaceDefDragDropEditPolicy;
-
-public class InterfaceDefEditPolicyProvider 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(!InterfaceDefEditPart.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.CommentEditPart) {
-			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.PackageEditPartCN) {
-			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.InterfaceEditPartCN) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart) {
-			return true;
-		}
-		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShortCutDiagramEditPart) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public void createEditPolicies(EditPart editPart) {
-		editPart.installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new InterfaceDefDragDropEditPolicy());
-	}
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefElementTypes.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefElementTypes.java
deleted file mode 100644
index 9bb78832c5b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefElementTypes.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.provider;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-public class InterfaceDefElementTypes extends AbstractElementTypeEnumerator {
-
-	/** ********************************************************* */
-	/** Interface Definition Diagram specific elements **************** */
-	/** ********************************************************* */
-
-	/** Interface Definition Diagram :: Diagram */
-	public static final IHintedType INTERFACE_DEF_DIAGRAM = (IHintedType)getElementType("InterfaceDef"); //$NON-NLS-1$
-
-
-
-
-	/** ********************************************************* */
-	/** Interface Definition Diagram - ClassDiagram related elements */
-	/** ********************************************************* */
-
-
-	/** ClassDiagram :: PACKAGE */
-	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$
-
-	public static final String PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7016";
-
-	public static final String PACKAGE_LABEL_NAME_HINT = "5026";
-
-	/** ClassDiagram :: COMMENT */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$
-
-	public static final String COMMENT_LABEL_BODY_HINT = "5038";
-
-	/** ClassDiagram :: CONSTRAINT */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
-
-	public static final String CONSTRAINT_LABEL_NAME_HINT = "5037";
-
-	public static final String CONSTRAINT_LABEL_BODY_HINT = "5159";
-
-	/** ClassDiagram :: PACKAGE_CN */
-	public static final IHintedType PACKAGE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$
-
-	public static final String PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7010";
-
-	public static final String PACKAGE_CN_LABEL_NAME_HINT = "5017";
-
-	/** ClassDiagram :: INTERFACE_CN */
-	public static final IHintedType INTERFACE_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3023"); //$NON-NLS-1$
-
-	public static final String INTERFACE_CN_COMPARTMENT_ATTRIBUTE_HINT = "7027";
-
-	public static final String INTERFACE_CN_COMPARTMENT_OPERATION_HINT = "7028";
-
-	public static final String INTERFACE_CN_COMPARTMENT_NESTED_CLASSIFIER_HINT = "7029";
-
-	public static final String INTERFACE_CN_LABEL_NAME_HINT = "5049";
-
-	/** ClassDiagram :: INTERFACE */
-	public static final IHintedType INTERFACE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"); //$NON-NLS-1$
-
-	public static final String INTERFACE_COMPARTMENT_ATTRIBUTE_HINT = "7006";
-
-	public static final String INTERFACE_COMPARTMENT_OPERATION_HINT = "7007";
-
-	public static final String INTERFACE_COMPARTMENT_NESTED_CLASSIFIER_HINT = "7008";
-
-	public static final String INTERFACE_LABEL_NAME_HINT = "5011";
-
-	/** ClassDiagram :: SHORT_CUT_DIAGRAM */
-	public static final IHintedType SHORT_CUT_DIAGRAM = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"); //$NON-NLS-1$
-
-	public static final String SHORT_CUT_DIAGRAM_LABEL_DIAGRAM_NAME_HINT = "0";
-
-
-	/** ClassDiagram :: PACKAGE_IMPORT */
-	public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$
-
-	public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = "6022";
-
-	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
-	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
-
-	/** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */
-	public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$
-
-	/** ClassDiagram :: PACKAGE_MERGE */
-	public static final IHintedType PACKAGE_MERGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"); //$NON-NLS-1$
-
-	public static final String PACKAGE_MERGE_LABEL_APPLIED_STEREOTYPE_HINT = "6030";
-
-	/** ClassDiagram :: GENERALIZATION */
-	public static final IHintedType GENERALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"); //$NON-NLS-1$
-
-	public static final String GENERALIZATION_LABEL_APPLIED_STEREOTYPER_HINT = "6007";
-
-	/** ClassDiagram :: INTERFACE_REALIZATION */
-	public static final IHintedType INTERFACE_REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003"); //$NON-NLS-1$
-
-	public static final String INTERFACE_REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT = "6008";
-
-	public static final String INTERFACE_REALIZATION_LABEL_NAME2_HINT = "6009";
-
-	/** ClassDiagram :: ChildLabelNodes */
-	public static final IHintedType INTERFACE_PROPERTY_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3006"); //$NON-NLS-1$
-
-	public static final IHintedType INTERFACE_OPERATION_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3007"); //$NON-NLS-1$
-
-	public static final IHintedType INTERFACE_CLASS_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3008"); //$NON-NLS-1$
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefViewProvider.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefViewProvider.java
deleted file mode 100644
index 7793878413b..00000000000
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/provider/InterfaceDefViewProvider.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:
- *  Saadia Dhouib (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.robotml.diagram.interfacedef.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.robotml.diagram.interfacedef.Activator;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
-import org.eclipse.papyrus.robotml.diagram.interfacedef.factory.InterfaceDefViewFactory;
-
-public class InterfaceDefViewProvider extends AbstractViewProvider {
-
-	@Override
-	protected boolean provides(CreateDiagramViewOperation operation) {
-
-		if(InterfaceDefEditPart.DIAGRAM_ID.equals(operation.getSemanticHint())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
-		if(InterfaceDefEditPart.DIAGRAM_ID.equals(diagramKind)) {
-			return InterfaceDefViewFactory.class;
-		}
-
-		Activator.log.error(new Exception("Could not create View."));
-		return null;
-	}
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.help/plugin.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.help/plugin.xml
index 00836fc31f5..652f8c291d3 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.help/plugin.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.help/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-   <extension
+   <!--extension
          point="org.eclipse.help.toc">
       <toc
             file="toc.xml">
@@ -11,6 +11,6 @@
             file="testToc.xml"
             primary="true">
       </toc>
-   </extension>
+   </extension-->
 
 </plugin>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/model/RobotMLProfile.profile.uml b/extraplugins/robotml/org.eclipse.papyrus.robotml/model/RobotMLProfile.profile.uml
index 66a3a84d3b9..6225a55d903 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/model/RobotMLProfile.profile.uml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/model/RobotMLProfile.profile.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_3QOHEPcEEd-J06U5HM_o-Q" name="RobotML" URI="" metaclassReference="_7budMPcPEd-J06U5HM_o-Q _8_Y_UClXEeCiVZQ9o-1H2A _ubL34GAyEeCUQf3vpAG6JA _wuaewGAyEeCUQf3vpAG6JA _6eK1kBtTEeGZBqQLK2tPRA _NIDh0BtUEeGZBqQLK2tPRA _XUmMUBtqEeGZBqQLK2tPRA __HKUgCDmEeGCc9sHkrvZbg _IOXiwCJqEeGXbb453tP0yA _KUx1oCJqEeGXbb453tP0yA _rMqAIEaREeG1RvxKgcDZmw _qZCxkGLPEeGyA8hK1MhgBQ _m0angI6xEeGdCeFFJlx8kA _vy6V0HwtEeKlDbCLaIz6tg _eAAB8Hw6EeKk3aX-P_okJw _qnjTILvGEeKt_61TErRftw _maI6oBlUEeOoKKOJPFGdCw">
+<uml:Profile xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_3QOHEPcEEd-J06U5HM_o-Q" name="RobotML" URI="http://Papyrus/RobotML/1" metaclassReference="_7budMPcPEd-J06U5HM_o-Q _8_Y_UClXEeCiVZQ9o-1H2A _ubL34GAyEeCUQf3vpAG6JA _wuaewGAyEeCUQf3vpAG6JA _6eK1kBtTEeGZBqQLK2tPRA _NIDh0BtUEeGZBqQLK2tPRA _XUmMUBtqEeGZBqQLK2tPRA __HKUgCDmEeGCc9sHkrvZbg _IOXiwCJqEeGXbb453tP0yA _KUx1oCJqEeGXbb453tP0yA _rMqAIEaREeG1RvxKgcDZmw _qZCxkGLPEeGyA8hK1MhgBQ _m0angI6xEeGdCeFFJlx8kA _vy6V0HwtEeKlDbCLaIz6tg _eAAB8Hw6EeKk3aX-P_okJw _qnjTILvGEeKt_61TErRftw _maI6oBlUEeOoKKOJPFGdCw">
   <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VoRqoR4VEeCKot0rXi6qrg" source="http://www.eclipse.org/uml2/2.0.0/UML">
     <contents xmi:type="ecore:EPackage" xmi:id="_eC1QcEfCEeOiG_cIEpbzQQ" name="RobotML" nsURI="http:///schemas/RobotML/_ckSO0EfCEeOiG_cIEpbzQQ/1" nsPrefix="RobotML">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eC1QcUfCEeOiG_cIEpbzQQ" source="http://www.eclipse.org/uml2/4.0.0/UML">
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_Class_RobotML.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_Class_RobotML.xml
index d437135719e..50e19bacab1 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_Class_RobotML.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/palettes/Palette_Class_RobotML.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <paletteDefinition>
 	<content>
-		<drawer iconpath="/icons/drawer.gif" id="Drawer__1323777360776"
+		<drawer iconpath="/icons/drawer.gif" id="org.eclipse.papyrus.robotml.diagram.clazz"
 			name="RobotML">
 			<aspectTool description="Create a new Robotic System" id="clazz.tool.system"
 				name="System" refToolId="clazz.tool.class"
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml/style.css b/extraplugins/robotml/org.eclipse.papyrus.robotml/style.css
new file mode 100644
index 00000000000..4b9c1cdf04b
--- /dev/null
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml/style.css
@@ -0,0 +1,14 @@
+* {

+	elementIcon:false;

+	

+}

+

+Stereotype > Compartment[kind="operation"] {

+	visible:false;

+}

+Class{

+	fontHeight:12;

+}

+Attribute{

+	fontHeight:10;

+}

diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
index 2afb7c89239..1953b25daed 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
@@ -34,4 +34,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.table.modelexplorer.Activa
 Bundle-SymbolicName: org.eclipse.papyrus.infra.table.modelexplorer;sin

  gleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Import-Package: org.eclipse.papyrus.infra.viewpoints.policy