Merge with Master and conflic resolved.

Updated xtend templates according to updates in Xpand templates. 

372 files changed, 4291 insertions, 19243 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/.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/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/.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.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/.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

 

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.options b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.options
deleted file mode 100644
index 963a4693dda..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.options
+++ /dev/null
@@ -1,2 +0,0 @@
-org.eclipse.papyrus.team.collaborative.connector.svn/debug=true
-org.eclipse.papyrus.team.collaborative.connector.svn/debug/commit=true
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.project
deleted file mode 100644
index 2f1c7d80aef..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.team.collaborative.connector.svn</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/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/META-INF/MANIFEST.MF
deleted file mode 100644
index 255d9a0866d..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Svn Connector
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.connector.svn;singleton:=true
-Bundle-Version: 1.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.connector.svn.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.team.collaborative,
- org.eclipse.emf.ecore,
- com.google.guava,
- org.eclipse.core.resources,
- org.eclipse.emf.workspace,
- org.eclipse.team.core,
- org.eclipse.team.ui,
- org.eclipse.team.svn.core,
- org.eclipse.team.svn.ui
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.papyrus.team.collaborative.connector.svn,
- org.eclipse.papyrus.team.collaborative.connector.svn.tracing,
- org.eclipse.papyrus.team.collaborative.connector.svn.utils,
- org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller
-Bundle-Vendor: Atos
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.xml
deleted file mode 100644
index faea148999e..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.papyrus.team.collaborative.collaborative">
-      <ParticipantFactory
-            id="org.eclipse.papyrus.team.collaborative.connector.svn"
-            impl="org.eclipse.papyrus.team.collaborative.connector.svn.SVNCollabFactory"
-            priority="10">
-      </ParticipantFactory>
-   </extension>
-
-
-</plugin>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/pom.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/pom.xml
deleted file mode 100644
index 3a58d6bcfd0..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2013 Atos.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
-  
-  Contributors:
-      Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <relativePath>../../../Releng/org.topcased.fast.tycho.master/pom.xml</relativePath>
-    <groupId>org.topcased.fast</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.papyrus.team.collaborative.connector.svn</artifactId>
-  <packaging>eclipse-plugin</packaging>
-
-  <name>Svn Connector</name>
-</project> 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.classpath b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.classpath
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/.classpath
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.gitignore b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/.gitignore
index 58393d49a7e..58393d49a7e 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.gitignore
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/.gitignore
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/.project
index 772da1bd948..bf35fc8c879 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/.project
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.robotml.diagram.architecture</name>
+	<name>org.eclipse.papyrus.team.collaborative.controlmode</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/META-INF/MANIFEST.MF
index 869d49e5bdf..5904b97c33c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/META-INF/MANIFEST.MF
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/META-INF/MANIFEST.MF
@@ -1,30 +1,31 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SVN Control
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.integration.papyrus.svn;singleton:=true
-Bundle-Version: 1.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.services.controlmode,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.papyrus.editor,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.team.collaborative;bundle-version="1.7.0",
- com.google.guava,
- org.eclipse.papyrus.infra.gmfdiag.modelexplorer,
- org.eclipse.ui.navigator;bundle-version="3.5.101",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.2",
- org.eclipse.papyrus.team.collaborative.integration.papyrus,
- org.eclipse.papyrus.team.collaborative.connector.svn,
- org.eclipse.papyrus.infra.gmfdiag.modelexplorer,
- org.eclipse.papyrus.infra.widgets.toolbox,
- org.eclipse.papyrus.infra.gmfdiag.commands,
- org.eclipse.team.svn.core;bundle-version="1.1.0",
- org.eclipse.emf.facet.infra.query.core,
- org.eclipse.emf.facet.infra.browser.custom,
- org.eclipse.emf.common.ui,
- org.eclipse.papyrus.views.modelexplorer
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.controlmode;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.Activator

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.papyrus.infra.services.controlmode,

+ org.eclipse.gmf.runtime.common.core,

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

+ org.eclipse.papyrus.editor,

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

+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.0",

+ com.google.guava,

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

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

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

+ org.eclipse.papyrus.team.collaborative.strategy;bundle-version="1.0.0",

+ org.eclipse.papyrus.team.collaborative.svn;bundle-version="1.0.0",

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

+ org.eclipse.papyrus.infra.widgets.toolbox,

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

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

+ org.eclipse.emf.facet.infra.query.core,

+ org.eclipse.emf.facet.infra.browser.custom,

+ org.eclipse.emf.common.ui,

+ org.eclipse.papyrus.views.modelexplorer

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Bundle-ActivationPolicy: lazy

+Bundle-Vendor: %providerName

+Bundle-Name: %pluginName

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/about.html b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/about.html
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/about.html
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/build.gen.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/build.properties
index ca6d14e16f2..07463a9565d 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/build.gen.properties
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/build.properties
@@ -1,10 +1,8 @@
-source.. = src/,\
-           src-gen/
+source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               palettes/,\
                icons/,\
-               about.html,\
+               resources/,\
                plugin.properties
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/CreateCollabPartition_16x16.png b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/CreateCollabPartition_16x16.png
index 76686bdb88c..76686bdb88c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/CreateCollabPartition_16x16.png
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/CreateCollabPartition_16x16.png
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/CreateCollabPartition_64x64.png b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/CreateCollabPartition_64x64.png
index b48f3598ab9..b48f3598ab9 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/CreateCollabPartition_64x64.png
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/CreateCollabPartition_64x64.png
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/PartialLock_16x16.png b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/PartialLock_16x16.png
index ad73fdf489d..ad73fdf489d 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/PartialLock_16x16.png
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/PartialLock_16x16.png
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/ShowPartition_16x16.png b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/ShowPartition_16x16.png
index ac5f5b90e10..ac5f5b90e10 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/ShowPartition_16x16.png
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/ShowPartition_16x16.png
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/ShowPartition_64x64.png b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/ShowPartition_64x64.png
index fc2d7869260..fc2d7869260 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/ShowPartition_64x64.png
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/icons/ShowPartition_64x64.png
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/plugin.properties
new file mode 100644
index 00000000000..5661533277c
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/plugin.properties
@@ -0,0 +1,12 @@
+#/*****************************************************************************
+# * Copyright (c) 2014 Atos Origin.
+# *
+# *    
+# * All rights reserved. This program and the accompanying materials
+# * are made available under the terms of the Eclipse Public License v1.0
+# * which accompanies this distribution, and is available at
+# * http://www.eclipse.org/legal/epl-v10.html
+# *
+# *****************************************************************************/
+pluginName = Collaborative Control Mode Integration
+providerName = Eclipse Modeling Project
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/plugin.xml
index 5403d02fa58..71413675741 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/plugin.xml
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/plugin.xml
@@ -4,19 +4,19 @@
    <extension
          point="org.eclipse.papyrus.infra.services.controlmode.participant">
       <participant
-            class="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.control.SVNControlModeParticipant">
+            class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.control.SVNControlModeParticipant">
       </participant>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler.SVNCollabControlCommandHandler"
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.createcollaborative fragment"
+            defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.handler.SVNCollabControlCommandHandler"
+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.createcollaborative fragment"
             name="Create collaborative fragment">
       </command>
       <command
-            defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler.ShowModelPartitionHandler"
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.showModelPartition"
+            defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.handler.ShowModelPartitionHandler"
+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.showModelPartition"
             name="Show model partition">
       </command>
    </extension>
@@ -24,9 +24,9 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.team.collaborative.ui.collab.menu">
+            locationURI="popup:org.eclipse.papyrus.team.collaborative.core.ui.collab.menu">
          <command
-               commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.createcollaborative fragment"
+               commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.createcollaborative fragment"
                icon="icons/CreateCollabPartition_16x16.png"
                label="Create partition"
                style="push">
@@ -43,7 +43,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.showModelPartition"
+               commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.showModelPartition"
                icon="icons/ShowPartition_16x16.png"
                label="Show partition"
                style="push">
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabCustomization.uiCustom b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/resources/CollabCustomization.uiCustom
index 4ad80383c11..ce9138838d6 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabCustomization.uiCustom
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/resources/CollabCustomization.uiCustom
@@ -3,7 +3,7 @@
   <types metaclassName="CollabFacet.CollabElement">
     <customizedFeatures customizedFeature="facetOverlayIcon">
       <valueCases>
-        <value xsi:type="uicustom:StaticFeatureValue" value="/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/PartialLock_16x16.png:TopRight"/>
+        <value xsi:type="uicustom:StaticFeatureValue" value="/org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn/icons/PartialLock_16x16.png:TopRight"/>
         <condition xsi:type="query:JavaModelQuery" href="CollabQueries.querySet#IsPartialyLocked"/>
       </valueCases>
     </customizedFeatures>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabFacet.facetSet b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/resources/CollabFacet.facetSet
index b4ec037ab00..b4ec037ab00 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabFacet.facetSet
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/resources/CollabFacet.facetSet
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabQueries.querySet b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/resources/CollabQueries.querySet
index fcb050c45d1..b6719c62b44 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/resources/CollabQueries.querySet
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/resources/CollabQueries.querySet
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ASCII"?>
 <query:ModelQuerySet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="CollabQueries">
   <associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>
-  <queries xsi:type="query:JavaModelQuery" name="IsCollabQuery" description="If the elemnt is a collab element" implementationClassName="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries.IsCollabQuery">
+  <queries xsi:type="query:JavaModelQuery" name="IsCollabQuery" description="If the elemnt is a collab element" implementationClassName="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.queries.IsCollabQuery">
     <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
   </queries>
-  <queries xsi:type="query:JavaModelQuery" name="IsPartialyLocked" description="Return true is at least one of the Nuplet of linked resource is locked" implementationClassName="org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries.IsPartialyLocked">
+  <queries xsi:type="query:JavaModelQuery" name="IsPartialyLocked" description="Return true is at least one of the Nuplet of linked resource is locked" implementationClassName="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn.queries.IsPartialyLocked">
     <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
   </queries>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/Activator.java
index 13fec009c49..40c6b79a351 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/Activator.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn;
+package org.eclipse.papyrus.team.collaborative.controlmode;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.integration.papyrus.svn"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/commands/AddFileToCollabSVN.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/AddFileToCollabSVN.java
index b0fd1ee0aa5..df2223e2391 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/commands/AddFileToCollabSVN.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/AddFileToCollabSVN.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands;
+package org.eclipse.papyrus.team.collaborative.controlmode.commands;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,12 +25,12 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.utils.SVNUtils;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.CommitHandler;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.CommitHandler;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
+import org.eclipse.papyrus.team.collaborative.svn.utils.SVNUtils;
 
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Sets;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/commands/SaveCommand.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/SaveCommand.java
index 9af1e6bfab5..21929f6c1c5 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/commands/SaveCommand.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/commands/SaveCommand.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands;
+package org.eclipse.papyrus.team.collaborative.controlmode.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/control/SVNControlModeParticipant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/control/SVNControlModeParticipant.java
index db7733e8a97..2a7c4f67225 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/control/SVNControlModeParticipant.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/control/SVNControlModeParticipant.java
@@ -1,133 +1,125 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.control;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
-import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;
-import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands.AddFileToCollabSVN;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.commands.SaveCommand;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISaveablePart;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The Class SVNControlModeParticipant.
- * This {@link IControlCommandParticipant} provide mean to automatically integrate file generated after a control into a SVN repository
- * WARNING: The {@link IUncontrolCommandParticipant} is not implemented yet
- */
-public class SVNControlModeParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {
-
-	/**
-	 * Instantiates a new sVN control mode participant.
-	 */
-	public SVNControlModeParticipant() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlModeParticipant#getID()
-	 */
-	@Override
-	public String getID() {
-		return "org.eclipse.papyrus.team.collaborative.integration.papyrus.control.SVNControlModeParticipant";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlModeParticipant#getPriority()
-	 */
-	@Override
-	public int getPriority() {
-		return 10000;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IUncontrolCommandParticipant#provideUnControlCommand(org.eclipse.papyrus.controlmode.request.
-	 * ControlModeRequest)
-	 */
-	@Override
-	public boolean provideUnControlCommand(ControlModeRequest request) {
-		return CollabUtils.isCollab(request.getTargetObject());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IUncontrolCommandParticipant#getPreUncontrolCommand(org.eclipse.papyrus.controlmode.request.
-	 * ControlModeRequest)
-	 */
-	@Override
-	public ICommand getPreUncontrolCommand(ControlModeRequest request) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IUncontrolCommandParticipant#getPostUncontrolCommand(org.eclipse.papyrus.controlmode.request.
-	 * ControlModeRequest)
-	 */
-	@Override
-	public ICommand getPostUncontrolCommand(ControlModeRequest request) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlCommandParticipant#provideControlCommand(org.eclipse.papyrus.controlmode.request.
-	 * ControlModeRequest)
-	 */
-	@Override
-	public boolean provideControlCommand(ControlModeRequest request) {
-		return CollabUtils.isCollab(request.getTargetObject());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlCommandParticipant#getPreControlCommand(org.eclipse.papyrus.controlmode.request.
-	 * ControlModeRequest)
-	 */
-	@Override
-	public ICommand getPreControlCommand(ControlModeRequest request) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlCommandParticipant#getPostControlCommand(org.eclipse.papyrus.controlmode.request.
-	 * ControlModeRequest)
-	 */
-	@Override
-	public ICommand getPostControlCommand(ControlModeRequest request) {
-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(request.getEditingDomain(), "Share file to SVN with need lock");
-		IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		if(editor instanceof ISaveablePart) {
-			cc.compose(new SaveCommand(request.getEditingDomain(), editor));
-			cc.compose(new AddFileToCollabSVN(request.getEditingDomain(), request));
-		}
-		return cc;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.controlmode.control;

+

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

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

+import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;

+import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;

+import org.eclipse.papyrus.team.collaborative.controlmode.commands.AddFileToCollabSVN;

+import org.eclipse.papyrus.team.collaborative.controlmode.commands.SaveCommand;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.ISaveablePart;

+import org.eclipse.ui.PlatformUI;

+

+

+/**

+ * The Class SVNControlModeParticipant.

+ * This {@link IControlCommandParticipant} provide mean to automatically integrate file generated after a control into a SVN repository

+ * WARNING: The {@link IUncontrolCommandParticipant} is not implemented yet

+ */

+public class SVNControlModeParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {

+

+	/**

+	 * Instantiates a new sVN control mode participant.

+	 */

+	public SVNControlModeParticipant() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlModeParticipant#getID()

+	 */

+	public String getID() {

+		return "org.eclipse.papyrus.team.collaborative.core.integration.papyrus.control.SVNControlModeParticipant";

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlModeParticipant#getPriority()

+	 */

+	public int getPriority() {

+		return 10000;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IUncontrolCommandParticipant#provideUnControlCommand(org.eclipse.papyrus.controlmode.request.

+	 * ControlModeRequest)

+	 */

+	public boolean provideUnControlCommand(ControlModeRequest request) {

+		return CollabUtils.isCollab(request.getTargetObject());

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IUncontrolCommandParticipant#getPreUncontrolCommand(org.eclipse.papyrus.controlmode.request.

+	 * ControlModeRequest)

+	 */

+	public ICommand getPreUncontrolCommand(ControlModeRequest request) {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IUncontrolCommandParticipant#getPostUncontrolCommand(org.eclipse.papyrus.controlmode.request.

+	 * ControlModeRequest)

+	 */

+	public ICommand getPostUncontrolCommand(ControlModeRequest request) {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlCommandParticipant#provideControlCommand(org.eclipse.papyrus.controlmode.request.

+	 * ControlModeRequest)

+	 */

+	public boolean provideControlCommand(ControlModeRequest request) {

+		return CollabUtils.isCollab(request.getTargetObject());

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlCommandParticipant#getPreControlCommand(org.eclipse.papyrus.controlmode.request.

+	 * ControlModeRequest)

+	 */

+	public ICommand getPreControlCommand(ControlModeRequest request) {

+		return null;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.controlmode.interfaces.IControlCommandParticipant#getPostControlCommand(org.eclipse.papyrus.controlmode.request.

+	 * ControlModeRequest)

+	 */

+	public ICommand getPostControlCommand(ControlModeRequest request) {

+		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(request.getEditingDomain(), "Share file to SVN with need lock");

+		IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+		if(editor instanceof ISaveablePart) {

+			cc.compose(new SaveCommand(request.getEditingDomain(), editor));

+			cc.compose(new AddFileToCollabSVN(request.getEditingDomain(), request));

+		}

+		return cc;

+	}

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/handler/SVNCollabControlCommandHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/SVNCollabControlCommandHandler.java
index a40d03add4e..3ef9481a52c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/handler/SVNCollabControlCommandHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/SVNCollabControlCommandHandler.java
@@ -10,7 +10,7 @@
  *     Philippe Roland (Atos) philippe.roland@atos.net - minor change to the 
  *         default naming algorithm to ensure it suggests a valid name
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler;
+package org.eclipse.papyrus.team.collaborative.controlmode.handler;
 
 import java.util.Collections;
 import java.util.List;
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.infra.services.controlmode.ControlModeManager;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
 import org.eclipse.papyrus.infra.services.controlmode.IControlModeManager;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui.CreateCollabModelFragmentDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
+import org.eclipse.papyrus.team.collaborative.controlmode.ui.CreateCollabModelFragmentDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
 import org.eclipse.papyrus.views.modelexplorer.handler.AbstractModelExplorerHandler;
 import org.eclipse.swt.widgets.Display;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/handler/ShowModelPartitionHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/ShowModelPartitionHandler.java
index 83f44d3c3dc..d8f28caab82 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/handler/ShowModelPartitionHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/handler/ShowModelPartitionHandler.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.handler;
+package org.eclipse.papyrus.team.collaborative.controlmode.handler;
 
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
 import org.eclipse.papyrus.views.modelexplorer.handler.AbstractModelExplorerHandler;
 import org.eclipse.swt.widgets.Display;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/queries/IsCollabQuery.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsCollabQuery.java
index 376d86ce7b8..7743f7da27b 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/queries/IsCollabQuery.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsCollabQuery.java
@@ -1,70 +1,69 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-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.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.PapyrusResourceUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Sets;
-
-
-/**
- * Return true if the element is a collab element
- * 
- * @author adaussy
- * 
- */
-public class IsCollabQuery implements IJavaModelQuery<EObject, Boolean> {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery#evaluate(org.eclipse.emf.ecore.EObject,
-	 * org.eclipse.emf.facet.infra.query.core.java.ParameterValueList)
-	 */
-	@Override
-	public Boolean evaluate(EObject arg0, ParameterValueList arg1) throws ModelQueryExecutionException {
-		List<URI> uris = new ArrayList<URI>();
-		URI uri = arg0.eResource().getURI();
-		ResourceSet resourceSet = arg0.eResource().getResourceSet();
-		uris.add(uri);
-		PapyrusResourceUtils.addExtraResources(resourceSet, uris, uri);
-		Set<IExtendedURI> extendedURIS = Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURIWithContainment()));
-		ILocker locker = ICollaborativeManager.INSTANCE.getLocker(extendedURIS, resourceSet);
-		if(locker == null) {
-			return false;
-		}
-		boolean result = false;
-		for(IExtendedURI extURI : extendedURIS) {
-			if(locker.isLocked(extURI).isOK()) {
-				result = true;
-			}
-		}
-		return result;
-
-
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.controlmode.queries;

+

+import java.util.ArrayList;

+import java.util.List;

+import java.util.Set;

+

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

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

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

+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.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.PapyrusResourceUtils;

+

+import com.google.common.collect.Collections2;

+import com.google.common.collect.Sets;

+

+

+/**

+ * Return true if the element is a collab element

+ * 

+ * @author adaussy

+ * 

+ */

+public class IsCollabQuery implements IJavaModelQuery<EObject, Boolean> {

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery#evaluate(org.eclipse.emf.ecore.EObject,

+	 * org.eclipse.emf.facet.infra.query.core.java.ParameterValueList)

+	 */

+	public Boolean evaluate(EObject arg0, ParameterValueList arg1) throws ModelQueryExecutionException {

+		List<URI> uris = new ArrayList<URI>();

+		URI uri = arg0.eResource().getURI();

+		ResourceSet resourceSet = arg0.eResource().getResourceSet();

+		uris.add(uri);

+		PapyrusResourceUtils.addExtraResources(resourceSet, uris, uri);

+		Set<IExtendedURI> extendedURIS = Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURIWithContainment()));

+		ILocker locker = ICollaborativeManager.INSTANCE.getLocker(extendedURIS, resourceSet);

+		if(locker == null) {

+			return false;

+		}

+		boolean result = false;

+		for(IExtendedURI extURI : extendedURIS) {

+			if(locker.isLocked(extURI).isOK()) {

+				result = true;

+			}

+		}

+		return result;

+

+

+	}

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/queries/IsPartialyLocked.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsPartialyLocked.java
index 246ffab3648..071e4aadc98 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/queries/IsPartialyLocked.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/queries/IsPartialyLocked.java
@@ -1,70 +1,69 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.queries;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-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.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.PapyrusResourceUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Sets;
-
-
-/**
- * The Class IsPartialyLocked.
- * Return true if the element is partialy locked. Partialy locked mean that there is one of the di or uml or notation model that has not been locked
- */
-public class IsPartialyLocked implements IJavaModelQuery<EObject, Boolean> {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery#evaluate(org.eclipse.emf.ecore.EObject,
-	 * org.eclipse.emf.facet.infra.query.core.java.ParameterValueList)
-	 */
-	@Override
-	public Boolean evaluate(EObject arg0, ParameterValueList arg1) throws ModelQueryExecutionException {
-		List<URI> uris = new ArrayList<URI>();
-		URI uri = arg0.eResource().getURI();
-		ResourceSet resourceSet = arg0.eResource().getResourceSet();
-		uris.add(uri);
-		PapyrusResourceUtils.addExtraResources(resourceSet, uris, uri);
-		Set<IExtendedURI> extendedURIS = Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURIWithContainment()));
-		ILocker locker = ICollaborativeManager.INSTANCE.getLocker(extendedURIS, resourceSet);
-		if(locker == null) {
-			return false;
-		}
-		boolean oneLocked = false;
-		boolean oneUnlocked = false;
-		for(IExtendedURI extURI : extendedURIS) {
-			if(locker.isLocked(extURI).isOK()) {
-				oneLocked = true;
-			} else {
-				oneUnlocked = true;
-			}
-		}
-		return oneUnlocked && oneLocked;
-
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.controlmode.queries;

+

+import java.util.ArrayList;

+import java.util.List;

+import java.util.Set;

+

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

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

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

+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.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.PapyrusResourceUtils;

+

+import com.google.common.collect.Collections2;

+import com.google.common.collect.Sets;

+

+

+/**

+ * The Class IsPartialyLocked.

+ * Return true if the element is partialy locked. Partialy locked mean that there is one of the di or uml or notation model that has not been locked

+ */

+public class IsPartialyLocked implements IJavaModelQuery<EObject, Boolean> {

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery#evaluate(org.eclipse.emf.ecore.EObject,

+	 * org.eclipse.emf.facet.infra.query.core.java.ParameterValueList)

+	 */

+	public Boolean evaluate(EObject arg0, ParameterValueList arg1) throws ModelQueryExecutionException {

+		List<URI> uris = new ArrayList<URI>();

+		URI uri = arg0.eResource().getURI();

+		ResourceSet resourceSet = arg0.eResource().getResourceSet();

+		uris.add(uri);

+		PapyrusResourceUtils.addExtraResources(resourceSet, uris, uri);

+		Set<IExtendedURI> extendedURIS = Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURIWithContainment()));

+		ILocker locker = ICollaborativeManager.INSTANCE.getLocker(extendedURIS, resourceSet);

+		if(locker == null) {

+			return false;

+		}

+		boolean oneLocked = false;

+		boolean oneUnlocked = false;

+		for(IExtendedURI extURI : extendedURIS) {

+			if(locker.isLocked(extURI).isOK()) {

+				oneLocked = true;

+			} else {

+				oneUnlocked = true;

+			}

+		}

+		return oneUnlocked && oneLocked;

+

+	}

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/ui/CreateCollabModelFragmentDialog.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/CreateCollabModelFragmentDialog.java
index 4a2d329a1c5..a5844e40445 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/ui/CreateCollabModelFragmentDialog.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/CreateCollabModelFragmentDialog.java
@@ -7,7 +7,7 @@
  * Contributors: Jacques Lescot (Anyware Technologies) - initial API and
  * implementation
  ******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui;
+package org.eclipse.papyrus.team.collaborative.controlmode.ui;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -26,10 +26,10 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.Activator;
-import org.eclipse.papyrus.team.collaborative.reports.LogHelper;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.papyrus.team.collaborative.utils.URIUtils;
+import org.eclipse.papyrus.team.collaborative.controlmode.Activator;
+import org.eclipse.papyrus.team.collaborative.core.reports.LogHelper;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;
+import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/ui/IconsPath.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/IconsPath.java
index 80670869756..19bb9db32ec 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/svn/ui/IconsPath.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.controlmode/src/org/eclipse/papyrus/team/collaborative/controlmode/ui/IconsPath.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui;
+package org.eclipse.papyrus.team.collaborative.controlmode.ui;
 
 
 /**
@@ -17,6 +17,6 @@ package org.eclipse.papyrus.team.collaborative.integration.papyrus.svn.ui;
 public interface IconsPath {
 
 	/** The Constant PARTIAL_LOCKED_OVERLAY. */
-	public static final String PARTIAL_LOCKED_OVERLAY = "/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/icons/PartialLock_16x16.png";
+	public static final String PARTIAL_LOCKED_OVERLAY = "/org.eclipse.papyrus.team.collaborative.core.integration.papyrus.svn/icons/PartialLock_16x16.png";
 
 }
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.classpath b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.classpath
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.classpath
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.gitignore b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.gitignore
index 19af0f1d5ca..19af0f1d5ca 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.gitignore
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.gitignore
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.project
index ee1b7fbad63..d8664a4a6ed 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/.project
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.robotml.diagram.datatypedef</name>
+	<name>org.eclipse.papyrus.team.collaborative.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.settings/org.eclipse.jdt.core.prefs b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.settings/org.eclipse.jdt.core.prefs
index 6bb81369ac7..6bb81369ac7 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..bbeb315da63
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.core;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-ClassPath: .

+Bundle-Vendor: %providerName

+Bundle-Localization: plugin

+Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.Activator

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.emf.ecore,

+ com.google.guava,

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

+ org.eclipse.emf.workspace

+Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Export-Package: org.eclipse.papyrus.team.collaborative.core,

+ org.eclipse.papyrus.team.collaborative.core.participants,

+ org.eclipse.papyrus.team.collaborative.core.participants.locker,

+ org.eclipse.papyrus.team.collaborative.core.participants.version,

+ org.eclipse.papyrus.team.collaborative.core.reports,

+ org.eclipse.papyrus.team.collaborative.core.strategy,

+ org.eclipse.papyrus.team.collaborative.core.utils,

+ org.eclipse.papyrus.team.collaborative.core.utils.funtions;x-internal:=true

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/about.html b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/about.html
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/about.html
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/build.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/build.properties
index 308ebe64071..308ebe64071 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/build.properties
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/build.properties
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/plugin.properties
new file mode 100644
index 00000000000..88550fa0002
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/plugin.properties
@@ -0,0 +1,12 @@
+#/*****************************************************************************
+# * Copyright (c) 2014 Atos Origin.
+# *
+# *    
+# * All rights reserved. This program and the accompanying materials
+# * are made available under the terms of the Eclipse Public License v1.0
+# * which accompanies this distribution, and is available at
+# * http://www.eclipse.org/legal/epl-v10.html
+# *
+# *****************************************************************************/
+pluginName = Collaborative Model
+providerName = Eclipse Modeling Project
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/plugin.xml
new file mode 100644
index 00000000000..85196e35f30
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension-point id="org.eclipse.papyrus.team.collaborative.core.contribution" name="contribution" schema="schema/contribution.exsd"/>

+

+</plugin>

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/schema/collaborative.exsd b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/schema/contribution.exsd
index 863d5ab7757..fa0a5ed6205 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/schema/collaborative.exsd
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/schema/contribution.exsd
@@ -1,151 +1,151 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.team.collaborative" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.papyrus.team.collaborative" id="collaborative" name="collaborative"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <choice minOccurs="1" maxOccurs="unbounded">
-            <element ref="ParticipantFactory"/>
-            <element ref="LockingStrategy"/>
-         </choice>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="LockingStrategy">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="impl" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.ILockingStrategy"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ParticipantFactory">
-      <annotation>
-         <documentation>
-            This extension aim to register participant to collaboration
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="impl" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is an implentation of a participant for the collaboration mode. Depending on the feature that this participant provide it as to inherite from ILocker, IUnlocker, IUpdater, ICommitter
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.ICollabFactory"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="priority" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Should be a int. The higher int is the most prioritary
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>

+<!-- Schema file written by PDE -->

+<schema targetNamespace="org.eclipse.papyrus.team.collaborative.core" xmlns="http://www.w3.org/2001/XMLSchema">

+<annotation>

+      <appinfo>

+         <meta.schema plugin="org.eclipse.papyrus.team.collaborative.core" id="contribution" name="Collaborative Mode Contribution"/>

+      </appinfo>

+      <documentation>

+         This extension point is used to register contributions to the collaborative framework, either as locking strategies (used to define which objects are to be affected) or as participants implementing one or more of 4 different actions

+      </documentation>

+   </annotation>

+

+   <element name="extension">

+      <annotation>

+         <appinfo>

+            <meta.element />

+         </appinfo>

+      </annotation>

+      <complexType>

+         <choice minOccurs="1" maxOccurs="unbounded">

+            <element ref="ParticipantFactory"/>

+            <element ref="LockingStrategy"/>

+         </choice>

+         <attribute name="point" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="id" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="name" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+               <appinfo>

+                  <meta.attribute translatable="true"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <element name="LockingStrategy">

+      <complexType>

+         <attribute name="name" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="id" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="impl" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+               <appinfo>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.core.ILockingStrategy"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <element name="ParticipantFactory">

+      <annotation>

+         <documentation>

+            This extension aim to register participant to collaboration

+         </documentation>

+      </annotation>

+      <complexType>

+         <attribute name="id" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="impl" type="string" use="required">

+            <annotation>

+               <documentation>

+                  This is an implentation of a participant for the collaboration mode. Depending on the feature that this participant provide it as to inherite from ILocker, IUnlocker, IUpdater, ICommitter

+               </documentation>

+               <appinfo>

+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.team.collaborative.core.ICollabFactory"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+         <attribute name="priority" type="string" use="required">

+            <annotation>

+               <documentation>

+                  Should be a int. The higher int is the most prioritary

+               </documentation>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="since"/>

+      </appinfo>

+      <documentation>

+         [Enter the first release in which this extension point appears.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="examples"/>

+      </appinfo>

+      <documentation>

+         [Enter extension point usage example here.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="apiinfo"/>

+      </appinfo>

+      <documentation>

+         [Enter API information here.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="implementation"/>

+      </appinfo>

+      <documentation>

+         [Enter information about supplied implementation of this extension point.]

+      </documentation>

+   </annotation>

+

+

+</schema>

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/Activator.java
index 3a6e9f6fef6..3c75679345b 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/Activator.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative;
+package org.eclipse.papyrus.team.collaborative.core;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
 	/** The Constant PLUGIN_ID. */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core"; //$NON-NLS-1$
 
 	// The shared instance
 	/** The plugin. */
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/ExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/ExtendedURI.java
index 88366e65849..0d4280179ec 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/ExtendedURI.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/ExtendedURI.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative;
+package org.eclipse.papyrus.team.collaborative.core;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -56,7 +56,7 @@ public class ExtendedURI implements IExtendedURI {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#isContainment()
+	 * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#isContainment()
 	 */
 	@Override
 	public boolean isContainment() {
@@ -68,7 +68,7 @@ public class ExtendedURI implements IExtendedURI {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#setParameter(java.lang.String, java.lang.Object)
+	 * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#setParameter(java.lang.String, java.lang.Object)
 	 */
 	@Override
 	public ExtendedURI setParameter(String id, Object value) {
@@ -93,7 +93,7 @@ public class ExtendedURI implements IExtendedURI {
 
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#getParameter(java.lang.String)
+	 * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#getParameter(java.lang.String)
 	 */
 	@Override
 	public Object getParameter(String id) {
@@ -102,7 +102,7 @@ public class ExtendedURI implements IExtendedURI {
 
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.team.collaborative.IExtendedURI#getUri()
+	 * @see org.eclipse.papyrus.team.collaborative.core.IExtendedURI#getUri()
 	 */
 	@Override
 	public URI getUri() {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/ICollabFactory.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/ICollabFactory.java
index 54443ee20fd..661dec1857d 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/ICollabFactory.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/ICollabFactory.java
@@ -1,13 +1,13 @@
-package org.eclipse.papyrus.team.collaborative;
+package org.eclipse.papyrus.team.collaborative.core;
 
 import java.util.Set;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/ICollaborativeManager.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/ICollaborativeManager.java
index 3ef8f37fa11..a6f90555234 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/ICollaborativeManager.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/ICollaborativeManager.java
@@ -8,20 +8,20 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative;
+package org.eclipse.papyrus.team.collaborative.core;
 
 import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.impl.CollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.participants.ICollabParticipant;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
+import org.eclipse.papyrus.team.collaborative.core.impl.CollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.participants.ICollabParticipant;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;
 
 /**
  * The Interface ICollaborativeManager.
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/IExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/IExtendedURI.java
index 3b4905a2b4c..4cbe8371de2 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/IExtendedURI.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/IExtendedURI.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.team.collaborative;
+package org.eclipse.papyrus.team.collaborative.core;
 
 import org.eclipse.emf.common.util.URI;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/impl/CollaborativeManager.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/impl/CollaborativeManager.java
index d82de14f478..109dc317cad 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/impl/CollaborativeManager.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/impl/CollaborativeManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.impl;
+package org.eclipse.papyrus.team.collaborative.core.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,16 +22,16 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.Activator;
-import org.eclipse.papyrus.team.collaborative.ICollabFactory;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
+import org.eclipse.papyrus.team.collaborative.core.Activator;
+import org.eclipse.papyrus.team.collaborative.core.ICollabFactory;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;
 
 
 /**
@@ -78,7 +78,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getStrategies()
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getStrategies()
 	 */
 	@Override
 	public Map<String, ILockingStrategy.Descriptor> getStrategies() {
@@ -124,7 +124,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getLockingStrategy(java.lang.String)
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getLockingStrategy(java.lang.String)
 	 */
 	@Override
 	public ILockingStrategy getLockingStrategy(String id) {
@@ -152,7 +152,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
 	 */
 	@Override
 	public ILocker getLocker(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) {
@@ -166,7 +166,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
 	 */
 	@Override
 	public IUnlocker getUnlocker(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) {
@@ -180,7 +180,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
 	 */
 	@Override
 	public IUpdater getUpdater(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) {
@@ -194,7 +194,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
 	 */
 	@Override
 	public ICommitter getCommitter(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) {
@@ -208,7 +208,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#getReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#getReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
 	 */
 	@Override
 	public IReverter getReverter(Set<IExtendedURI> objectToLock, ResourceSet resourceSet) {
@@ -227,7 +227,7 @@ public class CollaborativeManager implements ICollaborativeManager {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollaborativeManager#isCollab(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager#isCollab(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
 	 */
 	@Override
 	public boolean isCollab(Set<IExtendedURI> uris, ResourceSet resourceSet) {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/AbstractExtendedURIBuilder.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/AbstractExtendedURIBuilder.java
index 04bf8fae5a0..81e8c77b10e 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/AbstractExtendedURIBuilder.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/AbstractExtendedURIBuilder.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants;
+package org.eclipse.papyrus.team.collaborative.core.participants;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -16,9 +16,9 @@ import java.util.Set;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.URIUtils;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils;
 
 import com.google.common.base.Function;
 
@@ -85,7 +85,7 @@ public abstract class AbstractExtendedURIBuilder implements IExtendedURISuperSet
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet#getResourceSet()
+	 * @see org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet#getResourceSet()
 	 */
 	public ResourceSet getResourceSet() {
 		return resourceSet;
@@ -95,7 +95,7 @@ public abstract class AbstractExtendedURIBuilder implements IExtendedURISuperSet
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet#getExtendedSet()
+	 * @see org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet#getExtendedSet()
 	 */
 	public Set<IExtendedURI> getExtendedSet() {
 		if(uriToHandle == null) {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/ICollabParticipant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/ICollabParticipant.java
index fe7cdddec45..ddffe32afde 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/ICollabParticipant.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/ICollabParticipant.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants;
+package org.eclipse.papyrus.team.collaborative.core.participants;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/IExtendedURISuperSet.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/IExtendedURISuperSet.java
index 26165693dfe..15239c6a0ed 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/IExtendedURISuperSet.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/IExtendedURISuperSet.java
@@ -8,18 +8,18 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants;
+package org.eclipse.papyrus.team.collaborative.core.participants;
 
 import java.util.Set;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/locker/ILocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/ILocker.java
index 5bf410a5634..163c4084475 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/locker/ILocker.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/ILocker.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants.locker;
+package org.eclipse.papyrus.team.collaborative.core.participants.locker;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/locker/IUnlocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/IUnlocker.java
index 70a47af0866..967bc8e3011 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/locker/IUnlocker.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/locker/IUnlocker.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants.locker;
+package org.eclipse.papyrus.team.collaborative.core.participants.locker;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/ICommitter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/ICommitter.java
index 16aa25a608f..c38963b8901 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/ICommitter.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/ICommitter.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants.version;
+package org.eclipse.papyrus.team.collaborative.core.participants.version;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet;
+import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/IReverter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IReverter.java
index 18d5bd3c37f..479095ba1dc 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/IReverter.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IReverter.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants.version;
+package org.eclipse.papyrus.team.collaborative.core.participants.version;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet;
+import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/IUpdater.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IUpdater.java
index 22909a3932c..074c8ed58dc 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/IUpdater.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IUpdater.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.team.collaborative.participants.version;
+package org.eclipse.papyrus.team.collaborative.core.participants.version;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.papyrus.team.collaborative.Activator;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.Activator;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/IWorkOnModifiedElementParticipant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IWorkOnModifiedElementParticipant.java
index a4f039124ad..4dcd9930c02 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/participants/version/IWorkOnModifiedElementParticipant.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/participants/version/IWorkOnModifiedElementParticipant.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.participants.version;
+package org.eclipse.papyrus.team.collaborative.core.participants.version;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/CollabStatus.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/reports/CollabStatus.java
index 928fcedfdfc..a92ad77131e 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/CollabStatus.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/reports/CollabStatus.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.reports;
+package org.eclipse.papyrus.team.collaborative.core.reports;
 
 import org.eclipse.core.runtime.Status;
 
@@ -73,7 +73,7 @@ public class CollabStatus extends Status {
 	 * @return the collab status
 	 */
 	public static CollabStatus createErrorStatus(String message) {
-		return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.Activator.PLUGIN_ID, message);
+		return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.core.Activator.PLUGIN_ID, message);
 	}
 
 	/**
@@ -86,7 +86,7 @@ public class CollabStatus extends Status {
 	 * @return the collab status
 	 */
 	public static CollabStatus createErrorStatus(String message, Throwable e) {
-		return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.Activator.PLUGIN_ID, message, e);
+		return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.core.Activator.PLUGIN_ID, message, e);
 	}
 
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/copy/LogHelper.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/reports/LogHelper.java
index 65f704d7d6a..42c721a30be 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/copy/LogHelper.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/reports/LogHelper.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.reports.copy;
+package org.eclipse.papyrus.team.collaborative.core.reports;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.team.collaborative.Activator;
+import org.eclipse.papyrus.team.collaborative.core.Activator;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/strategy/AbstractLockingStrategy.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/strategy/AbstractLockingStrategy.java
index 5c10d6ab291..f99e8e3b9de 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/strategy/AbstractLockingStrategy.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/strategy/AbstractLockingStrategy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.strategy;
+package org.eclipse.papyrus.team.collaborative.core.strategy;
 
 import java.util.Collection;
 
@@ -24,7 +24,7 @@ public abstract class AbstractLockingStrategy implements ILockingStrategy {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy#applyOn(java.util.Collection)
+	 * @see org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy#applyOn(java.util.Collection)
 	 */
 	@Override
 	public boolean applyOn(Collection<EObject> target) {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/strategy/ILockingStrategy.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/strategy/ILockingStrategy.java
index 72c90c33dd2..25f4592a55c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/strategy/ILockingStrategy.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/strategy/ILockingStrategy.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.strategy;
+package org.eclipse.papyrus.team.collaborative.core.strategy;
 
 import java.util.Collection;
 import java.util.Set;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/AbstractRunnableWithProgressWithResult.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/AbstractRunnableWithProgressWithResult.java
index eed22c02ab3..782064172ce 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/AbstractRunnableWithProgressWithResult.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/AbstractRunnableWithProgressWithResult.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 
 
@@ -23,7 +23,7 @@ public abstract class AbstractRunnableWithProgressWithResult<T> implements IRunn
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.utils.IRunnableWithProgressWithResult#getResult()
+	 * @see org.eclipse.papyrus.team.collaborative.core.utils.IRunnableWithProgressWithResult#getResult()
 	 */
 	@Override
 	public T getResult() {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/CollabFunctionsFactory.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabFunctionsFactory.java
index a6162077a9a..27c8bde7788 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/CollabFunctionsFactory.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabFunctionsFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 import java.util.Collection;
 
@@ -18,15 +18,15 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.EObjectToExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.ExtendedURIToEObjects;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.ExtendedURIToIResource;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.ResourceToIFile;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.ResourceToURI;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.URIToExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.URIToExtendedURIWithContainment;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.EObjectToExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ExtendedURIToEObjects;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ExtendedURIToIResource;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ResourceToIFile;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.ResourceToURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.URIToExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.URIToExtendedURIWithContainment;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/CollabUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabUtils.java
index 46ec4665af9..07bcd8ac607 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/CollabUtils.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/CollabUtils.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 import java.util.Collections;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.utils.funtions.EObjectToExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.utils.funtions.EObjectToExtendedURI;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/ExtendedURIUtil.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/ExtendedURIUtil.java
index 3d5de89bb0a..8e0635ebd98 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/ExtendedURIUtil.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/ExtendedURIUtil.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
 
 
 public class ExtendedURIUtil {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/IRunnableWithProgressWithResult.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/IRunnableWithProgressWithResult.java
index 0dba93fb7d3..5176ea21438 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/IRunnableWithProgressWithResult.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/IRunnableWithProgressWithResult.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 import org.eclipse.jface.operation.IRunnableWithProgress;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/ModelsUtil.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/ModelsUtil.java
index 97c765c5d17..87c6de37103 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/ModelsUtil.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/ModelsUtil.java
@@ -9,7 +9,7 @@
  *    Thales Global Services S.A.S. - initial API and implementation
  * 
  */
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/ResourceUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/ResourceUtils.java
index 2204ad8e26f..9c20bcc2021 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/ResourceUtils.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/ResourceUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/URIUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/URIUtils.java
index 2320a2653c4..135b6c96972 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/URIUtils.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/URIUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils;
+package org.eclipse.papyrus.team.collaborative.core.utils;
 
 import java.io.File;
 import java.net.MalformedURLException;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/EObjectToExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/EObjectToExtendedURI.java
index b48c21afbd0..fd41926d88a 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/EObjectToExtendedURI.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/EObjectToExtendedURI.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
 
 import com.google.common.base.Function;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ExtendedURIToEObjects.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToEObjects.java
index 08fa2faff34..d6d0097bee7 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ExtendedURIToEObjects.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToEObjects.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -16,9 +16,9 @@ import java.util.Collections;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.URIUtils;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils;
 
 import com.google.common.base.Function;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ExtendedURIToIResource.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToIResource.java
index 5573646c262..e2cf99dbbd7 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ExtendedURIToIResource.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToIResource.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.URIUtils;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils;
 
 import com.google.common.base.Function;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ExtendedURIToURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToURI.java
index 683a8cf53e6..23038266e88 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ExtendedURIToURI.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ExtendedURIToURI.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
 
 import com.google.common.base.Function;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/IFileToFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IFileToFile.java
index 58b9388fa89..d3a4167ba0b 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/IFileToFile.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IFileToFile.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import java.io.File;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/IResourceToExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IResourceToExtendedURI.java
index 550b495210c..4bece819da0 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/IResourceToExtendedURI.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/IResourceToExtendedURI.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.core.resources.IResource;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.URIUtils;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils;
 
 import com.google.common.base.Function;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ResourceToIFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToIFile.java
index 97350f43cb4..74b5a0a789f 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ResourceToIFile.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToIFile.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.ecore.resource.Resource;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ResourceToURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToURI.java
index 7f37343b484..5af1b813ab5 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/ResourceToURI.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/ResourceToURI.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/URIToExtendedURI.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURI.java
index 4a40212c39e..2d3b1c2a3f0 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/URIToExtendedURI.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURI.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
 
 import com.google.common.base.Function;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/URIToExtendedURIWithContainment.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURIWithContainment.java
index d0c3ca5d0d0..773b6a713cc 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/utils/funtions/URIToExtendedURIWithContainment.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.core/src/org/eclipse/papyrus/team/collaborative/core/utils/funtions/URIToExtendedURIWithContainment.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.utils.funtions;
+package org.eclipse.papyrus.team.collaborative.core.utils.funtions;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
 
 import com.google.common.base.Function;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.project
deleted file mode 100644
index 67cf0525732..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.team.collaborative.integration.papyrus.svn</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/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.settings/org.eclipse.jdt.core.prefs b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b63063c..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/pom.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/pom.xml
deleted file mode 100644
index 24fd9185dc8..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2013 Atos.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
-  
-  Contributors:
-      Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <relativePath>../../../Releng/org.topcased.fast.tycho.master/pom.xml</relativePath>
-    <groupId>org.topcased.fast</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.papyrus.team.collaborative.integration.papyrus.svn</artifactId>
-  <packaging>eclipse-plugin</packaging>
-
-  <name>SVN Control</name>
-</project> 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.project
deleted file mode 100644
index 3567352c25d..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.team.collaborative.integration.papyrus</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/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.settings/org.eclipse.jdt.core.prefs b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6bb81369ac7..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.objectteams.otdt.compiler.option.pure_java=enabled
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/build.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/build.properties
deleted file mode 100644
index 6c480f39f1b..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/pom.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/pom.xml
deleted file mode 100644
index d0705162df0..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2013 Atos.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
-  
-  Contributors:
-      Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <relativePath>../../../Releng/org.topcased.fast.tycho.master/pom.xml</relativePath>
-    <groupId>org.topcased.fast</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.papyrus.team.collaborative.integration.papyrus</artifactId>
-  <packaging>eclipse-plugin</packaging>
-
-  <name>Team Ui</name>
-</project> 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.classpath b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.classpath
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.classpath
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.gitignore b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.gitignore
index 19af0f1d5ca..19af0f1d5ca 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/.gitignore
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.gitignore
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.project
index 327fed55d77..5b272c03654 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/.project
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.robotml.diagram.interfacedef</name>
+	<name>org.eclipse.papyrus.team.collaborative.strategy</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.settings/org.eclipse.jdt.core.prefs b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..42337f02afe
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+org.eclipse.objectteams.otdt.compiler.option.pure_java=enabled

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF
index 98c700e9ef1..ac2c7899b34 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/META-INF/MANIFEST.MF
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Team Ui
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.integration.papyrus;singleton:=true
-Bundle-Version: 1.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.integration.papyrus.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.team.collaborative;bundle-version="1.0.0",
- com.google.guava,
- org.eclipse.emf.ecore;bundle-version="2.7.0",
- org.eclipse.papyrus.infra.core,
- org.eclipse.papyrus.infra.gmfdiag.modelexplorer,
- org.eclipse.ui.navigator;bundle-version="3.5.101",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.2",
- org.eclipse.papyrus.infra.emf.readonly,
- org.eclipse.core.expressions,
- org.eclipse.uml2.uml;bundle-version="3.2.100",
- org.eclipse.emf.edit,
- org.eclipse.gmf.runtime.common.ui,
- org.eclipse.papyrus.uml.tools,
- org.eclipse.ui.ide,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.papyrus.views.modelexplorer,
- org.eclipse.papyrus.infra.emf,
- org.eclipse.papyrus.infra.widgets,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions,
- org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs,
- org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers,
- org.eclipse.papyrus.team.collaborative.integration.papyrus.utils
-Bundle-Vendor: Atos
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.strategy;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.team.collaborative.core.integration.papyrus.Activator

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.0",

+ com.google.guava,

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

+ org.eclipse.papyrus.infra.core,

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

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

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

+ org.eclipse.papyrus.infra.emf.readonly,

+ org.eclipse.core.expressions,

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

+ org.eclipse.emf.edit,

+ org.eclipse.gmf.runtime.common.ui,

+ org.eclipse.papyrus.uml.tools,

+ org.eclipse.ui.ide,

+ org.eclipse.ui.views.properties.tabbed,

+ org.eclipse.emf.transaction,

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

+ org.eclipse.papyrus.views.modelexplorer,

+ org.eclipse.papyrus.infra.emf,

+ org.eclipse.papyrus.infra.widgets,

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

+Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Export-Package: org.eclipse.papyrus.team.collaborative.strategy.ui.actions,

+ org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs,

+ org.eclipse.papyrus.team.collaborative.strategy.ui.providers,

+ org.eclipse.papyrus.team.collaborative.strategy.utils

+Bundle-Vendor: %providerName

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/about.html b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/about.html
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/about.html
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/build.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/build.properties
index 0f6e4783e6e..6b4afb7a5a7 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus.svn/build.properties
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/build.properties
@@ -4,4 +4,4 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               resources/
+               plugin.properties
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/TeamIcon.png b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/TeamIcon.png
index bb1d469d844..bb1d469d844 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/TeamIcon.png
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/TeamIcon.png
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/commit.gif b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/commit.gif
index b67692df435..b67692df435 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/commit.gif
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/commit.gif
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/lock.gif b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/lock.gif
index 1075ee45868..1075ee45868 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/lock.gif
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/lock.gif
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/revert.gif b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/revert.gif
index c01c38436f0..c01c38436f0 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/revert.gif
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/revert.gif
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/unlock.gif b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/unlock.gif
index 73f3c2d02a4..73f3c2d02a4 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/unlock.gif
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/unlock.gif
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/update.gif b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/update.gif
index 8c76387e8d1..8c76387e8d1 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/icons/update.gif
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/icons/update.gif
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/plugin.properties
new file mode 100644
index 00000000000..13d9f9c5199
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/plugin.properties
@@ -0,0 +1,12 @@
+#/*****************************************************************************
+# * Copyright (c) 2014 Atos Origin.
+# *
+# *    
+# * All rights reserved. This program and the accompanying materials
+# * are made available under the terms of the Eclipse Public License v1.0
+# * which accompanies this distribution, and is available at
+# * http://www.eclipse.org/legal/epl-v10.html
+# *
+# *****************************************************************************/
+pluginName = Collaborative Locking Strategies
+providerName = Eclipse Modeling Project
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/plugin.xml
index 6b66d5f72f0..84c12743f5f 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/plugin.xml
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/plugin.xml
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
-         <menu
-               icon="icons/TeamIcon.png"
-               id="org.eclipse.papyrus.team.collaborative.ui.collab.menu"
-               label="Collaborative">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <test
-                        property="org.eclipse.papyrus.team.collaborative.integration.papyrus.isCollab"
-                        value="true">
-                  </test>
-               </with>
-            </visibleWhen>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.team.collaborative.ui.collab.menu">
-         <menu
-               icon="icons/lock.gif"
-               id="org.eclipse.papyrus.team.collaborative.integration.papyrus.menu"
-               label="Lock">
-            <dynamic
-                  class="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items.LockStrategyItemProvider"
-                  id="org.eclipse.papyrus.team.collaborative.integration.papyrus.lockItems">
-            </dynamic>
-         </menu>
-         <menu
-               icon="icons/unlock.gif"
-               id="org.eclipse.papyrus.team.collaborative.integration.papyrus.unlock"
-               label="Unlock">
-            <dynamic
-                  class="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items.UnlockStrategyItemProvider"
-                  id="org.eclipse.papyrus.team.collaborative.integration.papyrus.UnlockItem">
-            </dynamic>
-         </menu>
-         <command
-               commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.update"
-               icon="icons/update.gif"
-               label="Update"
-               style="push"
-               tooltip="Update the all model from the repository">
-         </command>
-         <command
-               commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.commit"
-               icon="icons/commit.gif"
-               label="Commit"
-               style="push"
-               tooltip="Commit all modification to the repository">
-         </command>
-         <command
-               commandId="org.eclipse.papyrus.team.collaborative.integration.papyrus.revert"
-               icon="icons/revert.gif"
-               label="Revert"
-               style="push"
-               tooltip="Revert all changes">
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.team.collaborative.collaborative">
-      <LockingStrategy
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.elementsandcontents"
-            impl="org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies.PapyrusSelectionAllContent"
-            name="Selected element and content">
-      </LockingStrategy>
-       <LockingStrategy
-             id="org.eclipse.papyrus.team.collaborative.integration.papyrus.papyrusResourceContent"
-             impl="org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies.PapyrusCurrentResource"
-             name="Selected element">
-      </LockingStrategy>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.UpdateHandler"
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.update"
-            name="Update">
-      </command>
-      <command
-            defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.CommitHandler"
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.commit"
-            name="Commit">
-      </command>
-      <command
-            defaultHandler="org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.RevertHandler"
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.revert"
-            name="Revert">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.eclipse.papyrus.team.collaborative.integration.papyrus.IsCollabPropertyTest"
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.iCollabID"
-            namespace="org.eclipse.papyrus.team.collaborative.integration.papyrus"
-            properties="isCollab"
-            type="org.eclipse.jface.viewers.ISelection">
-      </propertyTester>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.emf.readonly.readOnlyHandler">
-      <readOnlyHandler
-            class="org.eclipse.papyrus.team.collaborative.integration.papyrus.security.CollabReadOnlyHandler"
-            id="org.eclipse.papyrus.team.collaborative.integration.papyrus.CollabReadOnlyHandler"
-            priority="700">
-      </readOnlyHandler>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.core.model">
-      <modelSetSnippet
-            classname="org.eclipse.papyrus.team.collaborative.integration.papyrus.security.PreCommitReadOnlyHandler">
-      </modelSetSnippet>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.ui.menus">

+      <menuContribution

+            allPopups="false"

+            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">

+         <menu

+               icon="icons/TeamIcon.png"

+               id="org.eclipse.papyrus.team.collaborative.core.ui.collab.menu"

+               label="Collaborative">

+            <visibleWhen

+                  checkEnabled="false">

+               <with

+                     variable="selection">

+                  <test

+                        property="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.isCollab"

+                        value="true">

+                  </test>

+               </with>

+            </visibleWhen>

+         </menu>

+      </menuContribution>

+      <menuContribution

+            allPopups="false"

+            locationURI="popup:org.eclipse.papyrus.team.collaborative.core.ui.collab.menu">

+         <menu

+               icon="icons/lock.gif"

+               id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.menu"

+               label="Lock">

+            <dynamic

+                  class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.items.LockStrategyItemProvider"

+                  id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.lockItems">

+            </dynamic>

+         </menu>

+         <menu

+               icon="icons/unlock.gif"

+               id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.unlock"

+               label="Unlock">

+            <dynamic

+                  class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.items.UnlockStrategyItemProvider"

+                  id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.UnlockItem">

+            </dynamic>

+         </menu>

+         <command

+               commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.update"

+               icon="icons/update.gif"

+               label="Update"

+               style="push"

+               tooltip="Update the all model from the repository">

+         </command>

+         <command

+               commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.commit"

+               icon="icons/commit.gif"

+               label="Commit"

+               style="push"

+               tooltip="Commit all modification to the repository">

+         </command>

+         <command

+               commandId="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.revert"

+               icon="icons/revert.gif"

+               label="Revert"

+               style="push"

+               tooltip="Revert all changes">

+         </command>

+      </menuContribution>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.team.collaborative.core.contribution">

+      <LockingStrategy

+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.elementsandcontents"

+            impl="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.stategies.PapyrusSelectionAllContent"

+            name="Selected element and content">

+      </LockingStrategy>

+       <LockingStrategy

+             id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.papyrusResourceContent"

+             impl="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.stategies.PapyrusCurrentResource"

+             name="Selected element">

+      </LockingStrategy>

+   </extension>

+   <extension

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

+      <command

+            defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.actions.UpdateHandler"

+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.update"

+            name="Update">

+      </command>

+      <command

+            defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.actions.CommitHandler"

+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.commit"

+            name="Commit">

+      </command>

+      <command

+            defaultHandler="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.actions.RevertHandler"

+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.revert"

+            name="Revert">

+      </command>

+   </extension>

+   <extension

+         point="org.eclipse.core.expressions.propertyTesters">

+      <propertyTester

+            class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.IsCollabPropertyTest"

+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.iCollabID"

+            namespace="org.eclipse.papyrus.team.collaborative.core.integration.papyrus"

+            properties="isCollab"

+            type="org.eclipse.jface.viewers.ISelection">

+      </propertyTester>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.emf.readonly.readOnlyHandler">

+      <readOnlyHandler

+            class="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.security.CollabReadOnlyHandler"

+            id="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.CollabReadOnlyHandler"

+            priority="700">

+      </readOnlyHandler>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.core.model">

+      <modelSetSnippet

+            classname="org.eclipse.papyrus.team.collaborative.core.integration.papyrus.security.PreCommitReadOnlyHandler">

+      </modelSetSnippet>

+   </extension>

+

+</plugin>

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/Activator.java
index cfdf6ae3afa..0cb8df7707f 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/Activator.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus;
+package org.eclipse.papyrus.team.collaborative.strategy;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
 	/** The Constant PLUGIN_ID. */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.integration.papyrus"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core.integration.papyrus"; //$NON-NLS-1$
 
 	// The shared instance
 	/** The plugin. */
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/IsCollabPropertyTest.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/IsCollabPropertyTest.java
index 0459c54554e..13874006ebd 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/IsCollabPropertyTest.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/IsCollabPropertyTest.java
@@ -1,64 +1,60 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
-
-
-/**
- * Tester to check if the selection belong to a collaborative model.
- * 
- * @author adaussy
- */
-public class IsCollabPropertyTest extends PropertyTester {
-
-	/** The Constant IS_COLLAB_PROPERTY. */
-	private static final String IS_COLLAB_PROPERTY = "isCollab";
-
-	/**
-	 * Instantiates a new checks if is collab property test.
-	 */
-	public IsCollabPropertyTest() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
-	 */
-	@Override
-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-		if(IS_COLLAB_PROPERTY.equals(property)) {
-			if(receiver instanceof ISelection) {
-				ISelection selection = (ISelection)receiver;
-				if(selection instanceof IStructuredSelection) {
-					IStructuredSelection structurSelection = (IStructuredSelection)selection;
-					Object first = structurSelection.getFirstElement();
-					if(first instanceof IAdaptable) {
-						Object eObject = ((IAdaptable)first).getAdapter(EObject.class);
-						if(eObject != null) {
-							EObject eObject2 = (EObject)eObject;
-							return CollabUtils.isCollab(eObject2);
-						}
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy;

+

+import org.eclipse.core.expressions.PropertyTester;

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

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

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

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;

+

+

+/**

+ * Tester to check if the selection belong to a collaborative model.

+ * 

+ * @author adaussy

+ */

+public class IsCollabPropertyTest extends PropertyTester {

+

+	/** The Constant IS_COLLAB_PROPERTY. */

+	private static final String IS_COLLAB_PROPERTY = "isCollab";

+

+	/**

+	 * Instantiates a new checks if is collab property test.

+	 */

+	public IsCollabPropertyTest() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

+	 */

+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

+		if(IS_COLLAB_PROPERTY.equals(property)) {

+			if(receiver instanceof ISelection) {

+				ISelection selection = (ISelection)receiver;

+				if(selection instanceof IStructuredSelection) {

+					IStructuredSelection structurSelection = (IStructuredSelection)selection;

+					Object first = structurSelection.getFirstElement();

+					EObject eObject = EMFHelper.getEObject(first);

+					if(eObject != null) {

+						return CollabUtils.isCollab(eObject);

+					}

+				}

+			}

+		}

+		return false;

+	}

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/MatchingURIObject.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/MatchingURIObject.java
index 858b540dc03..3a7270d47c1 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/MatchingURIObject.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/MatchingURIObject.java
@@ -1,79 +1,78 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.ExtendedURIUtil;
-import org.eclipse.uml2.uml.Element;
-
-import com.google.common.base.Predicate;
-
-
-/**
- * The Class MatchingURIObject.
- * Predicate that will return true if the EObject belong to the set of {@link IExtendedURI}
- */
-public class MatchingURIObject implements Predicate<EObject> {
-
-	private Set<IExtendedURI> uris;
-
-	public MatchingURIObject(Set<IExtendedURI> uris) {
-		super();
-		this.uris = uris;
-	}
-
-	@Override
-	public boolean apply(EObject input) {
-		List<EObject> objectToTEObjects = new ArrayList<EObject>();
-		objectToTEObjects.add(input);
-		objectToTEObjects.addAll(NotationUtils.getLoadedAssociatedDiagrams(input));
-		for(IExtendedURI extendedURI : uris) {
-			for(EObject o : objectToTEObjects) {
-				boolean contained = ExtendedURIUtil.isIncluded(o, extendedURI);
-
-				if(contained) {
-					return contained;
-				}
-			}
-		}
-		return false;
-	}
-
-
-	protected EObject getSemanticObject(EObject eObject) {
-		EObject result = null;
-		if(eObject instanceof Element) {
-			result = eObject;
-		} else if(eObject instanceof View) {
-			//Handle view
-			result = ((View)eObject).getElement();
-		} else {
-			//Handle setereotype
-			Element baseElement = org.eclipse.uml2.uml.util.UMLUtil.getBaseElement(eObject);
-			if(baseElement != null) {
-				result = baseElement;
-			}
-			//TODO handle tab
-		}
-		return result;
-	}
-
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy;

+

+import java.util.ArrayList;

+import java.util.List;

+import java.util.Set;

+

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

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

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

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.utils.ExtendedURIUtil;

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

+

+import com.google.common.base.Predicate;

+

+

+/**

+ * The Class MatchingURIObject.

+ * Predicate that will return true if the EObject belong to the set of {@link IExtendedURI}

+ */

+public class MatchingURIObject implements Predicate<EObject> {

+

+	private Set<IExtendedURI> uris;

+

+	public MatchingURIObject(Set<IExtendedURI> uris) {

+		super();

+		this.uris = uris;

+	}

+

+	public boolean apply(EObject input) {

+		List<EObject> objectToTEObjects = new ArrayList<EObject>();

+		objectToTEObjects.add(input);

+		objectToTEObjects.addAll(NotationUtils.getLoadedAssociatedDiagrams(input));

+		for(IExtendedURI extendedURI : uris) {

+			for(EObject o : objectToTEObjects) {

+				boolean contained = ExtendedURIUtil.isIncluded(o, extendedURI);

+

+				if(contained) {

+					return contained;

+				}

+			}

+		}

+		return false;

+	}

+

+

+	protected EObject getSemanticObject(EObject eObject) {

+		EObject result = null;

+		if(eObject instanceof Element) {

+			result = eObject;

+		} else if(eObject instanceof View) {

+			//Handle view

+			result = ((View)eObject).getElement();

+		} else {

+			//Handle setereotype

+			Element baseElement = org.eclipse.uml2.uml.util.UMLUtil.getBaseElement(eObject);

+			if(baseElement != null) {

+				result = baseElement;

+			}

+			//TODO handle tab

+		}

+		return result;

+	}

+

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/RefreshHelper.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/RefreshHelper.java
index f9a73a7ac4f..ded9888b3d7 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/RefreshHelper.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/RefreshHelper.java
@@ -1,182 +1,181 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Olivier Melois <a href="mailto:olivier.melois@atos.net"> - initial API and implementation
- ******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Helper used to store method for refreshin model explorer view
- * 
- * @author omelois
- * 
- */
-public final class RefreshHelper {
-
-
-	private RefreshHelper() {
-	}
-
-
-	/**
-	 * Runnable that will be used to refresh the model explorer view
-	 * 
-	 * @author adaussy
-	 * 
-	 */
-	public static final class RefreshModelExplorerRunnable implements Runnable {
-
-		private final Collection<EObject> elementsToRefresh;
-
-		private static final int TIME_TO_REFRESH_MODEL_EXPLORER = 100;
-
-		/**
-		 * @param elementsToRefresh
-		 *        Element to Refresh
-		 */
-		public RefreshModelExplorerRunnable(Collection<EObject> elementsToRefresh) {
-			this.elementsToRefresh = elementsToRefresh;
-		}
-
-		@Override
-		public void run() {
-
-			try {
-				Thread.sleep(TIME_TO_REFRESH_MODEL_EXPLORER);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-
-			if(elementsToRefresh != null) {
-				IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				if(activePage != null) {
-					IViewReference viewRef = activePage.findViewReference(ModelExplorerPageBookView.VIEW_ID);
-					if(viewRef != null && viewRef.getView(false) instanceof ModelExplorerView) {
-						ModelExplorerView modelExplorerView = (ModelExplorerView)viewRef.getView(false);
-						modelExplorerView.refresh();
-//						Set<Object> alreadyRefreshed = new HashSet<Object>();
-//						if(view != null) {
-//							for(EObject elementToRefresh : elementsToRefresh) {
-//								
-//								view.refreshObject(elementToRefresh, alreadyRefreshed);
-//								alreadyRefreshed.add(elementToRefresh);
-//							}
-//						}
-					}
-				}
-//				IViewReference[] viewReferences = activePage.getViewReferences();
-//				for(IViewReference viewRef : viewReferences) {
-//					if(viewRef.getId().equals(ModelExplorerPageBookView.VIEW_ID));
-//				}
-				
-			}
-		}
-	}
-
-	protected static final String ELEMENTS_TO_REFRESH_KEY = "elementsToRefresh"; //$NON-NLS-1$
-
-	/**
-	 * Get the model explorer refresh command
-	 * 
-	 * @param request
-	 *        IEditCommandRequest which implies refresh
-	 * @return
-	 */
-	public static ICommand getRefreshCommand(final IEditCommandRequest request) {
-		return new AbstractCommand("Refresh") //$NON-NLS-1$
-		{
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				refreshPostMove(request);
-				return CommandResult.newOKCommandResult();
-			}
-
-			@Override
-			protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				refreshPostMove(request);
-				return CommandResult.newOKCommandResult();
-			}
-
-			@Override
-			protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-				refreshPostMove(request);
-				return CommandResult.newOKCommandResult();
-			}
-		};
-	}
-
-	/**
-	 * Function to asynchronously refresh the model explorer after moving a breakdown element.
-	 * 
-	 * @param request
-	 */
-	private static void refreshPostMove(final IEditCommandRequest request) {
-		@SuppressWarnings("unchecked")
-		final Set<EObject> elementsToRefresh = (Set<EObject>)request.getParameter(ELEMENTS_TO_REFRESH_KEY);
-
-		refreshModelExplorer(elementsToRefresh);
-	}
-
-	public static void refreshModelExplorer(Collection<EObject> elementsToRefresh) {
-		if(elementsToRefresh != null && !(elementsToRefresh.isEmpty())) {
-			Display.getDefault().asyncExec(new RefreshModelExplorerRunnable(elementsToRefresh));
-		}
-	}
-
-	/**
-	 * Adds an element to the list of elements that should be refreshed, in the request.
-	 * 
-	 * @param element
-	 *        Element you want to refresh
-	 * @param request
-	 *        Request in which the information about a refresh will be added
-	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static void addElementToRefresh(EObject element, IEditCommandRequest request) {
-		Object elementsToRefresh = request.getParameter(ELEMENTS_TO_REFRESH_KEY);
-		if(elementsToRefresh == null) {
-			elementsToRefresh = new HashSet<EObject>();
-			request.getParameters().put(ELEMENTS_TO_REFRESH_KEY, elementsToRefresh);
-		}
-		if(elementsToRefresh instanceof Set<?>) {
-			((Set)elementsToRefresh).add(element);
-		}
-	}
-
-	/**
-	 * Checks whether a request has elements to refresh;
-	 * 
-	 * @param request
-	 *        Request in which the information about a refresh will be added
-	 * @return
-	 */
-	public static boolean hasElementsToRefresh(IEditCommandRequest request) {
-		Object elementsToRefresh = request.getParameter(ELEMENTS_TO_REFRESH_KEY);
-		return elementsToRefresh instanceof Set<?> && (!((Set<?>)elementsToRefresh).isEmpty());
-	}
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos.

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

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

+ * which accompanies this distribution, and is available at

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

+ * 

+ * Contributors:

+ *     Olivier Melois <a href="mailto:olivier.melois@atos.net"> - initial API and implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy;

+

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Set;

+

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

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

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

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

+import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView;

+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IViewReference;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * Helper used to store method for refreshin model explorer view

+ * 

+ * @author omelois

+ * 

+ */

+public final class RefreshHelper {

+

+

+	private RefreshHelper() {

+	}

+

+

+	/**

+	 * Runnable that will be used to refresh the model explorer view

+	 * 

+	 * @author adaussy

+	 * 

+	 */

+	public static final class RefreshModelExplorerRunnable implements Runnable {

+

+		private final Collection<EObject> elementsToRefresh;

+

+		private static final int TIME_TO_REFRESH_MODEL_EXPLORER = 100;

+

+		/**

+		 * @param elementsToRefresh

+		 *        Element to Refresh

+		 */

+		public RefreshModelExplorerRunnable(Collection<EObject> elementsToRefresh) {

+			this.elementsToRefresh = elementsToRefresh;

+		}

+

+		public void run() {

+

+			try {

+				Thread.sleep(TIME_TO_REFRESH_MODEL_EXPLORER);

+			} catch (InterruptedException e) {

+				e.printStackTrace();

+			}

+

+			if(elementsToRefresh != null) {

+				IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

+				if(activePage != null) {

+					IViewReference viewRef = activePage.findViewReference(ModelExplorerPageBookView.VIEW_ID);

+					if(viewRef != null && viewRef.getView(false) instanceof ModelExplorerView) {

+						ModelExplorerView modelExplorerView = (ModelExplorerView)viewRef.getView(false);

+						modelExplorerView.refresh();

+//						Set<Object> alreadyRefreshed = new HashSet<Object>();

+//						if(view != null) {

+//							for(EObject elementToRefresh : elementsToRefresh) {

+//								

+//								view.refreshObject(elementToRefresh, alreadyRefreshed);

+//								alreadyRefreshed.add(elementToRefresh);

+//							}

+//						}

+					}

+				}

+//				IViewReference[] viewReferences = activePage.getViewReferences();

+//				for(IViewReference viewRef : viewReferences) {

+//					if(viewRef.getId().equals(ModelExplorerPageBookView.VIEW_ID));

+//				}

+				

+			}

+		}

+	}

+

+	protected static final String ELEMENTS_TO_REFRESH_KEY = "elementsToRefresh"; //$NON-NLS-1$

+

+	/**

+	 * Get the model explorer refresh command

+	 * 

+	 * @param request

+	 *        IEditCommandRequest which implies refresh

+	 * @return

+	 */

+	public static ICommand getRefreshCommand(final IEditCommandRequest request) {

+		return new AbstractCommand("Refresh") //$NON-NLS-1$

+		{

+

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				refreshPostMove(request);

+				return CommandResult.newOKCommandResult();

+			}

+

+			@Override

+			protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				refreshPostMove(request);

+				return CommandResult.newOKCommandResult();

+			}

+

+			@Override

+			protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				refreshPostMove(request);

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+

+	/**

+	 * Function to asynchronously refresh the model explorer after moving a breakdown element.

+	 * 

+	 * @param request

+	 */

+	private static void refreshPostMove(final IEditCommandRequest request) {

+		@SuppressWarnings("unchecked")

+		final Set<EObject> elementsToRefresh = (Set<EObject>)request.getParameter(ELEMENTS_TO_REFRESH_KEY);

+

+		refreshModelExplorer(elementsToRefresh);

+	}

+

+	public static void refreshModelExplorer(Collection<EObject> elementsToRefresh) {

+		if(elementsToRefresh != null && !(elementsToRefresh.isEmpty())) {

+			Display.getDefault().asyncExec(new RefreshModelExplorerRunnable(elementsToRefresh));

+		}

+	}

+

+	/**

+	 * Adds an element to the list of elements that should be refreshed, in the request.

+	 * 

+	 * @param element

+	 *        Element you want to refresh

+	 * @param request

+	 *        Request in which the information about a refresh will be added

+	 */

+	@SuppressWarnings({ "unchecked", "rawtypes" })

+	public static void addElementToRefresh(EObject element, IEditCommandRequest request) {

+		Object elementsToRefresh = request.getParameter(ELEMENTS_TO_REFRESH_KEY);

+		if(elementsToRefresh == null) {

+			elementsToRefresh = new HashSet<EObject>();

+			request.getParameters().put(ELEMENTS_TO_REFRESH_KEY, elementsToRefresh);

+		}

+		if(elementsToRefresh instanceof Set<?>) {

+			((Set)elementsToRefresh).add(element);

+		}

+	}

+

+	/**

+	 * Checks whether a request has elements to refresh;

+	 * 

+	 * @param request

+	 *        Request in which the information about a refresh will be added

+	 * @return

+	 */

+	public static boolean hasElementsToRefresh(IEditCommandRequest request) {

+		Object elementsToRefresh = request.getParameter(ELEMENTS_TO_REFRESH_KEY);

+		return elementsToRefresh instanceof Set<?> && (!((Set<?>)elementsToRefresh).isEmpty());

+	}

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/CollabReadOnlyHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/security/CollabReadOnlyHandler.java
index 66f5887495a..8af6a52911d 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/CollabReadOnlyHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/security/CollabReadOnlyHandler.java
@@ -1,95 +1,93 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.EditingDomain;
-//import org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler;
-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;
-import org.eclipse.papyrus.infra.emf.readonly.AbstractReadOnlyHandler;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-
-/**
- * The Class CollabReadOnlyHandler.
- * This read only handler implement {@link IReadOnlyHandler} using the collaborative framework
- */
-public class CollabReadOnlyHandler extends AbstractReadOnlyHandler {
-
-	public CollabReadOnlyHandler(EditingDomain editingDomain) {
-		super(editingDomain);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.readonly.IReadOnlyHandler#isReadOnly(org.eclipse.emf.common.util.URI[], org.eclipse.emf.edit.domain.EditingDomain)
-	 */
-	@Override
-	public Optional<Boolean> anyReadOnly(URI[] uris) {
-		if(uris != null && uris.length > 0 && getEditingDomain() != null) {
-			ArrayList<URI> urisList = Lists.newArrayList(uris);
-			Collection<IExtendedURI> extendedURICollection = Collections2.transform(urisList, CollabFunctionsFactory.getURIToExtendedURIWithContainment());
-			HashSet<IExtendedURI> extendURISet = Sets.newHashSet(extendedURICollection);
-			ResourceSet resourceSet = getEditingDomain().getResourceSet();
-			if(ICollaborativeManager.INSTANCE.isCollab(extendURISet, resourceSet)) {
-				ILocker locker;
-				locker = ICollaborativeManager.INSTANCE.getLocker(extendURISet, resourceSet);
-				if(locker == null) {
-					return Optional.absent();
-				}
-				for(IExtendedURI extendURI : locker.getExtendedSet()) {
-					if(!locker.isLocked(extendURI).isOK()) {
-						return Optional.of(true);
-					}
-				}
-			}
-		}
-		return Optional.absent();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.readonly.IReadOnlyHandler#enableWrite(org.eclipse.emf.common.util.URI[], org.eclipse.emf.edit.domain.EditingDomain)
-	 */
-	@Override
-	public Optional<Boolean> makeWritable(URI[] uris) {
-		ArrayList<URI> urisList = Lists.newArrayList(uris);
-		Collection<IExtendedURI> extendedURICollection = Collections2.transform(urisList, CollabFunctionsFactory.getURIToExtendedURIWithContainment());
-		HashSet<IExtendedURI> extendedURISet = Sets.newHashSet(extendedURICollection);
-		ResourceSet resourceSet = getEditingDomain().getResourceSet();
-		if(ICollaborativeManager.INSTANCE.isCollab(extendedURISet, resourceSet)) {
-			IStatus status = LockAction.doSafeLock(resourceSet, extendedURISet, true);
-			if(!status.isOK()) {
-				return Optional.absent();
-			}
-			return Optional.of(true);
-		}
-		return Optional.absent();
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.security;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+

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

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

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

+import org.eclipse.emf.edit.domain.EditingDomain;

+//import org.eclipse.papyrus.infra.emf.readonly.IReadOnlyHandler;

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

+import org.eclipse.papyrus.infra.emf.readonly.AbstractReadOnlyHandler;

+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction;

+

+import com.google.common.base.Optional;

+import com.google.common.collect.Collections2;

+import com.google.common.collect.Lists;

+import com.google.common.collect.Sets;

+

+

+/**

+ * The Class CollabReadOnlyHandler.

+ * This read only handler implement {@link IReadOnlyHandler} using the collaborative framework

+ */

+public class CollabReadOnlyHandler extends AbstractReadOnlyHandler {

+

+	public CollabReadOnlyHandler(EditingDomain editingDomain) {

+		super(editingDomain);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.readonly.IReadOnlyHandler#isReadOnly(org.eclipse.emf.common.util.URI[], org.eclipse.emf.edit.domain.EditingDomain)

+	 */

+	public Optional<Boolean> anyReadOnly(URI[] uris) {

+		if(uris != null && uris.length > 0 && getEditingDomain() != null) {

+			ArrayList<URI> urisList = Lists.newArrayList(uris);

+			Collection<IExtendedURI> extendedURICollection = Collections2.transform(urisList, CollabFunctionsFactory.getURIToExtendedURIWithContainment());

+			HashSet<IExtendedURI> extendURISet = Sets.newHashSet(extendedURICollection);

+			ResourceSet resourceSet = getEditingDomain().getResourceSet();

+			if(ICollaborativeManager.INSTANCE.isCollab(extendURISet, resourceSet)) {

+				ILocker locker;

+				locker = ICollaborativeManager.INSTANCE.getLocker(extendURISet, resourceSet);

+				if(locker == null) {

+					return Optional.absent();

+				}

+				for(IExtendedURI extendURI : locker.getExtendedSet()) {

+					if(!locker.isLocked(extendURI).isOK()) {

+						return Optional.of(true);

+					}

+				}

+			}

+		}

+		return Optional.absent();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.readonly.IReadOnlyHandler#enableWrite(org.eclipse.emf.common.util.URI[], org.eclipse.emf.edit.domain.EditingDomain)

+	 */

+	public Optional<Boolean> makeWritable(URI[] uris) {

+		ArrayList<URI> urisList = Lists.newArrayList(uris);

+		Collection<IExtendedURI> extendedURICollection = Collections2.transform(urisList, CollabFunctionsFactory.getURIToExtendedURIWithContainment());

+		HashSet<IExtendedURI> extendedURISet = Sets.newHashSet(extendedURICollection);

+		ResourceSet resourceSet = getEditingDomain().getResourceSet();

+		if(ICollaborativeManager.INSTANCE.isCollab(extendedURISet, resourceSet)) {

+			IStatus status = LockAction.doSafeLock(resourceSet, extendedURISet, true);

+			if(!status.isOK()) {

+				return Optional.absent();

+			}

+			return Optional.of(true);

+		}

+		return Optional.absent();

+	}

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/PreCommitReadOnlyHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/security/PreCommitReadOnlyHandler.java
index 35937304f02..7ff8b5335be 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/security/PreCommitReadOnlyHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/security/PreCommitReadOnlyHandler.java
@@ -1,141 +1,139 @@
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.security;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListenerImpl;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Sets;
-
-
-/**
- * This model snippet will register a new {@link ResourceSetListener} that will provide a new security on modifed resources.
- * Each time a resource will be set to modified this listener will check that the resources has been locked. If the resources is not lock then it will
- * try to rollback the current transaction
- * 
- * @author adaussy
- * 
- */
-public class PreCommitReadOnlyHandler implements IModelSetSnippet {
-
-	/**
-	 * This {@link ResourceSetListener} will listen each time a resource is modified to check that it has been locked or will ask for lock
-	 * 
-	 * @author adaussy
-	 * 
-	 */
-	private static class ResourceSetListener extends ResourceSetListenerImpl {
-
-		@Override
-		public boolean isPostcommitOnly() {
-			return false;
-		}
-
-		@Override
-		public boolean isPrecommitOnly() {
-			return true;
-		}
-
-		@Override
-		public boolean isAggregatePrecommitListener() {
-			return false;
-		}
-
-		/**
-		 * Filter only IS_MODIFIED notification
-		 */
-		private static NotificationFilter filter = NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED);
-
-		@Override
-		public NotificationFilter getFilter() {
-			return filter;
-		}
-
-
-		@Override
-		public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
-			final Set<Resource> resourceToTest = new HashSet<Resource>();
-			for(Notification n : event.getNotifications()) {
-				if(n.getNewBooleanValue()) {
-					Resource resource = (Resource)n.getNotifier();
-					//Filtered out any DI resource. Those resource are not collaborative resources
-					if(!DiModel.MODEL_FILE_EXTENSION.equals(resource.getURI().fileExtension())) {
-						resourceToTest.add(resource);
-					}
-				}
-			}
-			if(!resourceToTest.isEmpty()) {
-				TransactionalEditingDomain editingDomain = event.getEditingDomain();
-				ResourceSet resourceSet = editingDomain.getResourceSet();
-				HashSet<IExtendedURI> uriToTest = Sets.newHashSet(Collections2.transform(resourceToTest, CollabFunctionsFactory.getResourceToExtendedURIWithContainment()));
-				if(ICollaborativeManager.INSTANCE.isCollab(uriToTest, resourceSet)) {
-					Set<IExtendedURI> uriToLock = new HashSet<IExtendedURI>();
-					ILocker locker = ICollaborativeManager.INSTANCE.getLocker(uriToTest, resourceSet);
-					if(locker == null) {
-						return null;
-					}
-					for(IExtendedURI extendURI : locker.getExtendedSet()) {
-						if(!locker.isLocked(extendURI).isOK()) {
-							uriToLock.add(extendURI);
-						}
-					}
-					if(!uriToLock.isEmpty()) {
-						final IStatus status = LockAction.doSafeLock(resourceSet, uriToLock, true);
-						if(!status.isOK()) {
-							UIUtils.errorDialog(status, "Unable to lock");
-							throw new RollbackException(status);
-
-						}
-					}
-				}
-			}
-			return null;
-		}
-	}
-
-	public PreCommitReadOnlyHandler() {
-	}
-
-
-	private WeakHashMap<EditingDomain, ResourceSetListener> link = new WeakHashMap<EditingDomain, PreCommitReadOnlyHandler.ResourceSetListener>();
-
-	@Override
-	public void start(ModelSet modelsManager) {
-		TransactionalEditingDomain transactionalEditingDomain = modelsManager.getTransactionalEditingDomain();
-		ResourceSetListener listener = new ResourceSetListener();
-		link.put(transactionalEditingDomain, listener);
-		transactionalEditingDomain.addResourceSetListener(listener);
-
-	}
-
-	@Override
-	public void dispose(ModelSet modelsManager) {
-		TransactionalEditingDomain transactionalEditingDomain = modelsManager.getTransactionalEditingDomain();
-		transactionalEditingDomain.removeResourceSetListener(link.get(transactionalEditingDomain));
-
-	}
-
-
-
-}
+package org.eclipse.papyrus.team.collaborative.strategy.security;

+

+import java.util.HashSet;

+import java.util.Set;

+import java.util.WeakHashMap;

+

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

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

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

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

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

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.transaction.NotificationFilter;

+import org.eclipse.emf.transaction.ResourceSetChangeEvent;

+import org.eclipse.emf.transaction.ResourceSetListenerImpl;

+import org.eclipse.emf.transaction.RollbackException;

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

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

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

+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;

+

+import com.google.common.collect.Collections2;

+import com.google.common.collect.Sets;

+

+

+/**

+ * This model snippet will register a new {@link ResourceSetListener} that will provide a new security on modifed resources.

+ * Each time a resource will be set to modified this listener will check that the resources has been locked. If the resources is not lock then it will

+ * try to rollback the current transaction

+ * 

+ * @author adaussy

+ * 

+ */

+public class PreCommitReadOnlyHandler implements IModelSetSnippet {

+

+	/**

+	 * This {@link ResourceSetListener} will listen each time a resource is modified to check that it has been locked or will ask for lock

+	 * 

+	 * @author adaussy

+	 * 

+	 */

+	private static class ResourceSetListener extends ResourceSetListenerImpl {

+

+		@Override

+		public boolean isPostcommitOnly() {

+			return false;

+		}

+

+		@Override

+		public boolean isPrecommitOnly() {

+			return true;

+		}

+

+		@Override

+		public boolean isAggregatePrecommitListener() {

+			return false;

+		}

+

+		/**

+		 * Filter only IS_MODIFIED notification

+		 */

+		private static NotificationFilter filter = NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED);

+

+		@Override

+		public NotificationFilter getFilter() {

+			return filter;

+		}

+

+

+		@Override

+		public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {

+			final Set<Resource> resourceToTest = new HashSet<Resource>();

+			for(Notification n : event.getNotifications()) {

+				if(n.getNewBooleanValue()) {

+					Resource resource = (Resource)n.getNotifier();

+					//Filtered out any DI resource. Those resource are not collaborative resources

+					if(!DiModel.MODEL_FILE_EXTENSION.equals(resource.getURI().fileExtension())) {

+						resourceToTest.add(resource);

+					}

+				}

+			}

+			if(!resourceToTest.isEmpty()) {

+				TransactionalEditingDomain editingDomain = event.getEditingDomain();

+				ResourceSet resourceSet = editingDomain.getResourceSet();

+				HashSet<IExtendedURI> uriToTest = Sets.newHashSet(Collections2.transform(resourceToTest, CollabFunctionsFactory.getResourceToExtendedURIWithContainment()));

+				if(ICollaborativeManager.INSTANCE.isCollab(uriToTest, resourceSet)) {

+					Set<IExtendedURI> uriToLock = new HashSet<IExtendedURI>();

+					ILocker locker = ICollaborativeManager.INSTANCE.getLocker(uriToTest, resourceSet);

+					if(locker == null) {

+						return null;

+					}

+					for(IExtendedURI extendURI : locker.getExtendedSet()) {

+						if(!locker.isLocked(extendURI).isOK()) {

+							uriToLock.add(extendURI);

+						}

+					}

+					if(!uriToLock.isEmpty()) {

+						final IStatus status = LockAction.doSafeLock(resourceSet, uriToLock, true);

+						if(!status.isOK()) {

+							UIUtils.errorDialog(status, "Unable to lock");

+							throw new RollbackException(status);

+

+						}

+					}

+				}

+			}

+			return null;

+		}

+	}

+

+	public PreCommitReadOnlyHandler() {

+	}

+

+

+	private WeakHashMap<EditingDomain, ResourceSetListener> link = new WeakHashMap<EditingDomain, PreCommitReadOnlyHandler.ResourceSetListener>();

+

+	public void start(ModelSet modelsManager) {

+		TransactionalEditingDomain transactionalEditingDomain = modelsManager.getTransactionalEditingDomain();

+		ResourceSetListener listener = new ResourceSetListener();

+		link.put(transactionalEditingDomain, listener);

+		transactionalEditingDomain.addResourceSetListener(listener);

+

+	}

+

+	public void dispose(ModelSet modelsManager) {

+		TransactionalEditingDomain transactionalEditingDomain = modelsManager.getTransactionalEditingDomain();

+		transactionalEditingDomain.removeResourceSetListener(link.get(transactionalEditingDomain));

+

+	}

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/AbstractResourceBaseStrategy.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/AbstractResourceBaseStrategy.java
index f32c9f74244..37f18bb978c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/AbstractResourceBaseStrategy.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/AbstractResourceBaseStrategy.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies;
+package org.eclipse.papyrus.team.collaborative.strategy.stategies;
 
 import java.util.Collection;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.PapyrusResourceUtils;
-import org.eclipse.papyrus.team.collaborative.strategy.AbstractLockingStrategy;
+import org.eclipse.papyrus.team.collaborative.core.strategy.AbstractLockingStrategy;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.PapyrusResourceUtils;
 
 
 /**
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusCurrentResource.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusCurrentResource.java
index b59c1895a48..e155365316a 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusCurrentResource.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusCurrentResource.java
@@ -1,61 +1,60 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.papyrus.team.collaborative.utils.ModelsUtil;
-
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Sets;
-
-
-/**
- * Strategy that will lock the current triplet resource of the selection (uml,di,notation).
- * 
- * @author adaussy
- */
-public class PapyrusCurrentResource extends AbstractResourceBaseStrategy {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)
-	 */
-	@Override
-	public Set<IExtendedURI> getBusinessObject(Collection<EObject> eOjbects) {
-		if(!eOjbects.isEmpty()) {
-			ResourceSet ressourceSet = eOjbects.iterator().next().eResource().getResourceSet();
-			Collection<URI> uris = new HashSet<URI>();
-			for(EObject o : ModelsUtil.getRoots(eOjbects)) {
-				URI uri = o.eResource().getURI();
-				if(!uris.contains(uri)) {
-					uris.add(uri);
-					addExtraResources(ressourceSet, uris, uri);
-				}
-			}
-			return Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURI()));
-		}
-		return Collections.emptySet();
-	}
-
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.stategies;

+

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashSet;

+import java.util.Set;

+

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

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

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

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.core.utils.ModelsUtil;

+

+import com.google.common.collect.Collections2;

+import com.google.common.collect.Sets;

+

+

+/**

+ * Strategy that will lock the current triplet resource of the selection (uml,di,notation).

+ * 

+ * @author adaussy

+ */

+public class PapyrusCurrentResource extends AbstractResourceBaseStrategy {

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)

+	 */

+	public Set<IExtendedURI> getBusinessObject(Collection<EObject> eOjbects) {

+		if(!eOjbects.isEmpty()) {

+			ResourceSet ressourceSet = eOjbects.iterator().next().eResource().getResourceSet();

+			Collection<URI> uris = new HashSet<URI>();

+			for(EObject o : ModelsUtil.getRoots(eOjbects)) {

+				URI uri = o.eResource().getURI();

+				if(!uris.contains(uri)) {

+					uris.add(uri);

+					addExtraResources(ressourceSet, uris, uri);

+				}

+			}

+			return Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURI()));

+		}

+		return Collections.emptySet();

+	}

+

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusSelectionAllContent.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusSelectionAllContent.java
index 2fee22d04c0..0285e5d8b0a 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/stategies/PapyrusSelectionAllContent.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/stategies/PapyrusSelectionAllContent.java
@@ -1,83 +1,81 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.stategies;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.papyrus.team.collaborative.utils.ModelsUtil;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Sets;
-
-
-/**
- * Locking strategy that will lock all resources which contains element contained by the selection.
- * 
- * @author adaussy
- */
-public class PapyrusSelectionAllContent extends AbstractResourceBaseStrategy {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)
-	 */
-	@Override
-	public Set<IExtendedURI> getBusinessObject(Collection<EObject> eOjbects) {
-		if(!eOjbects.isEmpty()) {
-			ResourceSet ressourceSet = eOjbects.iterator().next().eResource().getResourceSet();
-			Collection<URI> uris = new HashSet<URI>();
-			for(EObject o : ModelsUtil.getRoots(eOjbects)) {
-				URI uri = o.eResource().getURI();
-				if(!uris.contains(uri)) {
-					uris.add(uri);
-					addExtraResources(ressourceSet, uris, uri);
-				}
-				Predicate<Resource> semanticResourcePredicate = new Predicate<Resource>() {
-
-					@Override
-					public boolean apply(Resource input) {
-						return "uml".equals(input.getURI().fileExtension());
-					}
-				};
-				//Add all resource that contains at least one descendant of a selected resource
-				for(Resource r : Collections2.filter(ressourceSet.getResources(), semanticResourcePredicate)) {
-					for(EObject potentialDescedant : r.getContents()) {
-						if(EcoreUtil.isAncestor(o, potentialDescedant)) {
-							URI childResourceURI = r.getURI();
-							if(!uris.contains(childResourceURI)) {
-								uris.add(childResourceURI);
-								addExtraResources(ressourceSet, uris, childResourceURI);
-								continue;
-							}
-						}
-					}
-				}
-			}
-			return Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURIWithContainment()));
-		}
-		return Collections.emptySet();
-	}
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.stategies;

+

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashSet;

+import java.util.Set;

+

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

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

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

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

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.core.utils.ModelsUtil;

+

+import com.google.common.base.Predicate;

+import com.google.common.collect.Collections2;

+import com.google.common.collect.Sets;

+

+

+/**

+ * Locking strategy that will lock all resources which contains element contained by the selection.

+ * 

+ * @author adaussy

+ */

+public class PapyrusSelectionAllContent extends AbstractResourceBaseStrategy {

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy#getBusinessObject(java.util.Collection)

+	 */

+	public Set<IExtendedURI> getBusinessObject(Collection<EObject> eOjbects) {

+		if(!eOjbects.isEmpty()) {

+			ResourceSet ressourceSet = eOjbects.iterator().next().eResource().getResourceSet();

+			Collection<URI> uris = new HashSet<URI>();

+			for(EObject o : ModelsUtil.getRoots(eOjbects)) {

+				URI uri = o.eResource().getURI();

+				if(!uris.contains(uri)) {

+					uris.add(uri);

+					addExtraResources(ressourceSet, uris, uri);

+				}

+				Predicate<Resource> semanticResourcePredicate = new Predicate<Resource>() {

+

+					public boolean apply(Resource input) {

+						return "uml".equals(input.getURI().fileExtension());

+					}

+				};

+				//Add all resource that contains at least one descendant of a selected resource

+				for(Resource r : Collections2.filter(ressourceSet.getResources(), semanticResourcePredicate)) {

+					for(EObject potentialDescedant : r.getContents()) {

+						if(EcoreUtil.isAncestor(o, potentialDescedant)) {

+							URI childResourceURI = r.getURI();

+							if(!uris.contains(childResourceURI)) {

+								uris.add(childResourceURI);

+								addExtraResources(ressourceSet, uris, childResourceURI);

+								continue;

+							}

+						}

+					}

+				}

+			}

+			return Sets.newHashSet(Collections2.transform(uris, CollabFunctionsFactory.getURIToExtendedURIWithContainment()));

+		}

+		return Collections.emptySet();

+	}

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/ICollabColors.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/ICollabColors.java
index 9342ee54d56..5689efbe888 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/ICollabColors.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/ICollabColors.java
@@ -1,6 +1,6 @@
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui;
+package org.eclipse.papyrus.team.collaborative.strategy.ui;
 
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/AbstractCollabHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/AbstractCollabHandler.java
index b3528d0f938..7b2e3f7511c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/AbstractCollabHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/AbstractCollabHandler.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PlatformUI;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/CommitHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/CommitHandler.java
index 16beed33162..1b98f502369 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/CommitHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/CommitHandler.java
@@ -1,154 +1,153 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.CommitDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * Handler use to deal with Commit action
- * The commit action will be performed on all the current model
- * 
- * @author adaussy
- */
-public class CommitHandler extends AbstractCollabHandler {
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		//Check that everything is commit
-		if(!UIUtils.saveAllDirtyEditor().isOK()) {
-			return null;
-		}
-		ResourceSet resourceSet = getResourceSet();
-		if(resourceSet == null) {
-			UIUtils.errorDialog(CollabStatus.createErrorStatus("unable to retreive the resource set"), "Collaboratibe error");
-			return null;
-		}
-		Set<IExtendedURI> uris = new HashSet<IExtendedURI>();
-		for(Resource r : resourceSet.getResources()) {
-			IFile file = WorkspaceSynchronizer.getFile(r);
-			if(file != null && file.exists()) {
-				uris.add(new ExtendedURI(r.getURI()));
-			}
-		}
-		IStatus status = doCommit(uris, resourceSet, true, null);
-		if(!status.isOK() && status.getCode() == Status.ERROR) {
-			UIUtils.errorDialog(status, "Error");
-		}
-		return null;
-
-
-	}
-
-	/**
-	 * Do commit action
-	 * 
-	 * @param uris
-	 *        the uris to commit
-	 * @param resourceSet
-	 *        the resource set
-	 * @param isPreview
-	 *        Set to true if the used to be given preview
-	 * @param message
-	 *        the message used for the commit operation
-	 * @return the {@link IStatus} of the operation
-	 */
-	public static IStatus doCommit(Set<IExtendedURI> uris, ResourceSet resourceSet, boolean isPreview, String message) {
-		ICommitter committer = ICollaborativeManager.INSTANCE.getCommitter(uris, resourceSet);
-		if(committer == null) {
-			return CollabStatus.createErrorStatus("Unable to get a ICommitter for uris\n" + uris);
-		}
-		Set<IExtendedURI> toBeCommitted = committer.getExtendedSet();
-		IStatus status = doCommitFromBuilder(resourceSet, committer, toBeCommitted, isPreview, message);
-		if(!status.isOK()) {
-			return status;
-		}
-		return Status.OK_STATUS;
-
-	}
-
-	/**
-	 * Do commit from builder using a already created {@link ICommitter}
-	 * 
-	 * @param resourceSet
-	 *        the resource set
-	 * @param committer
-	 *        the {@link ICommitter} to use
-	 * @param toBeCommitted
-	 *        {@link IExtendedURI} of what is about to be committed
-	 * @param isPreview
-	 *        Set to true if the user has to be given preview
-	 * @param message
-	 *        the message
-	 * @return the i status
-	 * @throws CollabException
-	 *         the collab exception
-	 */
-	public static IStatus doCommitFromBuilder(ResourceSet resourceSet, ICommitter committer, Set<IExtendedURI> toBeCommitted, boolean isPreview, String message) {
-		if(isPreview || message == null) {
-			ExtensivePartitionNameLabelProvider labelProvider = new ExtensivePartitionNameLabelProvider(new MatchingURIObject(toBeCommitted),UIUtils.getModelExplorerLavelProvider());
-			labelProvider.setColor(ICollabColors.COMMIT_COLLOR);
-			CommitDialog commitDialog = new CommitDialog(Display.getDefault().getActiveShell(), labelProvider, "Commit Dialog", "Element in red will be committed");
-			Collection<EObject> objectsToReveal = UIUtils.getLeafSemanticElement(toBeCommitted, resourceSet);
-			if(objectsToReveal != null && !objectsToReveal.isEmpty()) {
-				commitDialog.setObjectsToReveal(objectsToReveal);
-			}
-			if(commitDialog.open() == PreviewDialog.OK) {
-				message = commitDialog.getCommitMessage();
-			} else {
-				return Status.CANCEL_STATUS;
-			}
-		}
-
-		//Keep lock force to true. This shall be improve later
-		IStatus commitStatus = committer.commit(message, true);
-		UIUtils.refreshModelExplorer(toBeCommitted, resourceSet);
-		if(!commitStatus.isOK()) {
-			return commitStatus;
-		}
-		return Status.OK_STATUS;
-	}
-
-
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;

+

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Set;

+

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

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

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

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

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

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

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

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

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;

+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;

+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.CommitDialog;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;

+import org.eclipse.swt.widgets.Display;

+

+

+/**

+ * Handler use to deal with Commit action

+ * The commit action will be performed on all the current model

+ * 

+ * @author adaussy

+ */

+public class CommitHandler extends AbstractCollabHandler {

+

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		//Check that everything is commit

+		if(!UIUtils.saveAllDirtyEditor().isOK()) {

+			return null;

+		}

+		ResourceSet resourceSet = getResourceSet();

+		if(resourceSet == null) {

+			UIUtils.errorDialog(CollabStatus.createErrorStatus("unable to retreive the resource set"), "Collaboratibe error");

+			return null;

+		}

+		Set<IExtendedURI> uris = new HashSet<IExtendedURI>();

+		for(Resource r : resourceSet.getResources()) {

+			IFile file = WorkspaceSynchronizer.getFile(r);

+			if(file != null && file.exists()) {

+				uris.add(new ExtendedURI(r.getURI()));

+			}

+		}

+		IStatus status = doCommit(uris, resourceSet, true, null);

+		if(!status.isOK() && status.getCode() == Status.ERROR) {

+			UIUtils.errorDialog(status, "Error");

+		}

+		return null;

+

+

+	}

+

+	/**

+	 * Do commit action

+	 * 

+	 * @param uris

+	 *        the uris to commit

+	 * @param resourceSet

+	 *        the resource set

+	 * @param isPreview

+	 *        Set to true if the used to be given preview

+	 * @param message

+	 *        the message used for the commit operation

+	 * @return the {@link IStatus} of the operation

+	 */

+	public static IStatus doCommit(Set<IExtendedURI> uris, ResourceSet resourceSet, boolean isPreview, String message) {

+		ICommitter committer = ICollaborativeManager.INSTANCE.getCommitter(uris, resourceSet);

+		if(committer == null) {

+			return CollabStatus.createErrorStatus("Unable to get a ICommitter for uris\n" + uris);

+		}

+		Set<IExtendedURI> toBeCommitted = committer.getExtendedSet();

+		IStatus status = doCommitFromBuilder(resourceSet, committer, toBeCommitted, isPreview, message);

+		if(!status.isOK()) {

+			return status;

+		}

+		return Status.OK_STATUS;

+

+	}

+

+	/**

+	 * Do commit from builder using a already created {@link ICommitter}

+	 * 

+	 * @param resourceSet

+	 *        the resource set

+	 * @param committer

+	 *        the {@link ICommitter} to use

+	 * @param toBeCommitted

+	 *        {@link IExtendedURI} of what is about to be committed

+	 * @param isPreview

+	 *        Set to true if the user has to be given preview

+	 * @param message

+	 *        the message

+	 * @return the i status

+	 * @throws CollabException

+	 *         the collab exception

+	 */

+	public static IStatus doCommitFromBuilder(ResourceSet resourceSet, ICommitter committer, Set<IExtendedURI> toBeCommitted, boolean isPreview, String message) {

+		if(isPreview || message == null) {

+			ExtensivePartitionNameLabelProvider labelProvider = new ExtensivePartitionNameLabelProvider(new MatchingURIObject(toBeCommitted),UIUtils.getModelExplorerLavelProvider());

+			labelProvider.setColor(ICollabColors.COMMIT_COLLOR);

+			CommitDialog commitDialog = new CommitDialog(Display.getDefault().getActiveShell(), labelProvider, "Commit Dialog", "Element in red will be committed");

+			Collection<EObject> objectsToReveal = UIUtils.getLeafSemanticElement(toBeCommitted, resourceSet);

+			if(objectsToReveal != null && !objectsToReveal.isEmpty()) {

+				commitDialog.setObjectsToReveal(objectsToReveal);

+			}

+			if(commitDialog.open() == PreviewDialog.OK) {

+				message = commitDialog.getCommitMessage();

+			} else {

+				return Status.CANCEL_STATUS;

+			}

+		}

+

+		//Keep lock force to true. This shall be improve later

+		IStatus commitStatus = committer.commit(message, true);

+		UIUtils.refreshModelExplorer(toBeCommitted, resourceSet);

+		if(!commitStatus.isOK()) {

+			return commitStatus;

+		}

+		return Status.OK_STATUS;

+	}

+

+

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/LockAction.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/LockAction.java
index f43699a8959..4860df8317e 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/LockAction.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/LockAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;
 
 import java.util.Collection;
 import java.util.Set;
@@ -19,18 +19,18 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy.Descriptor;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy.Descriptor;
+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
 import org.eclipse.swt.widgets.Display;
 
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/RevertHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/RevertHandler.java
index 483aeb4d70a..65eafd52834 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/RevertHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/RevertHandler.java
@@ -1,140 +1,139 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
-import org.eclipse.swt.widgets.Display;
-
-
-// TODO: Auto-generated Javadoc
-/**
- * Handler use for Revert action
- * The revert action will be performe on all the current model.
- * 
- * @author adaussy
- */
-public class RevertHandler extends AbstractCollabHandler {
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		//Check that everything is commit
-		if(!UIUtils.saveAllDirtyEditor().isOK()) {
-			return null;
-		}
-		ResourceSet resourceSet = getResourceSet();
-		if(resourceSet == null) {
-			UIUtils.errorDialog(CollabStatus.createErrorStatus("unable to retreive the resource set"), "Collaboratibe error");
-			return null;
-		}
-		Set<IExtendedURI> uris = new HashSet<IExtendedURI>();
-		for(Resource r : resourceSet.getResources()) {
-			IFile file = WorkspaceSynchronizer.getFile(r);
-			if(file != null && file.exists()) {
-				uris.add(new ExtendedURI(r.getURI()));
-			}
-		}
-		IStatus status = doRevert(uris, resourceSet);
-		if(!status.isOK() && status.getCode() == Status.ERROR) {
-			UIUtils.errorDialog(status, "Error");
-		}
-
-		return null;
-
-	}
-
-	/**
-	 * Do revert action
-	 * 
-	 * @param uris
-	 *        the uris about to be reverted
-	 * @param resourceSet
-	 *        the resource set
-	 * @return the {@link IStatus} of the operation
-	 * @throws CollabException
-	 *         the collab exception
-	 */
-	public static IStatus doRevert(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-
-		IReverter reverter = ICollaborativeManager.INSTANCE.getReverter(uris, resourceSet);
-		if(reverter == null) {
-			CollabStatus errorStatus = CollabStatus.createErrorStatus("Unable to find a reverter");
-			return errorStatus;
-		}
-
-		Set<IExtendedURI> toBeCommitted = reverter.getExtendedSet();
-		IStatus status = doRevertFromBuilder(resourceSet, reverter, toBeCommitted);
-		return status;
-
-	}
-
-	/**
-	 * Do revert using an existing {@link IReverter}s
-	 * 
-	 * @param resourceSet
-	 *        the resource set
-	 * @param reverter
-	 *        the reverter
-	 * @param toBeReverted
-	 *        the {@link IExtendedURI} about to be reverted
-	 * @return the {@link IStatus} of the operation
-	 * @throws CollabException
-	 *         the collab exception
-	 */
-	public static IStatus doRevertFromBuilder(ResourceSet resourceSet, IReverter reverter, Set<IExtendedURI> toBeReverted) {
-		ExtensivePartitionNameLabelProvider labelProvider = new ExtensivePartitionNameLabelProvider(new MatchingURIObject(toBeReverted),UIUtils.getModelExplorerLavelProvider());
-		labelProvider.setColor(ICollabColors.REVERT_COLLOR);
-		PreviewDialog revertDialog = new PreviewDialog(Display.getDefault().getActiveShell(), labelProvider, "Revert Dialog", "Element in yellow will be reverted");
-		Collection<EObject> objectsToReveal = UIUtils.getLeafSemanticElement(toBeReverted, resourceSet);
-		if(objectsToReveal != null && !objectsToReveal.isEmpty()) {
-			revertDialog.setObjectsToReveal(objectsToReveal);
-		}
-		if(revertDialog.open() == PreviewDialog.OK) {
-
-			//Keep lock force to true. This shall be improve later
-			IStatus commitStatus = reverter.revert();
-			UIUtils.refreshModelExplorer(toBeReverted, resourceSet);
-			UIUtils.reloadEditor();
-			return commitStatus;
-		} else {
-			return Status.CANCEL_STATUS;
-		}
-	}
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;

+

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Set;

+

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

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

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

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

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

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

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

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

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;

+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;

+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;

+import org.eclipse.swt.widgets.Display;

+

+

+// TODO: Auto-generated Javadoc

+/**

+ * Handler use for Revert action

+ * The revert action will be performe on all the current model.

+ * 

+ * @author adaussy

+ */

+public class RevertHandler extends AbstractCollabHandler {

+

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		//Check that everything is commit

+		if(!UIUtils.saveAllDirtyEditor().isOK()) {

+			return null;

+		}

+		ResourceSet resourceSet = getResourceSet();

+		if(resourceSet == null) {

+			UIUtils.errorDialog(CollabStatus.createErrorStatus("unable to retreive the resource set"), "Collaboratibe error");

+			return null;

+		}

+		Set<IExtendedURI> uris = new HashSet<IExtendedURI>();

+		for(Resource r : resourceSet.getResources()) {

+			IFile file = WorkspaceSynchronizer.getFile(r);

+			if(file != null && file.exists()) {

+				uris.add(new ExtendedURI(r.getURI()));

+			}

+		}

+		IStatus status = doRevert(uris, resourceSet);

+		if(!status.isOK() && status.getCode() == Status.ERROR) {

+			UIUtils.errorDialog(status, "Error");

+		}

+

+		return null;

+

+	}

+

+	/**

+	 * Do revert action

+	 * 

+	 * @param uris

+	 *        the uris about to be reverted

+	 * @param resourceSet

+	 *        the resource set

+	 * @return the {@link IStatus} of the operation

+	 * @throws CollabException

+	 *         the collab exception

+	 */

+	public static IStatus doRevert(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+

+		IReverter reverter = ICollaborativeManager.INSTANCE.getReverter(uris, resourceSet);

+		if(reverter == null) {

+			CollabStatus errorStatus = CollabStatus.createErrorStatus("Unable to find a reverter");

+			return errorStatus;

+		}

+

+		Set<IExtendedURI> toBeCommitted = reverter.getExtendedSet();

+		IStatus status = doRevertFromBuilder(resourceSet, reverter, toBeCommitted);

+		return status;

+

+	}

+

+	/**

+	 * Do revert using an existing {@link IReverter}s

+	 * 

+	 * @param resourceSet

+	 *        the resource set

+	 * @param reverter

+	 *        the reverter

+	 * @param toBeReverted

+	 *        the {@link IExtendedURI} about to be reverted

+	 * @return the {@link IStatus} of the operation

+	 * @throws CollabException

+	 *         the collab exception

+	 */

+	public static IStatus doRevertFromBuilder(ResourceSet resourceSet, IReverter reverter, Set<IExtendedURI> toBeReverted) {

+		ExtensivePartitionNameLabelProvider labelProvider = new ExtensivePartitionNameLabelProvider(new MatchingURIObject(toBeReverted),UIUtils.getModelExplorerLavelProvider());

+		labelProvider.setColor(ICollabColors.REVERT_COLLOR);

+		PreviewDialog revertDialog = new PreviewDialog(Display.getDefault().getActiveShell(), labelProvider, "Revert Dialog", "Element in yellow will be reverted");

+		Collection<EObject> objectsToReveal = UIUtils.getLeafSemanticElement(toBeReverted, resourceSet);

+		if(objectsToReveal != null && !objectsToReveal.isEmpty()) {

+			revertDialog.setObjectsToReveal(objectsToReveal);

+		}

+		if(revertDialog.open() == PreviewDialog.OK) {

+

+			//Keep lock force to true. This shall be improve later

+			IStatus commitStatus = reverter.revert();

+			UIUtils.refreshModelExplorer(toBeReverted, resourceSet);

+			UIUtils.reloadEditor();

+			return commitStatus;

+		} else {

+			return Status.CANCEL_STATUS;

+		}

+	}

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UnlockAction.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UnlockAction.java
index 3fddcafc200..44eaa08ea6d 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UnlockAction.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UnlockAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;
 
 import java.util.Collection;
 import java.util.Set;
@@ -19,18 +19,18 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy.Descriptor;
+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;
+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy.Descriptor;
+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;
+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;
+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;
 import org.eclipse.swt.widgets.Display;
 
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UpdateHandler.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UpdateHandler.java
index 71639d37949..66d2a7ace19 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/actions/UpdateHandler.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/actions/UpdateHandler.java
@@ -1,122 +1,121 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.team.collaborative.ExtendedURI;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.MatchingURIObject;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.ICollabColors;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers.ExtensivePartitionNameLabelProvider;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * Handler for Update action in Papyrus
- * The update will be performed in all the current model
- */
-public class UpdateHandler extends AbstractCollabHandler {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		if(!UIUtils.saveAllDirtyEditor().isOK()) {
-			return null;
-		}
-		ResourceSet resourceSet = getResourceSet();
-		if(resourceSet == null) {
-			UIUtils.errorDialog(CollabStatus.createErrorStatus("unable to retreive the resource set"), "Collaboratibe error");
-			return null;
-		}
-		Set<IExtendedURI> uris = new HashSet<IExtendedURI>();
-		for(Resource r : resourceSet.getResources()) {
-			IFile file = WorkspaceSynchronizer.getFile(r);
-			if(file != null && file.exists()) {
-				uris.add(new ExtendedURI(r.getURI()));
-			}
-		}
-		IStatus status = doUpdate(uris, resourceSet, true);
-		if(!status.isOK()) {
-			UIUtils.errorDialog(status, "Error");
-		}
-		return null;
-
-	}
-
-	/**
-	 * Do update action
-	 * 
-	 * @param uris
-	 *        the {@link IExtendedURI} to update
-	 * @param resourceSet
-	 *        the resource set
-	 * @throws CollabException
-	 *         the collab exception
-	 */
-	public static IStatus doUpdate(Set<IExtendedURI> uris, ResourceSet resourceSet, boolean preview) {
-		IUpdater updater = ICollaborativeManager.INSTANCE.getUpdater(uris, resourceSet);
-		if(updater == null) {
-			return CollabStatus.createErrorStatus("Unable to find an Updater for: \n" + uris);
-		}
-		return doUpdateFromUpdater(resourceSet, updater, preview);
-
-	}
-
-	public static IStatus doUpdateFromUpdater(ResourceSet resourceSet, IUpdater updater, boolean preview) {
-		Set<IExtendedURI> toUpdate = updater.getExtendedSet();
-		if(!toUpdate.isEmpty()) {
-			if(preview) {
-				ExtensivePartitionNameLabelProvider labelProvider = new ExtensivePartitionNameLabelProvider(new MatchingURIObject(toUpdate),UIUtils.getModelExplorerLavelProvider());
-				labelProvider.setColor(ICollabColors.UPDATE_COLLOR);
-				PreviewDialog previewDialog = new PreviewDialog(Display.getDefault().getActiveShell(), labelProvider, "Update Preview", "Element in light green will be updated");
-				Collection<EObject> objectsToReveal = UIUtils.getLeafSemanticElement(toUpdate, resourceSet);
-				if(objectsToReveal != null && !objectsToReveal.isEmpty()) {
-					previewDialog.setObjectsToReveal(objectsToReveal);
-				}
-				if(previewDialog.open() != PreviewDialog.OK) {
-					return CollabStatus.createErrorStatus("Canceled by user");
-				}
-			}
-			IStatus updateStatus = updater.update();
-			UIUtils.reloadEditor();
-			return updateStatus;
-		} else {
-			MessageDialog.openInformation(Display.getDefault().getActiveShell(), "Nothing to do", "Nothing to update");
-			return Status.OK_STATUS;
-		}
-	}
-
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.actions;

+

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Set;

+

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

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

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

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

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

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

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

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

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.papyrus.team.collaborative.core.ExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;

+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;

+import org.eclipse.papyrus.team.collaborative.strategy.MatchingURIObject;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.ICollabColors;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs.PreviewDialog;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.providers.ExtensivePartitionNameLabelProvider;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;

+import org.eclipse.swt.widgets.Display;

+

+

+/**

+ * Handler for Update action in Papyrus

+ * The update will be performed in all the current model

+ */

+public class UpdateHandler extends AbstractCollabHandler {

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		if(!UIUtils.saveAllDirtyEditor().isOK()) {

+			return null;

+		}

+		ResourceSet resourceSet = getResourceSet();

+		if(resourceSet == null) {

+			UIUtils.errorDialog(CollabStatus.createErrorStatus("unable to retreive the resource set"), "Collaboratibe error");

+			return null;

+		}

+		Set<IExtendedURI> uris = new HashSet<IExtendedURI>();

+		for(Resource r : resourceSet.getResources()) {

+			IFile file = WorkspaceSynchronizer.getFile(r);

+			if(file != null && file.exists()) {

+				uris.add(new ExtendedURI(r.getURI()));

+			}

+		}

+		IStatus status = doUpdate(uris, resourceSet, true);

+		if(!status.isOK()) {

+			UIUtils.errorDialog(status, "Error");

+		}

+		return null;

+

+	}

+

+	/**

+	 * Do update action

+	 * 

+	 * @param uris

+	 *        the {@link IExtendedURI} to update

+	 * @param resourceSet

+	 *        the resource set

+	 * @throws CollabException

+	 *         the collab exception

+	 */

+	public static IStatus doUpdate(Set<IExtendedURI> uris, ResourceSet resourceSet, boolean preview) {

+		IUpdater updater = ICollaborativeManager.INSTANCE.getUpdater(uris, resourceSet);

+		if(updater == null) {

+			return CollabStatus.createErrorStatus("Unable to find an Updater for: \n" + uris);

+		}

+		return doUpdateFromUpdater(resourceSet, updater, preview);

+

+	}

+

+	public static IStatus doUpdateFromUpdater(ResourceSet resourceSet, IUpdater updater, boolean preview) {

+		Set<IExtendedURI> toUpdate = updater.getExtendedSet();

+		if(!toUpdate.isEmpty()) {

+			if(preview) {

+				ExtensivePartitionNameLabelProvider labelProvider = new ExtensivePartitionNameLabelProvider(new MatchingURIObject(toUpdate),UIUtils.getModelExplorerLavelProvider());

+				labelProvider.setColor(ICollabColors.UPDATE_COLLOR);

+				PreviewDialog previewDialog = new PreviewDialog(Display.getDefault().getActiveShell(), labelProvider, "Update Preview", "Element in light green will be updated");

+				Collection<EObject> objectsToReveal = UIUtils.getLeafSemanticElement(toUpdate, resourceSet);

+				if(objectsToReveal != null && !objectsToReveal.isEmpty()) {

+					previewDialog.setObjectsToReveal(objectsToReveal);

+				}

+				if(previewDialog.open() != PreviewDialog.OK) {

+					return CollabStatus.createErrorStatus("Canceled by user");

+				}

+			}

+			IStatus updateStatus = updater.update();

+			UIUtils.reloadEditor();

+			return updateStatus;

+		} else {

+			MessageDialog.openInformation(Display.getDefault().getActiveShell(), "Nothing to do", "Nothing to update");

+			return Status.OK_STATUS;

+		}

+	}

+

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/CommitDialog.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/CommitDialog.java
index 3f9a5d09e35..5c2233e9a94 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/CommitDialog.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/CommitDialog.java
@@ -1,135 +1,134 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * Dialog used to gather inforamtion before commit
- */
-public class CommitDialog extends PreviewDialog {
-
-	/** The toolkit. */
-	private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
-
-	/** The message value text. */
-	private Text messageValueText;
-
-	/**
-	 * Instantiates a new commit dialog.
-	 * 
-	 * @param parentShell
-	 *        the parent shell
-	 * @param labelProvider
-	 *        the label provider
-	 * @param title
-	 *        the title
-	 * @param message
-	 *        the message
-	 */
-	public CommitDialog(Shell parentShell, ILabelProvider labelProvider, String title, String message) {
-		super(parentShell, labelProvider, title, message);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs.PreviewDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Control result = super.createDialogArea(parent);
-		commitComposite((Composite)result, SWT.BORDER);
-		return result;
-
-	}
-
-	/** The message. */
-	protected String message = "";
-
-	/** The keep lock. */
-	protected boolean keepLock = false;
-
-	/**
-	 * Commit composite.
-	 * 
-	 * @param parent
-	 *        the parent
-	 * @param style
-	 *        the style
-	 * @return the composite
-	 */
-	public Composite commitComposite(Composite parent, int style) {
-		Composite commitComposite = new Composite(parent, style);
-		commitComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		toolkit.adapt(commitComposite);
-		toolkit.paintBordersFor(commitComposite);
-		commitComposite.setLayout(new GridLayout(1, false));
-
-		Label lblMessage = new Label(commitComposite, SWT.NONE);
-		toolkit.adapt(lblMessage, true, true);
-		lblMessage.setText("Message:");
-
-		messageValueText = new Text(commitComposite, SWT.BORDER);
-		messageValueText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		messageValueText.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				message = messageValueText.getMessage();
-
-			}
-		});
-		toolkit.adapt(messageValueText, true, true);
-
-		Composite composite = new Composite(commitComposite, SWT.NONE);
-		toolkit.adapt(composite);
-		toolkit.paintBordersFor(composite);
-		composite.setLayout(new GridLayout(1, false));
-		return commitComposite;
-	}
-
-
-	/**
-	 * Gets the commit message.
-	 * 
-	 * @return the commit message
-	 */
-	public String getCommitMessage() {
-		return message;
-	}
-
-
-	/**
-	 * Checks if is keep lock.
-	 * 
-	 * @return true, if is keep lock
-	 */
-	public boolean isKeepLock() {
-		return keepLock;
-	}
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs;

+

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

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.ModifyEvent;

+import org.eclipse.swt.events.ModifyListener;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

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

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Text;

+import org.eclipse.ui.forms.widgets.FormToolkit;

+

+

+/**

+ * Dialog used to gather inforamtion before commit

+ */

+public class CommitDialog extends PreviewDialog {

+

+	/** The toolkit. */

+	private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());

+

+	/** The message value text. */

+	private Text messageValueText;

+

+	/**

+	 * Instantiates a new commit dialog.

+	 * 

+	 * @param parentShell

+	 *        the parent shell

+	 * @param labelProvider

+	 *        the label provider

+	 * @param title

+	 *        the title

+	 * @param message

+	 *        the message

+	 */

+	public CommitDialog(Shell parentShell, ILabelProvider labelProvider, String title, String message) {

+		super(parentShell, labelProvider, title, message);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.integration.papyrus.ui.dialogs.PreviewDialog#createDialogArea(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		Control result = super.createDialogArea(parent);

+		commitComposite((Composite)result, SWT.BORDER);

+		return result;

+

+	}

+

+	/** The message. */

+	protected String message = "";

+

+	/** The keep lock. */

+	protected boolean keepLock = false;

+

+	/**

+	 * Commit composite.

+	 * 

+	 * @param parent

+	 *        the parent

+	 * @param style

+	 *        the style

+	 * @return the composite

+	 */

+	public Composite commitComposite(Composite parent, int style) {

+		Composite commitComposite = new Composite(parent, style);

+		commitComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

+		toolkit.adapt(commitComposite);

+		toolkit.paintBordersFor(commitComposite);

+		commitComposite.setLayout(new GridLayout(1, false));

+

+		Label lblMessage = new Label(commitComposite, SWT.NONE);

+		toolkit.adapt(lblMessage, true, true);

+		lblMessage.setText("Message:");

+

+		messageValueText = new Text(commitComposite, SWT.BORDER);

+		messageValueText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

+		messageValueText.addModifyListener(new ModifyListener() {

+

+			public void modifyText(ModifyEvent e) {

+				message = messageValueText.getMessage();

+

+			}

+		});

+		toolkit.adapt(messageValueText, true, true);

+

+		Composite composite = new Composite(commitComposite, SWT.NONE);

+		toolkit.adapt(composite);

+		toolkit.paintBordersFor(composite);

+		composite.setLayout(new GridLayout(1, false));

+		return commitComposite;

+	}

+

+

+	/**

+	 * Gets the commit message.

+	 * 

+	 * @return the commit message

+	 */

+	public String getCommitMessage() {

+		return message;

+	}

+

+

+	/**

+	 * Checks if is keep lock.

+	 * 

+	 * @return true, if is keep lock

+	 */

+	public boolean isKeepLock() {

+		return keepLock;

+	}

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/PreviewDialog.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/PreviewDialog.java
index 2e1b3f83f08..66c130333a6 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/dialogs/PreviewDialog.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/dialogs/PreviewDialog.java
@@ -1,270 +1,279 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.dialogs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.emf.providers.MoDiscoContentProvider;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
-import org.eclipse.papyrus.views.modelexplorer.CustomCommonViewer;
-import org.eclipse.papyrus.views.modelexplorer.matching.IMatchingItem;
-import org.eclipse.papyrus.views.modelexplorer.matching.ModelElementItemMatchingItem;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-
-/**
- * The Class PreviewDialog.
- * The preview dialog is a generic dialog use to display feedback to the user using specific {@link ILabelProvider}
- */
-public class PreviewDialog extends TitleAreaDialog {
-
-
-	/** The title. */
-	private String title;
-
-	/** The message. */
-	private String message;
-
-	/** The label provider. */
-	private ILabelProvider labelProvider;
-
-	/** The tree viewer. */
-	private TreeViewer treeViewer;
-
-	/** The objects to reveal. */
-	private Collection<EObject> objectsToReveal;
-
-
-
-	/**
-	 * Sets the objects to reveal.
-	 * 
-	 * @param objectToReveal
-	 *        the new objects to reveal
-	 */
-	public void setObjectsToReveal(Collection<EObject> objectToReveal) {
-		this.objectsToReveal = objectToReveal;
-	}
-
-	/**
-	 * Create contents of the dialog.
-	 * 
-	 * @param parent
-	 *        the parent
-	 * @return the control
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		setMessage(message);
-		setTitle(title);
-		Composite area = (Composite)super.createDialogArea(parent);
-		Composite container = new Composite(area, SWT.NONE);
-		container.setLayout(new FillLayout(SWT.HORIZONTAL));
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		treeViewer = new CustomCommonViewer("org.eclipse.papyrus.modelexplorer.modelexplorer", container, SWT.BORDER);
-		treeViewer.setContentProvider(new MoDiscoContentProvider() {
-
-			@Override
-			protected EObject[] getRootElements(ModelSet modelSet) {
-				UmlModel umlModel = (UmlUtils.getUmlModel(modelSet));
-
-				if(umlModel == null)
-					return null;
-
-				EList<EObject> contents = umlModel.getResource().getContents();
-				ArrayList<EObject> result = new ArrayList<EObject>();
-				Iterator<EObject> iterator = contents.iterator();
-				while(iterator.hasNext()) {
-					EObject eObject = (EObject)iterator.next();
-					//Shall be improved
-					if(eObject.eClass().getEPackage().getNsURI().contains("uml")) {
-						result.add(eObject);
-					}
-				}
-				return result.toArray(new EObject[result.size()]);
-			}
-
-			@Override
-			public Object[] getChildren(Object parentElement) {
-				//Remove duplicate
-				Object[] superChildren = super.getChildren(parentElement);
-
-				List<Object> result = new ArrayList<Object>();
-				for(int i = 0; i < superChildren.length; i++) {
-					Object c = superChildren[i];
-					if(!result.contains(c)) {
-						result.add(c);
-					}
-				}
-				return result.toArray(new Object[result.size()]);
-			}
-		});
-		treeViewer.setLabelProvider(labelProvider);
-		treeViewer.setInput(((CoreMultiDiagramEditor)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getServicesRegistry());
-		if(objectsToReveal != null) {
-			reveal(objectsToReveal);
-		}
-		return area;
-	}
-
-	/**
-	 * Create contents of the button bar.
-	 * 
-	 * @param parent
-	 *        the parent
-	 */
-	@Override
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	/**
-	 * Return the initial size of the dialog.
-	 * 
-	 * @return the initial size
-	 */
-	@Override
-	protected Point getInitialSize() {
-		return new Point(600, 600);
-	}
-
-	/**
-	 * Create the dialog.
-	 * 
-	 * @param parentShell
-	 *        the parent shell
-	 * @param labelProvider
-	 *        the label provider
-	 * @param title
-	 *        the title
-	 * @param message
-	 *        the message
-	 */
-	public PreviewDialog(Shell parentShell, ILabelProvider labelProvider, String title, String message) {
-		super(parentShell);
-		setShellStyle(SWT.SHELL_TRIM);
-		setHelpAvailable(false);
-		this.title = title;
-		this.message = message;
-		this.labelProvider = labelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#open()
-	 */
-	@Override
-	public int open() {
-		int result = super.open();
-		return result;
-	}
-
-
-
-	/**
-	 * Reveal.
-	 * 
-	 * @param elementList
-	 *        the element list
-	 */
-	public void reveal(Iterable<?> elementList) {
-		ArrayList<IMatchingItem> matchingItemsToSelect = new ArrayList<IMatchingItem>();
-		// filter out non EMF objects
-		Iterable<EObject> list = Iterables.transform(Iterables.filter(elementList, EObject.class), new Function<Object, EObject>() {
-
-			public EObject apply(Object from) {
-				return (EObject)from;
-			}
-		});
-
-		for(EObject currentEObject : list) {
-			//TODO The custom ModelExplorer Revealer feature has not yet been backported. 
-			//See bug 426360. For now, we only reveal the given EObjects.
-			//EObject itemToSelect = ModelExplorerRevealerManager.getTargetObjectToRegveal(currentEObject);
-			matchingItemsToSelect.add(new ModelElementItemMatchingItem(currentEObject));
-
-			// Does the content provider exist?
-			// if(treeViewer.getContentProvider() != null) {
-
-			/*
-			 * reveal the ancestors tree using expandToLevel on each of them
-			 * in the good order. This is a lot faster than going through the whole tree
-			 * using getChildren of the ContentProvider since our Viewer uses a Hashtable
-			 * to keep track of the revealed elements.
-			 * 
-			 * However we need to use a dedicated MatchingItem to do the matching,
-			 * and a specific comparer in our viewer so than the equals of MatchingItem is
-			 * used in priority.
-			 * 
-			 * Please refer to MatchingItem for more infos.
-			 */
-			//for(IMatchingItem item : ModelExplorerRevealerManager.getChainToReveal(itemToSelect)) {
-			//	treeViewer.expandToLevel(item, 1);
-			//}
-			//}
-		}
-		treeViewer.expandToLevel(new StructuredSelection(matchingItemsToSelect), TreeViewer.ALL_LEVELS);
-	}
-
-	/**
-	 * Select reveal.
-	 * 
-	 * @param selection
-	 *        the selection
-	 */
-	public void selectReveal(ISelection selection) {
-		if(treeViewer != null) {
-			treeViewer.setSelection(selection, true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)
-	 */
-	/**
-	 * Reveal semantic element.
-	 * 
-	 * @param elementList
-	 *        the element list
-	 */
-	public void revealSemanticElement(List<?> elementList) {
-		reveal(elementList);
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.dialogs;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

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

+import org.eclipse.jface.dialogs.IDialogConstants;

+import org.eclipse.jface.dialogs.TitleAreaDialog;

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

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

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

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

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

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForWorkbenchPage;

+import org.eclipse.papyrus.uml.tools.providers.SemanticUMLContentProvider;

+import org.eclipse.papyrus.views.modelexplorer.CustomCommonViewer;

+import org.eclipse.papyrus.views.modelexplorer.matching.IMatchingItem;

+import org.eclipse.papyrus.views.modelexplorer.matching.ModelElementItemMatchingItem;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Point;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.layout.GridData;

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

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PlatformUI;

+

+import com.google.common.base.Function;

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

+

+

+/**

+ * The Class PreviewDialog.

+ * The preview dialog is a generic dialog use to display feedback to the user using specific {@link ILabelProvider}

+ */

+public class PreviewDialog extends TitleAreaDialog {

+

+

+	/** The title. */

+	private String title;

+

+	/** The message. */

+	private String message;

+

+	/** The label provider. */

+	private ILabelProvider labelProvider;

+

+	/** The tree viewer. */

+	private TreeViewer treeViewer;

+

+	/** The objects to reveal. */

+	private Collection<EObject> objectsToReveal;

+

+

+

+	/**

+	 * Sets the objects to reveal.

+	 * 

+	 * @param objectToReveal

+	 *        the new objects to reveal

+	 */

+	public void setObjectsToReveal(Collection<EObject> objectToReveal) {

+		this.objectsToReveal = objectToReveal;

+	}

+

+	/**

+	 * Create contents of the dialog.

+	 * 

+	 * @param parent

+	 *        the parent

+	 * @return the control

+	 */

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		setMessage(message);

+		setTitle(title);

+		Composite area = (Composite)super.createDialogArea(parent);

+		Composite container = new Composite(area, SWT.NONE);

+		container.setLayout(new FillLayout(SWT.HORIZONTAL));

+		container.setLayoutData(new GridData(GridData.FILL_BOTH));

+		treeViewer = new CustomCommonViewer("org.eclipse.papyrus.modelexplorer.modelexplorer", container, SWT.BORDER);

+		treeViewer.setContentProvider(new SemanticUMLContentProvider() {

+

+//			@Override

+//			protected static EObject[] getRoots(ResourceSet root) {

+//				if(root instanceof ModelSet) {

+//					ModelSet modelSet = (ModelSet)root;

+//					UmlModel umlModel = (UmlUtils.getUmlModel(modelSet));

+//					

+//					if(umlModel == null)

+//						return null;

+//					

+//					EList<EObject> contents = umlModel.getResource().getContents();

+//					ArrayList<EObject> result = new ArrayList<EObject>();

+//					Iterator<EObject> iterator = contents.iterator();

+//					while(iterator.hasNext()) {

+//						EObject eObject = (EObject)iterator.next();

+//						//Shall be improved

+//						if(eObject.eClass().getEPackage().getNsURI().contains("uml")) {

+//							result.add(eObject);

+//						}

+//					}

+//				}

+//				return result.toArray(new EObject[result.size()]);

+//			}

+

+			@Override

+			public Object[] getChildren(Object parentElement) {

+				//Remove duplicate

+				Object[] superChildren = super.getChildren(parentElement);

+

+				List<Object> result = new ArrayList<Object>();

+				for(int i = 0; i < superChildren.length; i++) {

+					Object c = superChildren[i];

+					if(!result.contains(c)) {

+						result.add(c);

+					}

+				}

+				return result.toArray(new Object[result.size()]);

+			}

+		});

+		treeViewer.setLabelProvider(labelProvider);

+

+		try {

+			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

+			ServicesRegistry serviceRegistry = ServiceUtilsForWorkbenchPage.getInstance().getServiceRegistry(activePage);

+			treeViewer.setInput(serviceRegistry);

+			if(objectsToReveal != null) {

+				reveal(objectsToReveal);

+			}

+		} catch (ServiceException e) {

+			e.printStackTrace();

+		}

+

+		return area;

+	}

+

+	/**

+	 * Create contents of the button bar.

+	 * 

+	 * @param parent

+	 *        the parent

+	 */

+	@Override

+	protected void createButtonsForButtonBar(Composite parent) {

+		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);

+		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);

+	}

+

+	/**

+	 * Return the initial size of the dialog.

+	 * 

+	 * @return the initial size

+	 */

+	@Override

+	protected Point getInitialSize() {

+		return new Point(600, 600);

+	}

+

+	/**

+	 * Create the dialog.

+	 * 

+	 * @param parentShell

+	 *        the parent shell

+	 * @param labelProvider

+	 *        the label provider

+	 * @param title

+	 *        the title

+	 * @param message

+	 *        the message

+	 */

+	public PreviewDialog(Shell parentShell, ILabelProvider labelProvider, String title, String message) {

+		super(parentShell);

+		setShellStyle(SWT.SHELL_TRIM);

+		setHelpAvailable(false);

+		this.title = title;

+		this.message = message;

+		this.labelProvider = labelProvider;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.jface.window.Window#open()

+	 */

+	@Override

+	public int open() {

+		int result = super.open();

+		return result;

+	}

+

+

+

+	/**

+	 * Reveal.

+	 * 

+	 * @param elementList

+	 *        the element list

+	 */

+	public void reveal(Iterable<?> elementList) {

+		ArrayList<IMatchingItem> matchingItemsToSelect = new ArrayList<IMatchingItem>();

+		// filter out non EMF objects

+		Iterable<EObject> list = Iterables.transform(Iterables.filter(elementList, EObject.class), new Function<Object, EObject>() {

+

+			public EObject apply(Object from) {

+				return (EObject)from;

+			}

+		});

+

+		for(EObject currentEObject : list) {

+			//TODO The custom ModelExplorer Revealer feature has not yet been backported. 

+			//See bug 426360. For now, we only reveal the given EObjects.

+			//EObject itemToSelect = ModelExplorerRevealerManager.getTargetObjectToRegveal(currentEObject);

+			matchingItemsToSelect.add(new ModelElementItemMatchingItem(currentEObject));

+

+			// Does the content provider exist?

+			// if(treeViewer.getContentProvider() != null) {

+

+			/*

+			 * reveal the ancestors tree using expandToLevel on each of them

+			 * in the good order. This is a lot faster than going through the whole tree

+			 * using getChildren of the ContentProvider since our Viewer uses a Hashtable

+			 * to keep track of the revealed elements.

+			 * 

+			 * However we need to use a dedicated MatchingItem to do the matching,

+			 * and a specific comparer in our viewer so than the equals of MatchingItem is

+			 * used in priority.

+			 * 

+			 * Please refer to MatchingItem for more infos.

+			 */

+			//for(IMatchingItem item : ModelExplorerRevealerManager.getChainToReveal(itemToSelect)) {

+			//	treeViewer.expandToLevel(item, 1);

+			//}

+			//}

+		}

+		treeViewer.expandToLevel(new StructuredSelection(matchingItemsToSelect), TreeViewer.ALL_LEVELS);

+	}

+

+	/**

+	 * Select reveal.

+	 * 

+	 * @param selection

+	 *        the selection

+	 */

+	public void selectReveal(ISelection selection) {

+		if(treeViewer != null) {

+			treeViewer.setSelection(selection, true);

+		}

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)

+	 */

+	/**

+	 * Reveal semantic element.

+	 * 

+	 * @param elementList

+	 *        the element list

+	 */

+	public void revealSemanticElement(List<?> elementList) {

+		reveal(elementList);

+	}

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/LockStrategyItemProvider.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/LockStrategyItemProvider.java
index b1b023a5777..5fbce1747e7 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/LockStrategyItemProvider.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/LockStrategyItemProvider.java
@@ -1,74 +1,73 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.LockAction;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-
-
-/**
- * Item provider which fill the menu with all lock strategy.
- * 
- * @author adaussy
- */
-public class LockStrategyItemProvider extends org.eclipse.ui.actions.CompoundContributionItem {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()
-	 */
-	@Override
-	protected IContributionItem[] getContributionItems() {
-		if(isEnabled()) {
-			Collection<ActionContributionItem> contribution = Collections2.transform(ICollaborativeManager.INSTANCE.getStrategies().values(), new Function<ILockingStrategy.Descriptor, ActionContributionItem>() {
-
-				@Override
-				public ActionContributionItem apply(final ILockingStrategy.Descriptor from) {
-
-					Action action = new LockAction(from);
-					ActionContributionItem actionContributionItem = new ActionContributionItem(action);
-					return actionContributionItem;
-				}
-			});
-			return contribution.toArray(new IContributionItem[contribution.size()]);
-		}
-
-		return new IContributionItem[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.ContributionItem#isEnabled()
-	 */
-	public boolean isEnabled() {
-		EObject firstSelection = UIUtils.getFirstSelection();
-		if(firstSelection != null) {
-			return CollabUtils.isCollab(firstSelection);
-		}
-		return false;
-	}
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.items;

+

+import java.util.Collection;

+

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

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.ActionContributionItem;

+import org.eclipse.jface.action.IContributionItem;

+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.LockAction;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;

+

+import com.google.common.base.Function;

+import com.google.common.collect.Collections2;

+

+

+/**

+ * Item provider which fill the menu with all lock strategy.

+ * 

+ * @author adaussy

+ */

+public class LockStrategyItemProvider extends org.eclipse.ui.actions.CompoundContributionItem {

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()

+	 */

+	@Override

+	protected IContributionItem[] getContributionItems() {

+		if(isEnabled()) {

+			Collection<ActionContributionItem> contribution = Collections2.transform(ICollaborativeManager.INSTANCE.getStrategies().values(), new Function<ILockingStrategy.Descriptor, ActionContributionItem>() {

+

+				public ActionContributionItem apply(final ILockingStrategy.Descriptor from) {

+

+					Action action = new LockAction(from);

+					ActionContributionItem actionContributionItem = new ActionContributionItem(action);

+					return actionContributionItem;

+				}

+			});

+			return contribution.toArray(new IContributionItem[contribution.size()]);

+		}

+

+		return new IContributionItem[0];

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.jface.action.ContributionItem#isEnabled()

+	 */

+	public boolean isEnabled() {

+		EObject firstSelection = UIUtils.getFirstSelection();

+		if(firstSelection != null) {

+			return CollabUtils.isCollab(firstSelection);

+		}

+		return false;

+	}

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/UnlockStrategyItemProvider.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/UnlockStrategyItemProvider.java
index e34e72188c6..7facfd2584d 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/items/UnlockStrategyItemProvider.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/items/UnlockStrategyItemProvider.java
@@ -1,73 +1,72 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.items;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.papyrus.team.collaborative.ICollaborativeManager;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.actions.UnlockAction;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.utils.UIUtils;
-import org.eclipse.papyrus.team.collaborative.strategy.ILockingStrategy;
-import org.eclipse.papyrus.team.collaborative.utils.CollabUtils;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-
-
-/**
- * Item provider which fill the menu with all unlock strategy.
- */
-public class UnlockStrategyItemProvider extends org.eclipse.ui.actions.CompoundContributionItem {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()
-	 */
-	@Override
-	protected IContributionItem[] getContributionItems() {
-		if(isEnabled()) {
-			Collection<ActionContributionItem> contribution = Collections2.transform(ICollaborativeManager.INSTANCE.getStrategies().values(), new Function<ILockingStrategy.Descriptor, ActionContributionItem>() {
-
-				@Override
-				public ActionContributionItem apply(final ILockingStrategy.Descriptor from) {
-
-					Action action = new UnlockAction(from);
-					ActionContributionItem actionContributionItem = new ActionContributionItem(action);
-					return actionContributionItem;
-				}
-			});
-
-
-			return contribution.toArray(new IContributionItem[contribution.size()]);
-		}
-
-		return new IContributionItem[0];
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.ContributionItem#isEnabled()
-	 */
-	public boolean isEnabled() {
-		EObject firstSelection = UIUtils.getFirstSelection();
-		if(firstSelection != null) {
-			return CollabUtils.isCollab(firstSelection);
-		}
-		return false;
-	}
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.items;

+

+import java.util.Collection;

+

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

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.ActionContributionItem;

+import org.eclipse.jface.action.IContributionItem;

+import org.eclipse.papyrus.team.collaborative.core.ICollaborativeManager;

+import org.eclipse.papyrus.team.collaborative.core.strategy.ILockingStrategy;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabUtils;

+import org.eclipse.papyrus.team.collaborative.strategy.ui.actions.UnlockAction;

+import org.eclipse.papyrus.team.collaborative.strategy.utils.UIUtils;

+

+import com.google.common.base.Function;

+import com.google.common.collect.Collections2;

+

+

+/**

+ * Item provider which fill the menu with all unlock strategy.

+ */

+public class UnlockStrategyItemProvider extends org.eclipse.ui.actions.CompoundContributionItem {

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()

+	 */

+	@Override

+	protected IContributionItem[] getContributionItems() {

+		if(isEnabled()) {

+			Collection<ActionContributionItem> contribution = Collections2.transform(ICollaborativeManager.INSTANCE.getStrategies().values(), new Function<ILockingStrategy.Descriptor, ActionContributionItem>() {

+

+				public ActionContributionItem apply(final ILockingStrategy.Descriptor from) {

+

+					Action action = new UnlockAction(from);

+					ActionContributionItem actionContributionItem = new ActionContributionItem(action);

+					return actionContributionItem;

+				}

+			});

+

+

+			return contribution.toArray(new IContributionItem[contribution.size()]);

+		}

+

+		return new IContributionItem[0];

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.jface.action.ContributionItem#isEnabled()

+	 */

+	public boolean isEnabled() {

+		EObject firstSelection = UIUtils.getFirstSelection();

+		if(firstSelection != null) {

+			return CollabUtils.isCollab(firstSelection);

+		}

+		return false;

+	}

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/providers/ExtensivePartitionNameLabelProvider.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java
index 7cdbdee3d09..4926945c839 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/ui/providers/ExtensivePartitionNameLabelProvider.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java
@@ -1,226 +1,217 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.ui.providers;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-import com.google.common.base.Predicate;
-
-
-/**
- * The Class ExtensiveLabelProvider. {@link ILabelProvider} that extend the one use by the model explorer view.
- * This label provider can customize label and color of display object using predicate
- */
-public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColorProvider, ILabelProvider {
-
-
-	private ILabelProvider internal;
-
-
-	/** The color. */
-	private Color color;
-
-	/** The font. */
-	private Font font;
-
-	/** The predicate. */
-	private Predicate<EObject> predicate;
-
-	/**
-	 * Instantiates a new extensive label provider.
-	 * 
-	 * @param predicate
-	 *        the predicate
-	 */
-	public ExtensivePartitionNameLabelProvider(Predicate<EObject> predicate, ILabelProvider internal) {
-		super();
-		this.predicate = predicate;
-		this.internal = internal;
-	}
-
-	public ExtensivePartitionNameLabelProvider(ILabelProvider internal) {
-		super();
-		this.predicate = null;
-		this.internal = internal;
-	}
-
-
-	/**
-	 * Sets the color.
-	 * 
-	 * @param color
-	 *        the new color
-	 */
-	public void setColor(Color color) {
-		this.color = color;
-	}
-
-
-	/**
-	 * Sets the font.
-	 * 
-	 * @param font
-	 *        the new font
-	 */
-	public void setFont(Font font) {
-		this.font = font;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.modelexplorer.MoDiscoLabelProvider#getText(java.lang.Object)
-	 */
-	@Override
-	public String getText(Object element) {
-		String superText = internal.getText(element);
-		if(element instanceof ModelElementItem) {
-			ModelElementItem elem = (ModelElementItem)element;
-			EObject eObject = elem.getEObject();
-			if(eObject != null) {
-				String partitionName = getPartitionName(eObject);
-				if(partitionName != null) {
-					StringBuilder stringBuilder = new StringBuilder();
-					stringBuilder.append(partitionName);
-					stringBuilder.append(superText);
-					superText = stringBuilder.toString();
-				}
-			}
-		}
-		return superText;
-	}
-
-	private static final String CLOSING_BRACKET = "] ";
-
-	private static final String OPEN_BRACKET = "[";
-
-
-	/**
-	 * Gets the partition name.
-	 * 
-	 * @param eObject
-	 *        the e object
-	 * @return the partition name
-	 */
-	protected String getPartitionName(EObject eObject) {
-		Resource resource = eObject.eResource();
-		if(resource != null) {
-			URI uri = resource.getURI().trimFileExtension();
-			String partitionName = uri.segment(uri.segmentCount() - 1);
-			StringBuilder builder = new StringBuilder(OPEN_BRACKET);
-			builder.append(partitionName);
-			builder.append(CLOSING_BRACKET);
-			return builder.toString();
-		}
-		return null;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider#getFont(java.lang.Object)
-	 */
-	@SuppressWarnings("restriction")
-	@Override
-	public Font getFont(Object element) {
-		if(predicate != null) {
-			if(element instanceof ModelElementItem) {
-				ModelElementItem eObject = (ModelElementItem)element;
-				if(font != null) {
-					if(predicate.apply(eObject.getEObject())) {
-						return font;
-					}
-				}
-			}
-		}
-		if(internal instanceof IFontProvider) {
-			return ((IFontProvider)internal).getFont(element);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider#getForeground(java.lang.Object)
-	 */
-	@SuppressWarnings("restriction")
-	@Override
-	public Color getForeground(Object element) {
-		if(predicate != null) {
-			if(element instanceof ModelElementItem) {
-				ModelElementItem eObject = (ModelElementItem)element;
-				if(color != null) {
-					if(predicate.apply(eObject.getEObject())) {
-						return color;
-					}
-				}
-			}
-		}
-		if(internal instanceof IColorProvider) {
-			return ((IColorProvider)internal).getForeground(element);
-		}
-		return null;
-	}
-
-
-	@Override
-	public void addListener(ILabelProviderListener listener) {
-		internal.addListener(listener);
-
-	}
-
-
-	@Override
-	public void dispose() {
-		internal.dispose();
-
-	}
-
-
-	@Override
-	public boolean isLabelProperty(Object element, String property) {
-		return internal.isLabelProperty(element, property);
-	}
-
-
-	@Override
-	public void removeListener(ILabelProviderListener listener) {
-		internal.removeListener(listener);
-
-	}
-
-
-	@Override
-	public Image getImage(Object element) {
-		return internal.getImage(element);
-	}
-
-
-	@Override
-	public Color getBackground(Object element) {
-		if(internal instanceof IColorProvider) {
-			return ((IColorProvider)internal).getBackground(element);
-		}
-		return null;
-	}
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.ui.providers;

+

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

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

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

+import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem;

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

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

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

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

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Font;

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

+

+import com.google.common.base.Predicate;

+

+

+/**

+ * The Class ExtensiveLabelProvider. {@link ILabelProvider} that extend the one use by the model explorer view.

+ * This label provider can customize label and color of display object using predicate

+ */

+public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColorProvider, ILabelProvider {

+

+

+	private ILabelProvider internal;

+

+

+	/** The color. */

+	private Color color;

+

+	/** The font. */

+	private Font font;

+

+	/** The predicate. */

+	private Predicate<EObject> predicate;

+

+	/**

+	 * Instantiates a new extensive label provider.

+	 * 

+	 * @param predicate

+	 *        the predicate

+	 */

+	public ExtensivePartitionNameLabelProvider(Predicate<EObject> predicate, ILabelProvider internal) {

+		super();

+		this.predicate = predicate;

+		this.internal = internal;

+	}

+

+	public ExtensivePartitionNameLabelProvider(ILabelProvider internal) {

+		super();

+		this.predicate = null;

+		this.internal = internal;

+	}

+

+

+	/**

+	 * Sets the color.

+	 * 

+	 * @param color

+	 *        the new color

+	 */

+	public void setColor(Color color) {

+		this.color = color;

+	}

+

+

+	/**

+	 * Sets the font.

+	 * 

+	 * @param font

+	 *        the new font

+	 */

+	public void setFont(Font font) {

+		this.font = font;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.modelexplorer.MoDiscoLabelProvider#getText(java.lang.Object)

+	 */

+	public String getText(Object element) {

+		String superText = internal.getText(element);

+		if(element instanceof ModelElementItem) {

+			ModelElementItem elem = (ModelElementItem)element;

+			EObject eObject = elem.getEObject();

+			if(eObject != null) {

+				String partitionName = getPartitionName(eObject);

+				if(partitionName != null) {

+					StringBuilder stringBuilder = new StringBuilder();

+					stringBuilder.append(partitionName);

+					stringBuilder.append(superText);

+					superText = stringBuilder.toString();

+				}

+			}

+		}

+		return superText;

+	}

+

+	private static final String CLOSING_BRACKET = "] ";

+

+	private static final String OPEN_BRACKET = "[";

+

+

+	/**

+	 * Gets the partition name.

+	 * 

+	 * @param eObject

+	 *        the e object

+	 * @return the partition name

+	 */

+	protected String getPartitionName(EObject eObject) {

+		Resource resource = eObject.eResource();

+		if(resource != null) {

+			URI uri = resource.getURI().trimFileExtension();

+			String partitionName = uri.segment(uri.segmentCount() - 1);

+			StringBuilder builder = new StringBuilder(OPEN_BRACKET);

+			builder.append(partitionName);

+			builder.append(CLOSING_BRACKET);

+			return builder.toString();

+		}

+		return null;

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider#getFont(java.lang.Object)

+	 */

+	@SuppressWarnings("restriction")

+	public Font getFont(Object element) {

+		if(predicate != null) {

+			if(element instanceof ModelElementItem) {

+				ModelElementItem eObject = (ModelElementItem)element;

+				if(font != null) {

+					if(predicate.apply(eObject.getEObject())) {

+						return font;

+					}

+				}

+			}

+		}

+		if(internal instanceof IFontProvider) {

+			return ((IFontProvider)internal).getFont(element);

+		}

+		return null;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider#getForeground(java.lang.Object)

+	 */

+	@SuppressWarnings("restriction")

+	public Color getForeground(Object element) {

+		if(predicate != null) {

+			if(element instanceof ModelElementItem) {

+				ModelElementItem eObject = (ModelElementItem)element;

+				if(color != null) {

+					if(predicate.apply(eObject.getEObject())) {

+						return color;

+					}

+				}

+			}

+		}

+		if(internal instanceof IColorProvider) {

+			return ((IColorProvider)internal).getForeground(element);

+		}

+		return null;

+	}

+

+

+	public void addListener(ILabelProviderListener listener) {

+		internal.addListener(listener);

+

+	}

+

+

+	public void dispose() {

+		internal.dispose();

+

+	}

+

+

+	public boolean isLabelProperty(Object element, String property) {

+		return internal.isLabelProperty(element, property);

+	}

+

+

+	public void removeListener(ILabelProviderListener listener) {

+		internal.removeListener(listener);

+

+	}

+

+

+	public Image getImage(Object element) {

+		return internal.getImage(element);

+	}

+

+

+	public Color getBackground(Object element) {

+		if(internal instanceof IColorProvider) {

+			return ((IColorProvider)internal).getBackground(element);

+		}

+		return null;

+	}

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/PapyrusResourceUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/utils/PapyrusResourceUtils.java
index 4da408d4a1a..47ca49beb10 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/PapyrusResourceUtils.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/utils/PapyrusResourceUtils.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.utils;
+package org.eclipse.papyrus.team.collaborative.strategy.utils;
 
 import java.util.Collection;
 
@@ -6,7 +6,7 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
-import org.eclipse.papyrus.team.collaborative.utils.URIUtils;
+import org.eclipse.papyrus.team.collaborative.core.utils.URIUtils;
 import org.eclipse.papyrus.uml.tools.model.UmlModel;
 
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/UIUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/utils/UIUtils.java
index f6c336b90ec..0a0f6593907 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/src/org/eclipse/papyrus/team/collaborative/integration/papyrus/utils/UIUtils.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/utils/UIUtils.java
@@ -1,307 +1,291 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.integration.papyrus.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.gmf.runtime.common.ui.dialogs.SaveAllDirtyEditorsDialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.Activator;
-import org.eclipse.papyrus.team.collaborative.integration.papyrus.RefreshHelper;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
-import org.eclipse.papyrus.team.collaborative.reports.LogHelper;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.papyrus.team.collaborative.utils.ModelsUtil;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-
-
-/**
- * Utility class for User Interface interactions.
- * 
- * @author adaussy
- */
-public class UIUtils {
-
-	/** The resource manager. */
-	public static LocalResourceManager RESOURCE_MANAGER = new LocalResourceManager(JFaceResources.getResources());
-
-	/**
-	 * Save all dirty editor.
-	 * 
-	 * @return the {@link IStatus}
-	 */
-	public static IStatus saveAllDirtyEditor() {
-		//Force save
-		IEditorPart[] dirtyEditors = SaveAllDirtyEditorsDialog.getDirtyEditors();
-		if(dirtyEditors.length > 0) {
-			SaveAllDirtyEditorsDialog dialog = new SaveAllDirtyEditorsDialog(Display.getDefault().getActiveShell());
-			if(dialog.open() == SaveAllDirtyEditorsDialog.CANCEL) {
-				return Status.CANCEL_STATUS;
-			} else {
-				for(int i = 0; i < dirtyEditors.length; i++) {
-					IEditorPart editorI = dirtyEditors[i];
-					editorI.doSave(new NullProgressMonitor());
-				}
-			}
-		}
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * Gets the current resource set.
-	 * 
-	 * @return the current resource set
-	 */
-	public static ResourceSet getCurrentResourceSet() {
-		IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		if(editor instanceof CoreMultiDiagramEditor) {
-			CoreMultiDiagramEditor papyrusEditor = (CoreMultiDiagramEditor)editor;
-			return papyrusEditor.getEditingDomain().getResourceSet();
-		}
-		return null;
-	}
-
-	/**
-	 * Return all the leaf from the semantic meta model
-	 * 
-	 * @param uris
-	 *        Input set for the search of leaf
-	 * @param resourceSet
-	 * @return
-	 */
-	public static Collection<EObject> getLeafSemanticElement(Collection<IExtendedURI> uris, ResourceSet resourceSet) {
-		Collection<IExtendedURI> semanticURIS = Collections2.filter(uris, new Predicate<IExtendedURI>() {
-
-			@Override
-			public boolean apply(IExtendedURI arg0) {
-				return UmlModel.UML_FILE_EXTENSION.equals(arg0.getUri().fileExtension());
-			}
-		});
-		Collection<Collection<EObject>> eObjects = Collections2.transform(semanticURIS, CollabFunctionsFactory.getExtendedURIToEObjects(resourceSet));
-		Set<EObject> semanticElements = new HashSet<EObject>();
-		for(Collection<EObject> eos : eObjects) {
-			semanticElements.addAll(eos);
-		}
-		return ModelsUtil.getRoots(semanticElements);
-	}
-
-	/**
-	 * Gets the first selection from the workbench
-	 * 
-	 * @return the first selection
-	 */
-	public static EObject getFirstSelection() {
-		Collection<EObject> selection = getSelection();
-		if(selection.isEmpty()) {
-			return null;
-		}
-		return selection.iterator().next();
-	}
-
-	/**
-	 * Gets the selection from the workbench
-	 * 
-	 * @return the selection
-	 */
-	public static Collection<EObject> getSelection() {
-		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
-		ISelection selection = selectionService.getSelection();
-		if(selection != null) {
-			if(selection instanceof IStructuredSelection) {
-				List<EObject> result = new ArrayList<EObject>();
-				Iterator<?> ite = ((IStructuredSelection)selection).iterator();
-				while(ite.hasNext()) {
-					Object next = ite.next();
-					EObject eObject = getEObject(next);
-					if(eObject != null) {
-						result.add(eObject);
-					}
-				}
-				return result;
-			}
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * Refresh elements in model explorer view.
-	 * 
-	 * @param uris
-	 *        {@link IExtendedURI} to refresh
-	 * @param resourceSet
-	 *        the resource set
-	 */
-	public static void refreshModelExplorer(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		for(Collection<EObject> objects : Collections2.transform(uris, CollabFunctionsFactory.getExtendedURIToEObjects(resourceSet))) {
-			RefreshHelper.refreshModelExplorer(objects);
-		}
-	}
-
-	/**
-	 * This reload the current editor
-	 * WARNING : BE careful after this action the ancient resourceSet will deprecated you may use getCurrentResourceSet() to retrieve the new one.
-	 */
-	public static void reloadEditor() {
-		Display.getCurrent().syncExec(new Runnable() {
-
-			public void run() {
-				IWorkbench wb = PlatformUI.getWorkbench();
-				IWorkbenchPage page = wb.getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editor = page.getActiveEditor();
-				IEditorInput input = editor.getEditorInput();
-				page.closeEditor(editor, true);
-				try {
-					IEditorDescriptor desc = wb.getEditorRegistry().getDefaultEditor(input.getName());
-					page.openEditor(input, desc.getId(), false);
-				} catch (PartInitException e) {
-					LogHelper.getInstance().logError("Error during reloading", Activator.PLUGIN_ID, e);
-				}
-			}
-		});
-	}
-
-	/**
-	 * Gets the e object.
-	 * 
-	 * @param in
-	 *        the in
-	 * @return the e object
-	 */
-	protected static EObject getEObject(Object in) {
-		if(in instanceof EObject) {
-			return (EObject)in;
-		} else if(in instanceof IAdaptable) {
-			return (EObject)((IAdaptable)in).getAdapter(EObject.class);
-		} else {
-			IAdapterManager adapterService = (IAdapterManager)PlatformUI.getWorkbench().getService(IAdapterManager.class);
-			return (EObject)adapterService.getAdapter(in, EObject.class);
-		}
-	}
-
-
-	/**
-	 * Display an error dialog using a status.
-	 * 
-	 * @param errorStatus
-	 *        the error status
-	 * @param title
-	 *        the title
-	 */
-	public static void errorDialog(IStatus errorStatus, String title) {
-		ErrorDialog dialog = new ErrorDialog(Display.getDefault().getActiveShell(), title, errorStatus.getMessage(), errorStatus, Status.ERROR);
-		dialog.open();
-		LogHelper.getInstance().logError(errorStatus.getMessage(), Activator.PLUGIN_ID, errorStatus.getException());
-	}
-
-	/**
-	 * Error dialog.
-	 * 
-	 * @param throwable
-	 *        the throwable
-	 * @param title
-	 *        the title
-	 * @param message
-	 *        the message
-	 */
-	public static void errorDialog(Throwable throwable, String title, String message) {
-		errorDialog(CollabStatus.createErrorStatus(message, throwable), title);
-	}
-
-	/** The adapter factory. */
-	private static ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-	/**
-	 * Try to get a correct label from a Object
-	 * Handle: {@link EObject} {@link Resource}.
-	 * 
-	 * @param object
-	 *        the object
-	 * @return the label
-	 */
-	public static String getLabel(Object object) {
-		if(object instanceof EObject) {
-			EObject eObject = (EObject)object;
-			IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProvider.class);
-			return labelProvider.getText(eObject);
-		} else if(object instanceof Resource) {
-			return "Resouce " + ((Resource)object).getURI();
-		}
-		return object.toString();
-	}
-	
-	public static ILabelProvider getModelExplorerLavelProvider(){
-		ILabelProvider labelProvider = getLabelProvider(ModelExplorerView.LABEL_PROVIDER_SERVICE_CONTEXT);
-		if(labelProvider == null){
-			labelProvider = getLabelProvider();
-		}
-		return labelProvider;
-	}
-	public static ILabelProvider getLabelProvider(){
-		return getLabelProvider(null);
-	}
-	public static ILabelProvider getLabelProvider(String context){
-		IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editor instanceof CoreMultiDiagramEditor) {
-			CoreMultiDiagramEditor coreEditor = (CoreMultiDiagramEditor) editor;
-			try {
-				LabelProviderService service = coreEditor.getServicesRegistry().getService(LabelProviderService.class);
-				if(context != null){
-					return service.getLabelProvider(context);
-				}else {
-					return service.getLabelProvider();
-				}
-			} catch (ServiceException e) {
-				e.printStackTrace();
-				return null;
-			}
-		}
-		return null;
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.strategy.utils;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Set;

+

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

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

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

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

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

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

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

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

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

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.gmf.runtime.common.ui.dialogs.SaveAllDirtyEditorsDialog;

+import org.eclipse.jface.dialogs.ErrorDialog;

+import org.eclipse.jface.resource.JFaceResources;

+import org.eclipse.jface.resource.LocalResourceManager;

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

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

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

+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;

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

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForWorkbenchPage;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;

+import org.eclipse.papyrus.team.collaborative.core.reports.LogHelper;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.core.utils.ModelsUtil;

+import org.eclipse.papyrus.team.collaborative.strategy.Activator;

+import org.eclipse.papyrus.team.collaborative.strategy.RefreshHelper;

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

+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IEditorDescriptor;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.PlatformUI;

+

+import com.google.common.base.Predicate;

+import com.google.common.collect.Collections2;

+

+

+/**

+ * Utility class for User Interface interactions.

+ * 

+ * @author adaussy

+ */

+public class UIUtils {

+

+	/** The resource manager. */

+	public static LocalResourceManager RESOURCE_MANAGER = new LocalResourceManager(JFaceResources.getResources());

+

+	/**

+	 * Save all dirty editor.

+	 * 

+	 * @return the {@link IStatus}

+	 */

+	public static IStatus saveAllDirtyEditor() {

+		//Force save

+		IEditorPart[] dirtyEditors = SaveAllDirtyEditorsDialog.getDirtyEditors();

+		if(dirtyEditors.length > 0) {

+			SaveAllDirtyEditorsDialog dialog = new SaveAllDirtyEditorsDialog(Display.getDefault().getActiveShell());

+			if(dialog.open() == SaveAllDirtyEditorsDialog.CANCEL) {

+				return Status.CANCEL_STATUS;

+			} else {

+				for(int i = 0; i < dirtyEditors.length; i++) {

+					IEditorPart editorI = dirtyEditors[i];

+					editorI.doSave(new NullProgressMonitor());

+				}

+			}

+		}

+		return Status.OK_STATUS;

+	}

+

+	/**

+	 * Gets the current resource set.

+	 * 

+	 * @return the current resource set

+	 */

+	public static ResourceSet getCurrentResourceSet() {

+		IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+		if(editor instanceof CoreMultiDiagramEditor) {

+			CoreMultiDiagramEditor papyrusEditor = (CoreMultiDiagramEditor)editor;

+			return papyrusEditor.getEditingDomain().getResourceSet();

+		}

+		return null;

+	}

+

+	/**

+	 * Return all the leaf from the semantic meta model

+	 * 

+	 * @param uris

+	 *        Input set for the search of leaf

+	 * @param resourceSet

+	 * @return

+	 */

+	public static Collection<EObject> getLeafSemanticElement(Collection<IExtendedURI> uris, ResourceSet resourceSet) {

+		Collection<IExtendedURI> semanticURIS = Collections2.filter(uris, new Predicate<IExtendedURI>() {

+

+			public boolean apply(IExtendedURI arg0) {

+				return UmlModel.UML_FILE_EXTENSION.equals(arg0.getUri().fileExtension());

+			}

+		});

+		Collection<Collection<EObject>> eObjects = Collections2.transform(semanticURIS, CollabFunctionsFactory.getExtendedURIToEObjects(resourceSet));

+		Set<EObject> semanticElements = new HashSet<EObject>();

+		for(Collection<EObject> eos : eObjects) {

+			semanticElements.addAll(eos);

+		}

+		return ModelsUtil.getRoots(semanticElements);

+	}

+

+	/**

+	 * Gets the first selection from the workbench

+	 * 

+	 * @return the first selection

+	 */

+	public static EObject getFirstSelection() {

+		Collection<EObject> selection = getSelection();

+		if(selection.isEmpty()) {

+			return null;

+		}

+		return selection.iterator().next();

+	}

+

+	/**

+	 * Gets the selection from the workbench

+	 * 

+	 * @return the selection

+	 */

+	public static Collection<EObject> getSelection() {

+		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

+		ISelection selection = selectionService.getSelection();

+		if(selection != null) {

+			if(selection instanceof IStructuredSelection) {

+				List<EObject> result = new ArrayList<EObject>();

+				Iterator<?> ite = ((IStructuredSelection)selection).iterator();

+				while(ite.hasNext()) {

+					Object next = ite.next();

+					EObject eObject = EMFHelper.getEObject(next);

+					if(eObject != null) {

+						result.add(eObject);

+					}

+				}

+				return result;

+			}

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * Refresh elements in model explorer view.

+	 * 

+	 * @param uris

+	 *        {@link IExtendedURI} to refresh

+	 * @param resourceSet

+	 *        the resource set

+	 */

+	public static void refreshModelExplorer(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		for(Collection<EObject> objects : Collections2.transform(uris, CollabFunctionsFactory.getExtendedURIToEObjects(resourceSet))) {

+			RefreshHelper.refreshModelExplorer(objects);

+		}

+	}

+

+	/**

+	 * This reload the current editor

+	 * WARNING : BE careful after this action the ancient resourceSet will deprecated you may use getCurrentResourceSet() to retrieve the new one.

+	 */

+	public static void reloadEditor() {

+		Display.getCurrent().syncExec(new Runnable() {

+

+			public void run() {

+				IWorkbench wb = PlatformUI.getWorkbench();

+				IWorkbenchPage page = wb.getActiveWorkbenchWindow().getActivePage();

+				IEditorPart editor = page.getActiveEditor();

+				IEditorInput input = editor.getEditorInput();

+				page.closeEditor(editor, true);

+				try {

+					IEditorDescriptor desc = wb.getEditorRegistry().getDefaultEditor(input.getName());

+					page.openEditor(input, desc.getId(), false);

+				} catch (PartInitException e) {

+					LogHelper.getInstance().logError("Error during reloading", Activator.PLUGIN_ID, e);

+				}

+			}

+		});

+	}

+

+	/**

+	 * Display an error dialog using a status.

+	 * 

+	 * @param errorStatus

+	 *        the error status

+	 * @param title

+	 *        the title

+	 */

+	public static void errorDialog(IStatus errorStatus, String title) {

+		ErrorDialog dialog = new ErrorDialog(Display.getDefault().getActiveShell(), title, errorStatus.getMessage(), errorStatus, Status.ERROR);

+		dialog.open();

+		LogHelper.getInstance().logError(errorStatus.getMessage(), Activator.PLUGIN_ID, errorStatus.getException());

+	}

+

+	/**

+	 * Error dialog.

+	 * 

+	 * @param throwable

+	 *        the throwable

+	 * @param title

+	 *        the title

+	 * @param message

+	 *        the message

+	 */

+	public static void errorDialog(Throwable throwable, String title, String message) {

+		errorDialog(CollabStatus.createErrorStatus(message, throwable), title);

+	}

+

+	/** The adapter factory. */

+	private static ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

+

+	/**

+	 * Try to get a correct label from a Object

+	 * Handle: {@link EObject} {@link Resource}.

+	 * 

+	 * @param object

+	 *        the object

+	 * @return the label

+	 */

+	public static String getLabel(Object object) {

+		if(object instanceof EObject) {

+			EObject eObject = (EObject)object;

+			IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProvider.class);

+			return labelProvider.getText(eObject);

+		} else if(object instanceof Resource) {

+			return "Resouce " + ((Resource)object).getURI();

+		}

+		return object.toString();

+	}

+

+	public static ILabelProvider getModelExplorerLavelProvider() {

+		ILabelProvider labelProvider = getLabelProvider(ModelExplorerView.LABEL_PROVIDER_SERVICE_CONTEXT);

+		if(labelProvider == null) {

+			labelProvider = getLabelProvider();

+		}

+		return labelProvider;

+	}

+

+	public static ILabelProvider getLabelProvider() {

+		return getLabelProvider(null);

+	}

+

+	public static ILabelProvider getLabelProvider(String context) {

+

+		try {

+			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

+			ServicesRegistry serviceRegistry = ServiceUtilsForWorkbenchPage.getInstance().getServiceRegistry(activePage);

+			LabelProviderService service = serviceRegistry.getService(LabelProviderService.class);

+			if(context != null) {

+				return service.getLabelProvider(context);

+			} else {

+				return service.getLabelProvider();

+			}

+		} catch (ServiceException e) {

+			e.printStackTrace();

+		}

+

+		return null;

+	}

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.classpath b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.classpath
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.classpath
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.gitignore b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.gitignore
index 19af0f1d5ca..19af0f1d5ca 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.gitignore
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.gitignore
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.options b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.options
new file mode 100644
index 00000000000..058af1e91aa
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.options
@@ -0,0 +1,2 @@
+org.eclipse.papyrus.team.collaborative.core.connector.svn/debug=true
+org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/commit=true
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.project b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.project
index c0e0c4480de..8ac71ef3f16 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.project
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.team.collaborative</name>
+	<name>org.eclipse.papyrus.team.collaborative.svn</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.settings/org.eclipse.jdt.core.prefs b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..42337f02afe
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+org.eclipse.objectteams.otdt.compiler.option.pure_java=enabled

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..df6c5346cc9
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

+Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative.svn;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.team.collaborative.svn.Activator

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.papyrus.team.collaborative.core;bundle-version="1.0.0",

+ org.eclipse.emf.ecore,

+ com.google.guava,

+ org.eclipse.core.resources,

+ org.eclipse.emf.workspace,

+ org.eclipse.team.core,

+ org.eclipse.team.ui,

+ org.eclipse.team.svn.core,

+ org.eclipse.team.svn.ui

+Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Export-Package: org.eclipse.papyrus.team.collaborative.svn,

+ org.eclipse.papyrus.team.collaborative.svn.tracing,

+ org.eclipse.papyrus.team.collaborative.svn.utils,

+ org.eclipse.papyrus.team.collaborative.svn.versioncontroller

+Bundle-Vendor: %providerName

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/about.html b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.integration.papyrus/about.html
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/about.html
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/build.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/build.properties
index 060a9e9fdd4..060a9e9fdd4 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/build.properties
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/build.properties
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/plugin.properties
new file mode 100644
index 00000000000..e62f4e4b682
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/plugin.properties
@@ -0,0 +1,12 @@
+#/*****************************************************************************
+# * Copyright (c) 2014 Atos Origin.
+# *
+# *    
+# * All rights reserved. This program and the accompanying materials
+# * are made available under the terms of the Eclipse Public License v1.0
+# * which accompanies this distribution, and is available at
+# * http://www.eclipse.org/legal/epl-v10.html
+# *
+# *****************************************************************************/
+pluginName = Collaborative SVN Connector
+providerName = Eclipse Modeling Project
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/plugin.xml
new file mode 100644
index 00000000000..cbbbe02cc78
--- /dev/null
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/plugin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.papyrus.team.collaborative.core.contribution">

+      <ParticipantFactory

+            id="org.eclipse.papyrus.team.collaborative.svn"

+            impl="org.eclipse.papyrus.team.collaborative.svn.SVNCollabFactory"

+            priority="10">

+      </ParticipantFactory>

+   </extension>

+

+

+</plugin>

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/AbstractExtendedURIBuilderForFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/AbstractExtendedURIBuilderForFile.java
index 38aea3cc3f3..10886703966 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/AbstractExtendedURIBuilderForFile.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/AbstractExtendedURIBuilderForFile.java
@@ -1,76 +1,75 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn;
-
-import java.util.Collection;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.participants.AbstractExtendedURIBuilder;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-
-
-/**
- * Extends {@link AbstractExtendedURIBuilder} adding some utilitary method to manipulate files
- * 
- * @author adaussy
- * 
- */
-public abstract class AbstractExtendedURIBuilderForFile extends AbstractExtendedURIBuilder {
-
-	public AbstractExtendedURIBuilderForFile(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		super(uris, resourceSet);
-	}
-
-	/**
-	 * Transform resource to {@link IFile}
-	 * 
-	 * @param r
-	 *        the r
-	 * @return the i file
-	 */
-	protected IFile toIFile(Resource r) {
-		if(r != null) {
-			return TO_FILE_FUNCTION.apply(r);
-		}
-		return null;
-	}
-
-	/** The Constant TO_FILE_FUNCTION. */
-	protected static final Function<Resource, IFile> TO_FILE_FUNCTION = new Function<Resource, IFile>() {
-
-		@Override
-		public IFile apply(Resource from) {
-
-			return WorkspaceSynchronizer.getFile(from);
-		}
-	};
-
-	/**
-	 * Gets the target files.
-	 * 
-	 * @param resourcesToLock
-	 *        the resources to lock
-	 * @return the target files
-	 */
-	protected static IFile[] getTargetFiles(Collection<Resource> resourcesToLock) {
-		Collection<IFile> iResourcesToLock = Collections2.transform(resourcesToLock, TO_FILE_FUNCTION);
-		return iResourcesToLock.toArray(new IFile[iResourcesToLock.size()]);
-	}
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.svn;

+

+import java.util.Collection;

+import java.util.Set;

+

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

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

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

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.AbstractExtendedURIBuilder;

+

+import com.google.common.base.Function;

+import com.google.common.collect.Collections2;

+

+

+/**

+ * Extends {@link AbstractExtendedURIBuilder} adding some utilitary method to manipulate files

+ * 

+ * @author adaussy

+ * 

+ */

+public abstract class AbstractExtendedURIBuilderForFile extends AbstractExtendedURIBuilder {

+

+	public AbstractExtendedURIBuilderForFile(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		super(uris, resourceSet);

+	}

+

+	/**

+	 * Transform resource to {@link IFile}

+	 * 

+	 * @param r

+	 *        the r

+	 * @return the i file

+	 */

+	protected IFile toIFile(Resource r) {

+		if(r != null) {

+			return TO_FILE_FUNCTION.apply(r);

+		}

+		return null;

+	}

+

+	/** The Constant TO_FILE_FUNCTION. */

+	protected static final Function<Resource, IFile> TO_FILE_FUNCTION = new Function<Resource, IFile>() {

+

+		public IFile apply(Resource from) {

+

+			return WorkspaceSynchronizer.getFile(from);

+		}

+	};

+

+	/**

+	 * Gets the target files.

+	 * 

+	 * @param resourcesToLock

+	 *        the resources to lock

+	 * @return the target files

+	 */

+	protected static IFile[] getTargetFiles(Collection<Resource> resourcesToLock) {

+		Collection<IFile> iResourcesToLock = Collections2.transform(resourcesToLock, TO_FILE_FUNCTION);

+		return iResourcesToLock.toArray(new IFile[iResourcesToLock.size()]);

+	}

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/Activator.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/Activator.java
index a2a850be44c..1ade1df9c6a 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/Activator.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn;
+package org.eclipse.papyrus.team.collaborative.svn;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.connector.svn"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.team.collaborative.core.connector.svn"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/CollabResourceSelector.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/CollabResourceSelector.java
index 696b11eaef9..9871b632336 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/CollabResourceSelector.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/CollabResourceSelector.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn;
+package org.eclipse.papyrus.team.collaborative.svn;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/SVNCollabFactory.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/SVNCollabFactory.java
index eb27a158256..374ac4ca477 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/SVNCollabFactory.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/SVNCollabFactory.java
@@ -1,151 +1,145 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *     Philippe Roland (Atos) philippe.roland@atos.net - added workaround for eclipse bug 385394
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.ICollabFactory;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.locker.SVNLocker;
-import org.eclipse.papyrus.team.collaborative.connector.svn.locker.SVNUnlocker;
-import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNCommitter;
-import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNReverter;
-import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNUpdater;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.papyrus.team.collaborative.utils.CollabFunctionsFactory;
-import org.eclipse.team.svn.core.utility.FileUtility;
-
-import com.google.common.collect.Collections2;
-
-
-/**
- * Factory to build element to do collaborative work with SVN.
- * 
- * @author adaussy
- */
-public class SVNCollabFactory implements ICollabFactory {
-
-	/** The Constant SVN_COLLAB_ID. */
-	public static final String SVN_COLLAB_ID = "org.eclipse.papyrus.team.collaborative.connector.svn";
-
-	/**
-	 * Resource set svn status cache
-	 */
-	private WeakHashMap<ResourceSet, Boolean> alreadyOnSvnCache = new WeakHashMap<ResourceSet, Boolean>();
-	
-	/**
-	 * Instantiates a new sVN collab factory.
-	 */
-	public SVNCollabFactory() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#provide(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	@Override
-	public boolean provide(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		/**
-		 * Workaround for eclipse bug 385394. This bug causes property testers to be called very frequently
-		 * even if no activity is taking place, causing important slowdowns when a right-click on a model explorer element is performed.
-		 * a cache prevents these calls (and the subsequent calls to FileUtility.alreadyOnSVN) from being too taxing on system resources.
-		 * 
-		 * This bug was fixed on 16/01/2014 but its fix has not yet been released outside of integration builds. Remove this workaround when it is.
-		 */
-		if(alreadyOnSvnCache.containsKey(resourceSet)) {
-			return alreadyOnSvnCache.get(resourceSet);
-		}
-		boolean result;
-		Set<IProject> projects = new HashSet<IProject>();
-		for(IResource iResource : Collections2.transform(uris, CollabFunctionsFactory.getExtendedURIToIResource(resourceSet))) {
-			if(iResource != null) {
-				projects.add(iResource.getProject());
-			}
-		}
-		if(projects.isEmpty()) {
-			result = false;
-			alreadyOnSvnCache.put(resourceSet, result);
-			return result;
-		}
-		for(IProject iProject : projects) {
-			if(!FileUtility.alreadyOnSVN(iProject)) {
-				result = false;
-				alreadyOnSvnCache.put(resourceSet, result);
-				return result;
-			}
-		}
-		result = true;
-		alreadyOnSvnCache.put(resourceSet, result);
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	@Override
-	public ILocker createLocker(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		return new SVNLocker(uris, resourceSet);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	@Override
-	public IUnlocker createUnlocker(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		return new SVNUnlocker(uris, resourceSet);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	@Override
-	public IReverter createReverter(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		return new SVNReverter(uris, resourceSet);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	@Override
-	public ICommitter createCommitter(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		return new SVNCommitter(uris, resourceSet);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.ICollabFactory#createUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)
-	 */
-	@Override
-	public IUpdater createUpdater(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		return new SVNUpdater(uris, resourceSet);
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

+ *     Philippe Roland (Atos) philippe.roland@atos.net - added workaround for eclipse bug 385394

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

+package org.eclipse.papyrus.team.collaborative.svn;

+

+import java.util.HashSet;

+import java.util.Set;

+import java.util.WeakHashMap;

+

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

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

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

+import org.eclipse.papyrus.team.collaborative.core.ICollabFactory;

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;

+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;

+import org.eclipse.papyrus.team.collaborative.core.utils.CollabFunctionsFactory;

+import org.eclipse.papyrus.team.collaborative.svn.locker.SVNLocker;

+import org.eclipse.papyrus.team.collaborative.svn.locker.SVNUnlocker;

+import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNCommitter;

+import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNReverter;

+import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNUpdater;

+import org.eclipse.team.svn.core.utility.FileUtility;

+

+import com.google.common.collect.Collections2;

+

+

+/**

+ * Factory to build element to do collaborative work with SVN.

+ * 

+ * @author adaussy

+ */

+public class SVNCollabFactory implements ICollabFactory {

+

+	/** The Constant SVN_COLLAB_ID. */

+	public static final String SVN_COLLAB_ID = "org.eclipse.papyrus.team.collaborative.core.connector.svn";

+

+	/**

+	 * Resource set svn status cache

+	 */

+	private WeakHashMap<ResourceSet, Boolean> alreadyOnSvnCache = new WeakHashMap<ResourceSet, Boolean>();

+	

+	/**

+	 * Instantiates a new sVN collab factory.

+	 */

+	public SVNCollabFactory() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#provide(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)

+	 */

+	public boolean provide(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		/**

+		 * Workaround for eclipse bug 385394. This bug causes property testers to be called very frequently

+		 * even if no activity is taking place, causing important slowdowns when a right-click on a model explorer element is performed.

+		 * a cache prevents these calls (and the subsequent calls to FileUtility.alreadyOnSVN) from being too taxing on system resources.

+		 * 

+		 * This bug was fixed on 16/01/2014 but its fix has not yet been released outside of integration builds. Remove this workaround when it is.

+		 */

+		if(alreadyOnSvnCache.containsKey(resourceSet)) {

+			return alreadyOnSvnCache.get(resourceSet);

+		}

+		boolean result;

+		Set<IProject> projects = new HashSet<IProject>();

+		for(IResource iResource : Collections2.transform(uris, CollabFunctionsFactory.getExtendedURIToIResource(resourceSet))) {

+			if(iResource != null) {

+				projects.add(iResource.getProject());

+			}

+		}

+		if(projects.isEmpty()) {

+			result = false;

+			alreadyOnSvnCache.put(resourceSet, result);

+			return result;

+		}

+		for(IProject iProject : projects) {

+			if(!FileUtility.alreadyOnSVN(iProject)) {

+				result = false;

+				alreadyOnSvnCache.put(resourceSet, result);

+				return result;

+			}

+		}

+		result = true;

+		alreadyOnSvnCache.put(resourceSet, result);

+		return result;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createLocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)

+	 */

+	public ILocker createLocker(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		return new SVNLocker(uris, resourceSet);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createUnlocker(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)

+	 */

+	public IUnlocker createUnlocker(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		return new SVNUnlocker(uris, resourceSet);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createReverter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)

+	 */

+	public IReverter createReverter(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		return new SVNReverter(uris, resourceSet);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createCommitter(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)

+	 */

+	public ICommitter createCommitter(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		return new SVNCommitter(uris, resourceSet);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.ICollabFactory#createUpdater(java.util.Set, org.eclipse.emf.ecore.resource.ResourceSet)

+	 */

+	public IUpdater createUpdater(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		return new SVNUpdater(uris, resourceSet);

+	}

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/locker/AbstractSVNCollab.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/AbstractSVNCollab.java
index 814465869b5..8d91180898f 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/locker/AbstractSVNCollab.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/AbstractSVNCollab.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.locker;
+package org.eclipse.papyrus.team.collaborative.svn.locker;
 
 import java.util.Set;
 
@@ -18,10 +18,10 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.AbstractExtendedURIBuilderForFile;
-import org.eclipse.papyrus.team.collaborative.participants.ICollabParticipant;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.ICollabParticipant;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.svn.AbstractExtendedURIBuilderForFile;
 import org.eclipse.team.svn.core.resource.ILocalResource;
 import org.eclipse.team.svn.core.svnstorage.SVNRemoteStorage;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/locker/SVNLocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNLocker.java
index e08d1a1011b..ece1576a48e 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/locker/SVNLocker.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNLocker.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.locker;
+package org.eclipse.papyrus.team.collaborative.svn.locker;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,12 +17,12 @@ import java.util.Set;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.connector.svn.utils.SVNUtils;
-import org.eclipse.papyrus.team.collaborative.participants.locker.ILocker;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;
+import org.eclipse.papyrus.team.collaborative.svn.utils.SVNUtils;
 import org.eclipse.team.svn.core.operation.CompositeOperation;
 import org.eclipse.team.svn.core.operation.IActionOperation;
 import org.eclipse.team.svn.core.operation.local.LockOperation;
@@ -47,7 +47,7 @@ public class SVNLocker extends AbstractSVNCollab implements ILocker {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.participants.locker.ILocker#lock()
+	 * @see org.eclipse.papyrus.team.collaborative.core.participants.locker.ILocker#lock()
 	 */
 	public IStatus lock() {
 		IResource[] resourcesToProcess = getTargetFiles(getTargetResources());
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/locker/SVNUnlocker.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNUnlocker.java
index 5779b4a764a..60967fdc9e3 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/locker/SVNUnlocker.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/locker/SVNUnlocker.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.locker;
+package org.eclipse.papyrus.team.collaborative.svn.locker;
 
 import java.util.Set;
 
@@ -16,11 +16,11 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;
 import org.eclipse.team.svn.core.operation.CompositeOperation;
 import org.eclipse.team.svn.core.operation.IActionOperation;
 import org.eclipse.team.svn.core.operation.local.RefreshResourcesOperation;
@@ -53,7 +53,7 @@ public class SVNUnlocker extends AbstractSVNCollab implements IUnlocker {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.participants.locker.IUnlocker#unlock()
+	 * @see org.eclipse.papyrus.team.collaborative.core.participants.locker.IUnlocker#unlock()
 	 */
 	public IStatus unlock() {
 		IResource[] resourcesToProcess = getTargetFiles(getTargetResources());
@@ -85,7 +85,7 @@ public class SVNUnlocker extends AbstractSVNCollab implements IUnlocker {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.participants.AbstractExtendedURIBuilder#doBuild()
+	 * @see org.eclipse.papyrus.team.collaborative.core.participants.AbstractExtendedURIBuilder#doBuild()
 	 */
 	@Override
 	protected Set<IExtendedURI> doBuild() {
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/tracing/ITracingConstant.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/ITracingConstant.java
index 949fdb640dd..ddad199dea9 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/tracing/ITracingConstant.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/ITracingConstant.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.tracing;
+package org.eclipse.papyrus.team.collaborative.svn.tracing;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.team.collaborative.connector.svn.Activator;
+import org.eclipse.papyrus.team.collaborative.svn.Activator;
 
 /**
  * Constant use to trace.
@@ -21,19 +21,19 @@ import org.eclipse.papyrus.team.collaborative.connector.svn.Activator;
 public interface ITracingConstant {
 
 	/** Trace everything related to commmit. */
-	public static final boolean COMMIT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/commit"));
+	public static final boolean COMMIT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/commit"));
 
 	/** Trace everything related to lock. */
-	public static final boolean LOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/lock"));
+	public static final boolean LOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/lock"));
 
 	/** Trace everything related to unlock. */
-	public static final boolean UNLOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/unlock"));
+	public static final boolean UNLOCK_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/unlock"));
 
 	/** Trace everything related to Update. */
-	public static final boolean UPDATE_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/update"));
+	public static final boolean UPDATE_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/update"));
 
 	/** Trace everything related to Revert. */
-	public static final boolean REVERT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.connector.svn/debug/revert"));
+	public static final boolean REVERT_TRACING = Activator.getDefault().isDebugging() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.papyrus.team.collaborative.core.connector.svn/debug/revert"));
 
 
 }
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/tracing/Tracer.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/Tracer.java
index 7dcbaf256dd..5de51052f16 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/tracing/Tracer.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/tracing/Tracer.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
  ******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.tracing;
+package org.eclipse.papyrus.team.collaborative.svn.tracing;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.team.collaborative.connector.svn.Activator;
+import org.eclipse.papyrus.team.collaborative.svn.Activator;
 
 /**
  * Utils class used to trace element
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/utils/CommitActionUtilityWithProperties.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/CommitActionUtilityWithProperties.java
index d044eefb51c..cd260c3c28d 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/utils/CommitActionUtilityWithProperties.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/CommitActionUtilityWithProperties.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
  ******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.utils;
+package org.eclipse.papyrus.team.collaborative.svn.utils;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/utils/SVNUtils.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SVNUtils.java
index 4dff9488b13..92418146a64 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/utils/SVNUtils.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SVNUtils.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.utils;
+package org.eclipse.papyrus.team.collaborative.svn.utils;
 
 import java.util.Collection;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller.SVNCommitter;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;
+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;
+import org.eclipse.papyrus.team.collaborative.svn.versioncontroller.SVNCommitter;
 import org.eclipse.team.svn.core.connector.SVNChangeStatus;
 import org.eclipse.team.svn.core.extension.CoreExtensionsManager;
 import org.eclipse.team.svn.core.extension.factory.ISVNConnectorFactory;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/utils/SetPropertyActionNow.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SetPropertyActionNow.java
index d61e959070e..addf30abd13 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/utils/SetPropertyActionNow.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/utils/SetPropertyActionNow.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.utils;
+package org.eclipse.papyrus.team.collaborative.svn.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/AbstractSVNVersionController.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/AbstractSVNVersionController.java
index 6e41a8b4571..379514edaf1 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/AbstractSVNVersionController.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/AbstractSVNVersionController.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;
 
 import java.util.Set;
 
@@ -18,11 +18,11 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.AbstractExtendedURIBuilderForFile;
-import org.eclipse.papyrus.team.collaborative.connector.svn.utils.SVNUtils;
-import org.eclipse.papyrus.team.collaborative.participants.version.IWorkOnModifiedElementParticipant;
-import org.eclipse.papyrus.team.collaborative.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.version.IWorkOnModifiedElementParticipant;
+import org.eclipse.papyrus.team.collaborative.core.reports.CollabStatus;
+import org.eclipse.papyrus.team.collaborative.svn.AbstractExtendedURIBuilderForFile;
+import org.eclipse.papyrus.team.collaborative.svn.utils.SVNUtils;
 import org.eclipse.team.svn.core.connector.SVNChangeStatus;
 import org.eclipse.team.svn.core.connector.SVNEntryStatus;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNCommitter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNCommitter.java
index b8535ccba98..6ae4fd01840 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNCommitter.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNCommitter.java
@@ -1,120 +1,119 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.CollabResourceSelector;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.connector.svn.utils.CommitActionUtilityWithProperties;
-import org.eclipse.papyrus.team.collaborative.participants.version.ICommitter;
-import org.eclipse.papyrus.team.collaborative.utils.ResourceUtils;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.team.svn.core.operation.CompositeOperation;
-import org.eclipse.team.svn.core.operation.IActionOperation;
-import org.eclipse.team.svn.ui.utility.ICancellableOperationWrapper;
-import org.eclipse.team.svn.ui.utility.UIMonitorUtility;
-import org.eclipse.ui.PlatformUI;
-
-import com.google.common.collect.Lists;
-
-
-/**
- * SVN implementation for {@link ICommitter}.
- * 
- * @author adaussy
- */
-public class SVNCommitter extends SVNWorkOnModifiedFile implements ICommitter {
-
-
-	/**
-	 * Instantiates a new SVN committer.
-	 * 
-	 * @param uris
-	 *        the uris
-	 * @param resourceSet
-	 *        the resource set
-	 */
-	public SVNCommitter(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		super(uris, resourceSet);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.team.collaborative.participants.version.ICommitter#commit(java.lang.String, boolean)
-	 */
-	@Override
-	public IStatus commit(String message, boolean keepLock) {
-		IStatus status = doCommit(message, keepLock, getTargetResources());
-		return status;
-	}
-
-	/**
-	 * Do commit.
-	 * 
-	 * @param message
-	 *        the message for the commit action
-	 * @param keepLock
-	 *        the keep lock set to true if the lock has to be kept
-	 * @param resourceToCommit
-	 *        the resource to commit
-	 * @return the i status
-	 */
-	public static IStatus doCommit(String message, boolean keepLock, Set<Resource> resourceToCommit) {
-		if(resourceToCommit != null && !resourceToCommit.isEmpty()) {
-			List<IFile> targetIFileList = Lists.newArrayList(getTargetFiles(resourceToCommit));
-			return doCommit(message, keepLock, ResourceUtils.getListAncestors(targetIFileList));
-		}
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * Do commit.
-	 * 
-	 * @param message
-	 *        the message for the commit action
-	 * @param keepLock
-	 *        the keep lock set to true if the lock has to be kept
-	 * @param filesToCommit
-	 *        the files to commit
-	 * @return the i status
-	 */
-	public static IStatus doCommit(String message, boolean keepLock, Collection<? extends IResource> filesToCommit) {
-		CommitActionUtilityWithProperties tt = new CommitActionUtilityWithProperties(new CollabResourceSelector(filesToCommit.toArray(new IResource[filesToCommit.size()]), Display.getDefault().getActiveShell()));
-		IResource[] allResources = tt.getAllResources();
-		if(ITracingConstant.COMMIT_TRACING) {
-			StringBuilder stringBuilder = new StringBuilder();
-			stringBuilder.append("Committing ").append(message).append("\n");
-			for(IResource r : allResources) {
-				stringBuilder.append(r).append("\n");
-			}
-			Tracer.logInfo(stringBuilder.toString());
-		}
-		CompositeOperation mainOp = tt.getCompositeCommitOperation(allResources, new IResource[0], message, keepLock, Display.getDefault().getActiveShell(), PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart(), true);
-		ICancellableOperationWrapper runnable = UIMonitorUtility.doTaskNowDefault(mainOp, false);
-		IActionOperation resultStatus = runnable.getOperation();
-		return resultStatus.getStatus();
-	}
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;

+

+import java.util.Collection;

+import java.util.List;

+import java.util.Set;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter;

+import org.eclipse.papyrus.team.collaborative.core.utils.ResourceUtils;

+import org.eclipse.papyrus.team.collaborative.svn.CollabResourceSelector;

+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;

+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;

+import org.eclipse.papyrus.team.collaborative.svn.utils.CommitActionUtilityWithProperties;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.team.svn.core.operation.CompositeOperation;

+import org.eclipse.team.svn.core.operation.IActionOperation;

+import org.eclipse.team.svn.ui.utility.ICancellableOperationWrapper;

+import org.eclipse.team.svn.ui.utility.UIMonitorUtility;

+import org.eclipse.ui.PlatformUI;

+

+import com.google.common.collect.Lists;

+

+

+/**

+ * SVN implementation for {@link ICommitter}.

+ * 

+ * @author adaussy

+ */

+public class SVNCommitter extends SVNWorkOnModifiedFile implements ICommitter {

+

+

+	/**

+	 * Instantiates a new SVN committer.

+	 * 

+	 * @param uris

+	 *        the uris

+	 * @param resourceSet

+	 *        the resource set

+	 */

+	public SVNCommitter(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		super(uris, resourceSet);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.team.collaborative.core.participants.version.ICommitter#commit(java.lang.String, boolean)

+	 */

+	public IStatus commit(String message, boolean keepLock) {

+		IStatus status = doCommit(message, keepLock, getTargetResources());

+		return status;

+	}

+

+	/**

+	 * Do commit.

+	 * 

+	 * @param message

+	 *        the message for the commit action

+	 * @param keepLock

+	 *        the keep lock set to true if the lock has to be kept

+	 * @param resourceToCommit

+	 *        the resource to commit

+	 * @return the i status

+	 */

+	public static IStatus doCommit(String message, boolean keepLock, Set<Resource> resourceToCommit) {

+		if(resourceToCommit != null && !resourceToCommit.isEmpty()) {

+			List<IFile> targetIFileList = Lists.newArrayList(getTargetFiles(resourceToCommit));

+			return doCommit(message, keepLock, ResourceUtils.getListAncestors(targetIFileList));

+		}

+		return Status.OK_STATUS;

+	}

+

+	/**

+	 * Do commit.

+	 * 

+	 * @param message

+	 *        the message for the commit action

+	 * @param keepLock

+	 *        the keep lock set to true if the lock has to be kept

+	 * @param filesToCommit

+	 *        the files to commit

+	 * @return the i status

+	 */

+	public static IStatus doCommit(String message, boolean keepLock, Collection<? extends IResource> filesToCommit) {

+		CommitActionUtilityWithProperties tt = new CommitActionUtilityWithProperties(new CollabResourceSelector(filesToCommit.toArray(new IResource[filesToCommit.size()]), Display.getDefault().getActiveShell()));

+		IResource[] allResources = tt.getAllResources();

+		if(ITracingConstant.COMMIT_TRACING) {

+			StringBuilder stringBuilder = new StringBuilder();

+			stringBuilder.append("Committing ").append(message).append("\n");

+			for(IResource r : allResources) {

+				stringBuilder.append(r).append("\n");

+			}

+			Tracer.logInfo(stringBuilder.toString());

+		}

+		CompositeOperation mainOp = tt.getCompositeCommitOperation(allResources, new IResource[0], message, keepLock, Display.getDefault().getActiveShell(), PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart(), true);

+		ICancellableOperationWrapper runnable = UIMonitorUtility.doTaskNowDefault(mainOp, false);

+		IActionOperation resultStatus = runnable.getOperation();

+		return resultStatus.getStatus();

+	}

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNReverter.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNReverter.java
index b42fdee988f..5133c568569 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNReverter.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNReverter.java
@@ -1,76 +1,75 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
-
-/*******************************************************************************
- * Copyright (c) 2013 Atos.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
- ******************************************************************************/
-import java.io.File;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.participants.version.IReverter;
-import org.eclipse.team.svn.core.operation.CompositeOperation;
-import org.eclipse.team.svn.core.operation.IActionOperation;
-import org.eclipse.team.svn.core.operation.file.RevertOperation;
-import org.eclipse.team.svn.core.operation.local.RefreshResourcesOperation;
-import org.eclipse.team.svn.ui.utility.ICancellableOperationWrapper;
-import org.eclipse.team.svn.ui.utility.UIMonitorUtility;
-
-
-/**
- * SVN Implementation for {@link IReverter}
- * 
- * @author adaussy
- * 
- */
-public class SVNReverter extends SVNWorkOnModifiedFile implements IReverter {
-
-
-	public SVNReverter(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		super(uris, resourceSet);
-	}
-
-	@Override
-	public IStatus revert() {
-		File[] modifiedFiles = getModifiedFile(getTargetResources());
-		if(ITracingConstant.REVERT_TRACING) {
-			StringBuilder stringBuilder = new StringBuilder();
-			stringBuilder.append("Reverting: ").append("\n");
-			for(File f : modifiedFiles) {
-				stringBuilder.append(f).append("\n");
-			}
-			Tracer.logInfo(stringBuilder.toString());
-		}
-		//Revert operation
-		RevertOperation mainOp = new RevertOperation(modifiedFiles, true);
-		CompositeOperation op = new CompositeOperation(mainOp.getId(), mainOp.getMessagesClass());
-		op.add(mainOp);
-		op.add(new RefreshResourcesOperation(getTargetFiles(getTargetResources())));
-		ICancellableOperationWrapper runnable = UIMonitorUtility.doTaskNowDefault(op, false);
-		IActionOperation resultStatus = runnable.getOperation();
-
-		return resultStatus.getStatus();
-	}
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;

+

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

+ * Copyright (c) 2013 Atos.

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

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

+ * which accompanies this distribution, and is available at

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

+ * 

+ * Contributors:

+ *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation

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

+import java.io.File;

+import java.util.Set;

+

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

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

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.IReverter;

+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;

+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;

+import org.eclipse.team.svn.core.operation.CompositeOperation;

+import org.eclipse.team.svn.core.operation.IActionOperation;

+import org.eclipse.team.svn.core.operation.file.RevertOperation;

+import org.eclipse.team.svn.core.operation.local.RefreshResourcesOperation;

+import org.eclipse.team.svn.ui.utility.ICancellableOperationWrapper;

+import org.eclipse.team.svn.ui.utility.UIMonitorUtility;

+

+

+/**

+ * SVN Implementation for {@link IReverter}

+ * 

+ * @author adaussy

+ * 

+ */

+public class SVNReverter extends SVNWorkOnModifiedFile implements IReverter {

+

+

+	public SVNReverter(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		super(uris, resourceSet);

+	}

+

+	public IStatus revert() {

+		File[] modifiedFiles = getModifiedFile(getTargetResources());

+		if(ITracingConstant.REVERT_TRACING) {

+			StringBuilder stringBuilder = new StringBuilder();

+			stringBuilder.append("Reverting: ").append("\n");

+			for(File f : modifiedFiles) {

+				stringBuilder.append(f).append("\n");

+			}

+			Tracer.logInfo(stringBuilder.toString());

+		}

+		//Revert operation

+		RevertOperation mainOp = new RevertOperation(modifiedFiles, true);

+		CompositeOperation op = new CompositeOperation(mainOp.getId(), mainOp.getMessagesClass());

+		op.add(mainOp);

+		op.add(new RefreshResourcesOperation(getTargetFiles(getTargetResources())));

+		ICancellableOperationWrapper runnable = UIMonitorUtility.doTaskNowDefault(op, false);

+		IActionOperation resultStatus = runnable.getOperation();

+

+		return resultStatus.getStatus();

+	}

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNUpdater.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNUpdater.java
index 7acf706bd75..ed3795d1c49 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNUpdater.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNUpdater.java
@@ -1,186 +1,185 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.ITracingConstant;
-import org.eclipse.papyrus.team.collaborative.connector.svn.tracing.Tracer;
-import org.eclipse.papyrus.team.collaborative.participants.version.IUpdater;
-import org.eclipse.team.svn.core.connector.SVNEntryInfo;
-import org.eclipse.team.svn.core.connector.SVNLogEntry;
-import org.eclipse.team.svn.core.connector.SVNRevision;
-import org.eclipse.team.svn.core.operation.CompositeOperation;
-import org.eclipse.team.svn.core.operation.IActionOperation;
-import org.eclipse.team.svn.core.operation.local.InfoOperation;
-import org.eclipse.team.svn.core.operation.remote.GetLogMessagesOperation;
-import org.eclipse.team.svn.core.resource.IRepositoryResource;
-import org.eclipse.team.svn.core.svnstorage.SVNRemoteStorage;
-import org.eclipse.team.svn.ui.action.local.UpdateAction;
-import org.eclipse.team.svn.ui.utility.ICancellableOperationWrapper;
-import org.eclipse.team.svn.ui.utility.UIMonitorUtility;
-
-
-/**
- * SVN implementation of {@link IUpdater}
- * 
- * @author adaussy
- * 
- */
-public class SVNUpdater extends AbstractSVNVersionController implements IUpdater {
-
-	/**
-	 * Instantiates a new sVN updater.
-	 * 
-	 * @param uris
-	 *        the uris
-	 * @param resourceSet
-	 *        the resource set
-	 */
-	public SVNUpdater(Set<IExtendedURI> uris, ResourceSet resourceSet) {
-		super(uris, resourceSet);
-	}
-
-	@Override
-	public IStatus update() {
-		IFile[] resourcesToProcess = getTargetFiles(getTargetResources());
-		//The all project of each file shall be updated (In order to see if new files appeared (New control))
-		Set<IProject> projects = new HashSet<IProject>();
-		for(IFile f : resourcesToProcess) {
-			projects.add(f.getProject());
-		}
-
-		IProject[] projectsToUpdate = new IProject[projects.size()];
-		projects.toArray(projectsToUpdate);
-		if(ITracingConstant.UPDATE_TRACING) {
-			StringBuilder stringBuilder = new StringBuilder();
-			stringBuilder.append("Updating projects: ").append("\n");
-			for(IProject p : projectsToUpdate) {
-				stringBuilder.append(p.getFullPath()).append("\n");
-			}
-			Tracer.logInfo(stringBuilder.toString());
-		}
-		CompositeOperation op = UpdateAction.getUpdateOperation(projectsToUpdate, SVNRevision.HEAD);
-		ICancellableOperationWrapper runnable = UIMonitorUtility.doTaskNowDefault(op, false);
-		IActionOperation resultStatus = runnable.getOperation();
-
-		return resultStatus.getStatus();
-	}
-
-	@Override
-	protected Set<IExtendedURI> doBuild() {
-		for(IExtendedURI extendedURI : getUris()) {
-			IExtendedURI resourceURI = getResourceURI(extendedURI);
-			if(resourceURI != null) {
-				IFile file = toIFile(toResource(resourceURI.getUri()));
-				if(file != null && file.exists()) {
-					if(!isUpToDate(resourceURI).isUpToDate()) {
-						getExtendedSet().add(resourceURI);
-					}
-				}
-			}
-		}
-		return getExtendedSet();
-	}
-
-
-	/**
-	 * Checks if is up to date.
-	 * 
-	 * @param uri
-	 *        the uri
-	 * @return the i status
-	 */
-	public UpToDateStatus isUpToDate(IExtendedURI uri) {
-		IExtendedURI resourceEURI = getResourceURI(uri);
-		if(resourceEURI == null) {
-			return UpToDateStatus.createErrorDuringUpToDataStatus("The URI is null");
-		}
-		UpToDateStatus status = getCache().get(resourceEURI);
-		if(status == null) {
-			URI resourceURI = resourceEURI.getUri();
-			Resource resource = toResource(resourceURI);
-			if(resource == null) {
-				return UpToDateStatus.createErrorDuringUpToDataStatus(resourceURI + " is not a URI pointing to a resource");
-			}
-			IFile file = toIFile(resource);
-			if(file == null || !file.exists()) {
-				return UpToDateStatus.createErrorDuringUpToDataStatus(resourceURI + " is not a URI pointing to a existing file");
-			}
-
-			SVNLogEntry log = getRemoteHEADRevision(file);
-			if(log == null) {
-				return UpToDateStatus.createErrorDuringUpToDataStatus("Unable to get remote HEAD revision for file " + file.getFullPath());
-			}
-			InfoOperation refreshOperation = new InfoOperation(file);
-			refreshOperation.run(new NullProgressMonitor());
-			SVNEntryInfo info = refreshOperation.getInfo();
-			long localRevision = info.revision;
-			if(log.revision > localRevision) {
-				status = UpToDateStatus.createNotUpToDataStatus(log.author, log.date, log.revision);
-				getCache().put(resourceEURI, status);
-				return status;
-			} else {
-				status = UpToDateStatus.createUpToDataStatus(log.author, log.date, log.revision);
-				getCache().put(resourceEURI, status);
-			}
-		}
-		return status;
-	}
-
-
-
-
-	protected Map<IExtendedURI, UpToDateStatus> getCache() {
-		if(cache == null) {
-			cache = new HashMap<IExtendedURI, IUpdater.UpToDateStatus>();
-		}
-		return cache;
-	}
-
-
-
-	private Map<IExtendedURI, UpToDateStatus> cache = null;
-
-	public static final long INVALID_REVISION = -1;
-
-
-	public SVNLogEntry getRemoteHEADRevision(IResource resource) {
-		IRepositoryResource remote = SVNRemoteStorage.instance().asRepositoryResource(resource);
-		GetLogMessagesOperation logOp = new GetLogMessagesOperation(remote);
-		logOp.setLimit(1);
-		logOp.run(new NullProgressMonitor());
-		if(logOp.getExecutionState() == IActionOperation.OK && logOp.getMessages() != null) {
-			SVNLogEntry[] messages = logOp.getMessages();
-			if(messages.length > 0) {
-				return messages[0];
-			}
-		}
-		return null;
-	}
-
-
-
-
-
-}
+/*******************************************************************************

+ * Copyright (c) 2013 Atos

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *     Arthur Daussy - initial implementation

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

+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;

+

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.Map;

+import java.util.Set;

+

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;

+import org.eclipse.papyrus.team.collaborative.core.participants.version.IUpdater;

+import org.eclipse.papyrus.team.collaborative.svn.tracing.ITracingConstant;

+import org.eclipse.papyrus.team.collaborative.svn.tracing.Tracer;

+import org.eclipse.team.svn.core.connector.SVNEntryInfo;

+import org.eclipse.team.svn.core.connector.SVNLogEntry;

+import org.eclipse.team.svn.core.connector.SVNRevision;

+import org.eclipse.team.svn.core.operation.CompositeOperation;

+import org.eclipse.team.svn.core.operation.IActionOperation;

+import org.eclipse.team.svn.core.operation.local.InfoOperation;

+import org.eclipse.team.svn.core.operation.remote.GetLogMessagesOperation;

+import org.eclipse.team.svn.core.resource.IRepositoryResource;

+import org.eclipse.team.svn.core.svnstorage.SVNRemoteStorage;

+import org.eclipse.team.svn.ui.action.local.UpdateAction;

+import org.eclipse.team.svn.ui.utility.ICancellableOperationWrapper;

+import org.eclipse.team.svn.ui.utility.UIMonitorUtility;

+

+

+/**

+ * SVN implementation of {@link IUpdater}

+ * 

+ * @author adaussy

+ * 

+ */

+public class SVNUpdater extends AbstractSVNVersionController implements IUpdater {

+

+	/**

+	 * Instantiates a new sVN updater.

+	 * 

+	 * @param uris

+	 *        the uris

+	 * @param resourceSet

+	 *        the resource set

+	 */

+	public SVNUpdater(Set<IExtendedURI> uris, ResourceSet resourceSet) {

+		super(uris, resourceSet);

+	}

+

+	public IStatus update() {

+		IFile[] resourcesToProcess = getTargetFiles(getTargetResources());

+		//The all project of each file shall be updated (In order to see if new files appeared (New control))

+		Set<IProject> projects = new HashSet<IProject>();

+		for(IFile f : resourcesToProcess) {

+			projects.add(f.getProject());

+		}

+

+		IProject[] projectsToUpdate = new IProject[projects.size()];

+		projects.toArray(projectsToUpdate);

+		if(ITracingConstant.UPDATE_TRACING) {

+			StringBuilder stringBuilder = new StringBuilder();

+			stringBuilder.append("Updating projects: ").append("\n");

+			for(IProject p : projectsToUpdate) {

+				stringBuilder.append(p.getFullPath()).append("\n");

+			}

+			Tracer.logInfo(stringBuilder.toString());

+		}

+		CompositeOperation op = UpdateAction.getUpdateOperation(projectsToUpdate, SVNRevision.HEAD);

+		ICancellableOperationWrapper runnable = UIMonitorUtility.doTaskNowDefault(op, false);

+		IActionOperation resultStatus = runnable.getOperation();

+

+		return resultStatus.getStatus();

+	}

+

+	@Override

+	protected Set<IExtendedURI> doBuild() {

+		for(IExtendedURI extendedURI : getUris()) {

+			IExtendedURI resourceURI = getResourceURI(extendedURI);

+			if(resourceURI != null) {

+				IFile file = toIFile(toResource(resourceURI.getUri()));

+				if(file != null && file.exists()) {

+					if(!isUpToDate(resourceURI).isUpToDate()) {

+						getExtendedSet().add(resourceURI);

+					}

+				}

+			}

+		}

+		return getExtendedSet();

+	}

+

+

+	/**

+	 * Checks if is up to date.

+	 * 

+	 * @param uri

+	 *        the uri

+	 * @return the i status

+	 */

+	public UpToDateStatus isUpToDate(IExtendedURI uri) {

+		IExtendedURI resourceEURI = getResourceURI(uri);

+		if(resourceEURI == null) {

+			return UpToDateStatus.createErrorDuringUpToDataStatus("The URI is null");

+		}

+		UpToDateStatus status = getCache().get(resourceEURI);

+		if(status == null) {

+			URI resourceURI = resourceEURI.getUri();

+			Resource resource = toResource(resourceURI);

+			if(resource == null) {

+				return UpToDateStatus.createErrorDuringUpToDataStatus(resourceURI + " is not a URI pointing to a resource");

+			}

+			IFile file = toIFile(resource);

+			if(file == null || !file.exists()) {

+				return UpToDateStatus.createErrorDuringUpToDataStatus(resourceURI + " is not a URI pointing to a existing file");

+			}

+

+			SVNLogEntry log = getRemoteHEADRevision(file);

+			if(log == null) {

+				return UpToDateStatus.createErrorDuringUpToDataStatus("Unable to get remote HEAD revision for file " + file.getFullPath());

+			}

+			InfoOperation refreshOperation = new InfoOperation(file);

+			refreshOperation.run(new NullProgressMonitor());

+			SVNEntryInfo info = refreshOperation.getInfo();

+			long localRevision = info.revision;

+			if(log.revision > localRevision) {

+				status = UpToDateStatus.createNotUpToDataStatus(log.author, log.date, log.revision);

+				getCache().put(resourceEURI, status);

+				return status;

+			} else {

+				status = UpToDateStatus.createUpToDataStatus(log.author, log.date, log.revision);

+				getCache().put(resourceEURI, status);

+			}

+		}

+		return status;

+	}

+

+

+

+

+	protected Map<IExtendedURI, UpToDateStatus> getCache() {

+		if(cache == null) {

+			cache = new HashMap<IExtendedURI, IUpdater.UpToDateStatus>();

+		}

+		return cache;

+	}

+

+

+

+	private Map<IExtendedURI, UpToDateStatus> cache = null;

+

+	public static final long INVALID_REVISION = -1;

+

+

+	public SVNLogEntry getRemoteHEADRevision(IResource resource) {

+		IRepositoryResource remote = SVNRemoteStorage.instance().asRepositoryResource(resource);

+		GetLogMessagesOperation logOp = new GetLogMessagesOperation(remote);

+		logOp.setLimit(1);

+		logOp.run(new NullProgressMonitor());

+		if(logOp.getExecutionState() == IActionOperation.OK && logOp.getMessages() != null) {

+			SVNLogEntry[] messages = logOp.getMessages();

+			if(messages.length > 0) {

+				return messages[0];

+			}

+		}

+		return null;

+	}

+

+

+

+

+

+}

diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNWorkOnModifiedFile.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNWorkOnModifiedFile.java
index 70aded9b630..d4d0a81e9ee 100644
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.connector.svn/src/org/eclipse/papyrus/team/collaborative/connector/svn/versioncontroller/SVNWorkOnModifiedFile.java
+++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.svn/src/org/eclipse/papyrus/team/collaborative/svn/versioncontroller/SVNWorkOnModifiedFile.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Arthur Daussy - initial implementation
  *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.connector.svn.versioncontroller;
+package org.eclipse.papyrus.team.collaborative.svn.versioncontroller;
 
 
 
@@ -24,9 +24,9 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.team.collaborative.IExtendedURI;
-import org.eclipse.papyrus.team.collaborative.connector.svn.CollabResourceSelector;
-import org.eclipse.papyrus.team.collaborative.participants.IExtendedURISuperSet;
+import org.eclipse.papyrus.team.collaborative.core.IExtendedURI;
+import org.eclipse.papyrus.team.collaborative.core.participants.IExtendedURISuperSet;
+import org.eclipse.papyrus.team.collaborative.svn.CollabResourceSelector;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.team.svn.ui.utility.CommitActionUtility;
 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.settings/org.eclipse.jdt.core.prefs b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6bb81369ac7..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.objectteams.otdt.compiler.option.pure_java=enabled
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/META-INF/MANIFEST.MF
deleted file mode 100644
index d864e3681fb..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.team.collaborative;singleton:=true
-Bundle-Version: 1.7.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.team.collaborative.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- com.google.guava,
- org.eclipse.core.resources;bundle-version="3.7.101",
- org.eclipse.emf.workspace
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.papyrus.team.collaborative,
- org.eclipse.papyrus.team.collaborative.participants,
- org.eclipse.papyrus.team.collaborative.participants.locker,
- org.eclipse.papyrus.team.collaborative.participants.version,
- org.eclipse.papyrus.team.collaborative.reports,
- org.eclipse.papyrus.team.collaborative.strategy,
- org.eclipse.papyrus.team.collaborative.utils,
- org.eclipse.papyrus.team.collaborative.utils.funtions;x-internal:=true
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/about.html b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/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/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.properties b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.properties
deleted file mode 100644
index 006c98369ae..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-
-pluginName = CollabConfiguration Model
-providerName = Atos
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.xml
deleted file mode 100644
index 016f4a14338..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension-point id="collaborative" name="collaborative" schema="schema/collaborative.exsd"/>
-
-</plugin>
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/pom.xml b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/pom.xml
deleted file mode 100644
index 901fbc6f735..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2013 Atos.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
-  
-  Contributors:
-      Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <relativePath>../../../Releng/org.topcased.fast.tycho.master/pom.xml</relativePath>
-    <groupId>org.topcased.fast</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.papyrus.team.collaborative</artifactId>
-  <packaging>eclipse-plugin</packaging>
-
-  <name>Alfa Editor</name>
-</project> 
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/LogHelper.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/LogHelper.java
deleted file mode 100644
index 7e269c7a791..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/LogHelper.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.reports;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.team.collaborative.Activator;
-
-
-/**
- * The Class LogHelper.
- * This class intend to help the user to log stuff
- */
-public class LogHelper {
-
-	/**
-	 * The Class SingletonHolder.
-	 */
-	private static class SingletonHolder {
-
-		/** The Constant INSTANCE. */
-		private static final LogHelper INSTANCE = new LogHelper();
-	}
-
-	/**
-	 * Gets the single instance of LogHelper.
-	 * 
-	 * @return single instance of LogHelper
-	 */
-	public static LogHelper getInstance() {
-		return SingletonHolder.INSTANCE;
-	}
-
-	/**
-	 * Log info.
-	 * 
-	 * @param message
-	 *        the message
-	 * @param bundleId
-	 *        the bundle id
-	 */
-	public void logInfo(String message, String bundleId) {
-		getLogger().log(createWarningStatus(bundleId, message));
-	}
-
-	/**
-	 * Creates the warning status.
-	 * 
-	 * @param bundleId
-	 *        the bundle id
-	 * @param message
-	 *        the message
-	 * @return the i status
-	 */
-	protected IStatus createWarningStatus(String bundleId, String message) {
-		return createStatus(Status.WARNING, bundleId, message);
-	}
-
-	/**
-	 * Log error.
-	 * 
-	 * @param message
-	 *        the message
-	 * @param bundleId
-	 *        the bundle id
-	 * @param e
-	 *        the e
-	 */
-	public void logError(String message, String bundleId, Throwable e) {
-		getLogger().log(createErrorStatus(bundleId, message, e));
-	}
-
-	/**
-	 * Log error.
-	 * 
-	 * @param message
-	 *        the message
-	 * @param bundleId
-	 *        the bundle id
-	 */
-	public void logError(String message, String bundleId) {
-		getLogger().log(createErrorStatus(bundleId, message));
-	}
-
-	/**
-	 * Gets the logger.
-	 * 
-	 * @return the logger
-	 */
-	protected ILog getLogger() {
-		return Activator.getDefault().getLog();
-	}
-
-	/**
-	 * Creates the error status.
-	 * 
-	 * @param pluginId
-	 *        the plugin id
-	 * @param message
-	 *        the message
-	 * @return the i status
-	 */
-	protected IStatus createErrorStatus(String pluginId, String message) {
-		return createStatus(Status.ERROR, pluginId, message);
-	}
-
-	/**
-	 * Creates the error status.
-	 * 
-	 * @param pluginId
-	 *        the plugin id
-	 * @param message
-	 *        the message
-	 * @param e
-	 *        the e
-	 * @return the i status
-	 */
-	protected IStatus createErrorStatus(String pluginId, String message, Throwable e) {
-		return createStatus(Status.ERROR, pluginId, message, e);
-	}
-
-	/**
-	 * Creates the status.
-	 * 
-	 * @param severity
-	 *        the severity
-	 * @param pluginId
-	 *        the plugin id
-	 * @param message
-	 *        the message
-	 * @param e
-	 *        the e
-	 * @return the i status
-	 */
-	protected IStatus createStatus(int severity, String pluginId, String message, Throwable e) {
-		return new Status(severity, pluginId, message, e);
-	}
-
-	/**
-	 * Creates the status.
-	 * 
-	 * @param severity
-	 *        the severity
-	 * @param pluginId
-	 *        the plugin id
-	 * @param message
-	 *        the message
-	 * @return the i status
-	 */
-	protected IStatus createStatus(int severity, String pluginId, String message) {
-		return new Status(severity, pluginId, message);
-	}
-}
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/copy/CollabStatus.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/copy/CollabStatus.java
deleted file mode 100644
index 90a4d1c542e..00000000000
--- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative/src/org/eclipse/papyrus/team/collaborative/reports/copy/CollabStatus.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Atos
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Arthur Daussy - initial implementation
- *******************************************************************************/
-package org.eclipse.papyrus.team.collaborative.reports.copy;
-
-import org.eclipse.core.runtime.Status;
-
-/**
- * The Class CollabStatus.
- */
-public class CollabStatus extends Status {
-
-	/**
-	 * Instantiates a new collab status.
-	 * 
-	 * @param severity
-	 *        the severity
-	 * @param pluginId
-	 *        the plugin id
-	 * @param code
-	 *        the code
-	 * @param message
-	 *        the message
-	 * @param exception
-	 *        the exception
-	 */
-	public CollabStatus(int severity, String pluginId, int code, String message, Throwable exception) {
-		super(severity, pluginId, code, message, exception);
-	}
-
-	/**
-	 * Instantiates a new collab status.
-	 * 
-	 * @param severity
-	 *        the severity
-	 * @param pluginId
-	 *        the plugin id
-	 * @param message
-	 *        the message
-	 * @param exception
-	 *        the exception
-	 */
-	public CollabStatus(int severity, String pluginId, String message, Throwable exception) {
-		super(severity, pluginId, message, exception);
-	}
-
-	/**
-	 * Instantiates a new collab status.
-	 * 
-	 * @param severity
-	 *        the severity
-	 * @param pluginId
-	 *        the plugin id
-	 * @param message
-	 *        the message
-	 */
-	public CollabStatus(int severity, String pluginId, String message) {
-		super(severity, pluginId, message);
-	}
-
-	/**
-	 * Creates the error status.
-	 * 
-	 * @param message
-	 *        the message
-	 * @return the collab status
-	 */
-	public static CollabStatus createErrorStatus(String message) {
-		return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.Activator.PLUGIN_ID, message);
-	}
-
-	/**
-	 * Creates the error status.
-	 * 
-	 * @param message
-	 *        the message
-	 * @param e
-	 *        the e
-	 * @return the collab status
-	 */
-	public static CollabStatus createErrorStatus(String message, Throwable e) {
-		return new CollabStatus(ERROR, org.eclipse.papyrus.team.collaborative.Activator.PLUGIN_ID, message, e);
-	}
-
-
-
-}