Remove old sandbox prototypes for CSS, as an Incoming Version is available.

370797: [Theme] Papyrus should provide a support for CSS files on its diagrams
https://bugs.eclipse.org/bugs/show_bug.cgi?id=370797

209 files changed, 0 insertions, 35385 deletions

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.classpath b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.classpath
deleted file mode 100644
index 4b868f767d7..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.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 excluding="org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFCSSEngineImpl.java" kind="src" path="src"/>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.project b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.project
deleted file mode 100644
index e3f4eeb3d60..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.prototype.infra.gmfdiag.css</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/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7d214c865a3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jan 18 08:53:00 CET 2012

-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/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/META-INF/MANIFEST.MF
deleted file mode 100644
index b6e9d37baac..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: CSS
-Bundle-SymbolicName: org.eclipse.papyrus.prototype.infra.gmfdiag.css;singleton:=true
-Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.prototype.infra.gmfdiag.css.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.e4.ui.css.core;bundle-version="0.10.0",
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
- org.w3c.css.sac;bundle-version="1.3.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.prototype.infra.gmfdiag.css.custom,
- org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/build.properties b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/build.properties
deleted file mode 100644
index 41eb6ade2b4..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/plugin.xml b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/plugin.xml
deleted file mode 100644
index 995bea792c8..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.emf.ecore.factory_override">

-      <factory

-            class="org.eclipse.papyrus.prototype.infra.gmfdiag.css.factory.GMFCSSFactory"

-            uri="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-      </factory>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.prototype.infra.gmfdiag.css.handler.RefreshHandler"

-            commandId="org.eclipse.ui.file.refresh">

-         <activeWhen>

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </activeWhen>

-      </handler>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus.css b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus.css
deleted file mode 100644
index 8fac2067c6e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus.css
+++ /dev/null
@@ -1,6 +0,0 @@
-* {

-	lineColor: black;

-	gradient: white vertical;

-	fillColor: #FAFAFC;

-	elementIcon: true;

-}
\ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus.cssx b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus.cssx
deleted file mode 100644
index 847257dc164..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus.cssx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

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

-

-/* 

- *	Papyrus extended CSS v0.9 

- *	Sample

- */

-

-@namespace "uml" /* Default namespace */

-@namespace "blocks" "SysML::Blocks" /* SysML::Blocks namespace */

-

-/* Qualified name : supported by CSS ? Namespaces... Apparently not supported by E4 CSS Parser */

-

-SysML:Blocks:Block[isEncapsulated=true] {

-	fillColor:blue;

-}

-

-SysML:Blocks:Block[isAbstract=true,isEncapsulated=false]{

-	fillColor:green;

-}

-

-myQuery(p1, p2, p3){

-	fillColor:red;

-}

-

-blocks|Block[isEncapsulated=true] {

-

-}

-

-Class[isAbstract=true]{

-

-}

-

-

-/* Selector composition ? */

-

-/* Element is a child of Class and matches hasStereotype */

-Class hasStereotype("SysML::Blocks::Block"){ 

-

-}

-

-hasStereotype(Class, "SysML::Blocks::Block"){

-

-}

-

-isSubtypeOf(Class){

-

-}

-

-/* Sous-entendu pour les EClass abstraites/interface ? */

-/* S'applique à tous les enfants de Classifier (Class, Interface, ...) */

-Classifier:inherits { 

-

-}

-

-

-

-

-

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_base.css b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_base.css
deleted file mode 100644
index 86c232aa59b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_base.css
+++ /dev/null
@@ -1,13 +0,0 @@
-* {

-	lineColor:black; /* Avoid the gray line-colors from default GMF connectors */

-	

-}

-

-.red {

-	fillColor:red;

-	gradient: white;

-}

-

-.blue{

-	lineColor:blue;

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_fill.css b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_fill.css
deleted file mode 100644
index 515511d443e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_fill.css
+++ /dev/null
@@ -1,13 +0,0 @@
-* {

-	gradient:white vertical;

-	fillColor:#FFFFCC;

-	elementIcon:true;

-}

-

-Class > * {

-	elementIcon:false;

-}

-

-Class {

-	fillColor:rgb(155, 199, 204);

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_simple.css b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_simple.css
deleted file mode 100644
index 520726f7318..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_simple.css
+++ /dev/null
@@ -1,10 +0,0 @@
-* {

-	lineColor:black;

-	gradient: white vertical;

-	fillColor: #FAFAFC;

-	elementIcon:true;

-}

-

-Comment, Constraint {

-	fontColor:black;

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_theme.css b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_theme.css
deleted file mode 100644
index 912d76ed72d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/resources/papyrus_theme.css
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

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

- 

-/* 

- *	Papyrus CSS v0.9

- *	Sample 

- */

-

-* {

-	

-	/**

-	*	GMF Display

-	*/

-	

-	lineColor: #272727;

-	fontColor: black;

-	fillColor:#C3D1D5;

-	

-	/* 	fontHeight:9; */

-	

-	/** 

-	*	Gradient 

-	*/

-	

-	/* 	gradientColor:white; */

-	/* 	gradientStyle:vertical; */

-	

-	/*  

-	*	Global gradient (Equivalent to the latter)

-	*/

-	

-	gradient: white vertical;

-	

-	/* 

-	*	Global gradient (2)

-	*	Unsupported by diagrams (Color2 is unused) 

-	*/

-	

-	/* 	gradient:white blue vertical */

-	

-	/**

-	*	UML Display

-	*/

-	

-	elementIcon: true;

-	/* 	shadow:false; */

-	/* 	qualifiedNameDepth:Full; */

-	

-	/** 

-	* 	UML Stereotypes display 

-	*/

-	

-	/* 	stereotypeDisplay:"Text and Icon"; */

-	/* 	textAlignment:Vertical; */

-	/* 	displayPlace:"With brace"; */

-}

-

-Class {

-	fillColor: #C3D7DD;

-	lineColor: black;

-}

-

-Interface{

-	fillColor:#FAFAFC;

-}

-

-Class[isAbstract=true], Class[isAbstract=true] *{

-	fillColor:#E4E4E7;

-	fontColor:gray;

-}

-

-Port {

-	fillColor: #C8D9F5;

-	lineColor: black;

-}

-

-Comment {

-	fillColor: #FFFFCC;

-}

-

-Constraint {

-	fillColor: #C8FFE6;

-}

-

-Package {

-	fillColor: white;

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSArrowStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSArrowStyle.java
deleted file mode 100644
index a2b6ae4627d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSArrowStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSArrowStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSArrowStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSArrowStyle extends ArrowStyleImpl implements CSSStylableElement, CSSArrowStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSArrowStyle arrowStyle;
-	
-	public GMFCSSArrowStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.arrowStyle = new CSSArrowStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public ArrowType getCSSArrowSource(){
-		if (eIsSet(NotationPackage.eINSTANCE.getArrowStyle_ArrowSource())){
-			return super.getArrowSource();
-		} else {
-			return arrowStyle.getCSSArrowSource();
-		}
-	}
-
-	public ArrowType getCSSArrowTarget(){
-		if (eIsSet(NotationPackage.eINSTANCE.getArrowStyle_ArrowTarget())){
-			return super.getArrowTarget();
-		} else {
-			return arrowStyle.getCSSArrowTarget();
-		}
-	}
-
-
-	@Override
-	public ArrowType getArrowSource(){
-		//return super.getArrowSource();
-		return getCSSArrowSource();
-	}
-
-	@Override
-	public ArrowType getArrowTarget(){
-		//return super.getArrowTarget();
-		return getCSSArrowTarget();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicCompartment.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicCompartment.java
deleted file mode 100644
index 07ee868ba2c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicCompartment.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDrawerStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSBasicCompartment extends BasicCompartmentImpl implements CSSStylableElement, CSSDrawerStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDrawerStyle drawerStyle;
-	
-	public GMFCSSBasicCompartment(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.drawerStyle = new CSSDrawerStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSCollapsed(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed())){
-			return super.isCollapsed();
-		} else {
-			return drawerStyle.isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicDecorationNode.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicDecorationNode.java
deleted file mode 100644
index ac1bd65a62a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicDecorationNode.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.BasicDecorationNodeImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSBasicDecorationNode extends BasicDecorationNodeImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSBasicDecorationNode(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicSemanticCompartment.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicSemanticCompartment.java
deleted file mode 100644
index ae1788fb204..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicSemanticCompartment.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDrawerStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSBasicSemanticCompartment extends BasicSemanticCompartmentImpl implements CSSStylableElement, CSSDrawerStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDrawerStyle drawerStyle;
-	
-	public GMFCSSBasicSemanticCompartment(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.drawerStyle = new CSSDrawerStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSCollapsed(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed())){
-			return super.isCollapsed();
-		} else {
-			return drawerStyle.isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanListValueStyle.java
deleted file mode 100644
index 886f858ff09..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanListValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.BooleanListValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSBooleanListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSBooleanListValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSBooleanListValueStyle extends BooleanListValueStyleImpl implements CSSStylableElement, CSSBooleanListValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSBooleanListValueStyle booleanListValueStyle;
-	
-	public GMFCSSBooleanListValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.booleanListValueStyle = new CSSBooleanListValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return booleanListValueStyle.getCSSName();
-		}
-	}
-
-	public EList getCSSBooleanListValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getBooleanListValueStyle_BooleanListValue())){
-			return super.getBooleanListValue();
-		} else {
-			return booleanListValueStyle.getCSSBooleanListValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public EList getBooleanListValue(){
-		//return super.getBooleanListValue();
-		return getCSSBooleanListValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanValueStyle.java
deleted file mode 100644
index 83c4b8e77d7..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.BooleanValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSBooleanValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSBooleanValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSBooleanValueStyle extends BooleanValueStyleImpl implements CSSStylableElement, CSSBooleanValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSBooleanValueStyle booleanValueStyle;
-	
-	public GMFCSSBooleanValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.booleanValueStyle = new CSSBooleanValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return booleanValueStyle.getCSSName();
-		}
-	}
-
-	public boolean isCSSBooleanValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getBooleanValueStyle_BooleanValue())){
-			return super.isBooleanValue();
-		} else {
-			return booleanValueStyle.isCSSBooleanValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public boolean isBooleanValue(){
-		//return super.isBooleanValue();
-		return isCSSBooleanValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBounds.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBounds.java
deleted file mode 100644
index 1882b78e55e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBounds.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.gmf.runtime.notation.impl.BoundsImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-@SuppressWarnings("restriction")
-public class GMFCSSBounds extends BoundsImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-
-	public GMFCSSBounds(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-
-	public void normalize() {
-		normalize();
-	}
-
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-
-	public void initialize() {
-		initialize();
-	}
-
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSByteArrayValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSByteArrayValueStyle.java
deleted file mode 100644
index b13561c4049..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSByteArrayValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ByteArrayValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSByteArrayValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSByteArrayValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSByteArrayValueStyle extends ByteArrayValueStyleImpl implements CSSStylableElement, CSSByteArrayValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSByteArrayValueStyle byteArrayValueStyle;
-	
-	public GMFCSSByteArrayValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.byteArrayValueStyle = new CSSByteArrayValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return byteArrayValueStyle.getCSSName();
-		}
-	}
-
-	public byte[] getCSSByteArrayValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getByteArrayValueStyle_ByteArrayValue())){
-			return super.getByteArrayValue();
-		} else {
-			return byteArrayValueStyle.getCSSByteArrayValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public byte[] getByteArrayValue(){
-		//return super.getByteArrayValue();
-		return getCSSByteArrayValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCanonicalStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCanonicalStyle.java
deleted file mode 100644
index 3bede11120c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCanonicalStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSCanonicalStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSCanonicalStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSCanonicalStyle extends CanonicalStyleImpl implements CSSStylableElement, CSSCanonicalStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSCanonicalStyle canonicalStyle;
-	
-	public GMFCSSCanonicalStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.canonicalStyle = new CSSCanonicalStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSCanonical(){
-		if (eIsSet(NotationPackage.eINSTANCE.getCanonicalStyle_Canonical())){
-			return super.isCanonical();
-		} else {
-			return canonicalStyle.isCSSCanonical();
-		}
-	}
-
-
-	@Override
-	public boolean isCanonical(){
-		//return super.isCanonical();
-		return isCSSCanonical();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCompartment.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCompartment.java
deleted file mode 100644
index 3003cebfadb..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCompartment.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.CompartmentImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDrawerStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSCompartment extends CompartmentImpl implements CSSStylableElement, CSSDrawerStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDrawerStyle drawerStyle;
-	
-	public GMFCSSCompartment(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.drawerStyle = new CSSDrawerStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSCollapsed(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed())){
-			return super.isCollapsed();
-		} else {
-			return drawerStyle.isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnector.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnector.java
deleted file mode 100644
index cf89fccffe9..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnector.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ConnectorImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSConnectorStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSConnectorStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSConnector extends ConnectorImpl implements CSSStylableElement, CSSConnectorStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSConnectorStyle connectorStyle;
-	
-	public GMFCSSConnector(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.connectorStyle = new CSSConnectorStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius())){
-			return super.getRoundedBendpointsRadius();
-		} else {
-			return connectorStyle.getCSSRoundedBendpointsRadius();
-		}
-	}
-
-	public Routing getCSSRouting(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_Routing())){
-			return super.getRouting();
-		} else {
-			return connectorStyle.getCSSRouting();
-		}
-	}
-
-	public Smoothness getCSSSmoothness(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_Smoothness())){
-			return super.getSmoothness();
-		} else {
-			return connectorStyle.getCSSSmoothness();
-		}
-	}
-
-	public boolean isCSSAvoidObstructions(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions())){
-			return super.isAvoidObstructions();
-		} else {
-			return connectorStyle.isCSSAvoidObstructions();
-		}
-	}
-
-	public boolean isCSSClosestDistance(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance())){
-			return super.isClosestDistance();
-		} else {
-			return connectorStyle.isCSSClosestDistance();
-		}
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus())){
-			return super.getJumpLinkStatus();
-		} else {
-			return connectorStyle.getCSSJumpLinkStatus();
-		}
-	}
-
-	public JumpLinkType getCSSJumpLinkType(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType())){
-			return super.getJumpLinkType();
-		} else {
-			return connectorStyle.getCSSJumpLinkType();
-		}
-	}
-
-	public boolean isCSSJumpLinksReverse(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse())){
-			return super.isJumpLinksReverse();
-		} else {
-			return connectorStyle.isCSSJumpLinksReverse();
-		}
-	}
-
-	public int getCSSLineColor(){
-		if (eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineColor())){
-			return super.getLineColor();
-		} else {
-			return connectorStyle.getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth(){
-		if (eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineWidth())){
-			return super.getLineWidth();
-		} else {
-			return connectorStyle.getCSSLineWidth();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-	@Override
-	public Routing getRouting(){
-		//return super.getRouting();
-		return getCSSRouting();
-	}
-
-	@Override
-	public Smoothness getSmoothness(){
-		//return super.getSmoothness();
-		return getCSSSmoothness();
-	}
-
-	@Override
-	public boolean isAvoidObstructions(){
-		//return super.isAvoidObstructions();
-		return isCSSAvoidObstructions();
-	}
-
-	@Override
-	public boolean isClosestDistance(){
-		//return super.isClosestDistance();
-		return isCSSClosestDistance();
-	}
-
-	@Override
-	public JumpLinkStatus getJumpLinkStatus(){
-		//return super.getJumpLinkStatus();
-		return getCSSJumpLinkStatus();
-	}
-
-	@Override
-	public JumpLinkType getJumpLinkType(){
-		//return super.getJumpLinkType();
-		return getCSSJumpLinkType();
-	}
-
-	@Override
-	public boolean isJumpLinksReverse(){
-		//return super.isJumpLinksReverse();
-		return isCSSJumpLinksReverse();
-	}
-
-	@Override
-	public int getLineColor(){
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth(){
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnectorStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnectorStyle.java
deleted file mode 100644
index a8b5d00bd1f..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnectorStyle.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSConnectorStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSConnectorStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSConnectorStyle extends ConnectorStyleImpl implements CSSStylableElement, CSSConnectorStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSConnectorStyle connectorStyle;
-	
-	public GMFCSSConnectorStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.connectorStyle = new CSSConnectorStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius())){
-			return super.getRoundedBendpointsRadius();
-		} else {
-			return connectorStyle.getCSSRoundedBendpointsRadius();
-		}
-	}
-
-	public Routing getCSSRouting(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_Routing())){
-			return super.getRouting();
-		} else {
-			return connectorStyle.getCSSRouting();
-		}
-	}
-
-	public Smoothness getCSSSmoothness(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_Smoothness())){
-			return super.getSmoothness();
-		} else {
-			return connectorStyle.getCSSSmoothness();
-		}
-	}
-
-	public boolean isCSSAvoidObstructions(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions())){
-			return super.isAvoidObstructions();
-		} else {
-			return connectorStyle.isCSSAvoidObstructions();
-		}
-	}
-
-	public boolean isCSSClosestDistance(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance())){
-			return super.isClosestDistance();
-		} else {
-			return connectorStyle.isCSSClosestDistance();
-		}
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus())){
-			return super.getJumpLinkStatus();
-		} else {
-			return connectorStyle.getCSSJumpLinkStatus();
-		}
-	}
-
-	public JumpLinkType getCSSJumpLinkType(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType())){
-			return super.getJumpLinkType();
-		} else {
-			return connectorStyle.getCSSJumpLinkType();
-		}
-	}
-
-	public boolean isCSSJumpLinksReverse(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse())){
-			return super.isJumpLinksReverse();
-		} else {
-			return connectorStyle.isCSSJumpLinksReverse();
-		}
-	}
-
-	public int getCSSLineColor(){
-		if (eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineColor())){
-			return super.getLineColor();
-		} else {
-			return connectorStyle.getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth(){
-		if (eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineWidth())){
-			return super.getLineWidth();
-		} else {
-			return connectorStyle.getCSSLineWidth();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-	@Override
-	public Routing getRouting(){
-		//return super.getRouting();
-		return getCSSRouting();
-	}
-
-	@Override
-	public Smoothness getSmoothness(){
-		//return super.getSmoothness();
-		return getCSSSmoothness();
-	}
-
-	@Override
-	public boolean isAvoidObstructions(){
-		//return super.isAvoidObstructions();
-		return isCSSAvoidObstructions();
-	}
-
-	@Override
-	public boolean isClosestDistance(){
-		//return super.isClosestDistance();
-		return isCSSClosestDistance();
-	}
-
-	@Override
-	public JumpLinkStatus getJumpLinkStatus(){
-		//return super.getJumpLinkStatus();
-		return getCSSJumpLinkStatus();
-	}
-
-	@Override
-	public JumpLinkType getJumpLinkType(){
-		//return super.getJumpLinkType();
-		return getCSSJumpLinkType();
-	}
-
-	@Override
-	public boolean isJumpLinksReverse(){
-		//return super.isJumpLinksReverse();
-		return isCSSJumpLinksReverse();
-	}
-
-	@Override
-	public int getLineColor(){
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth(){
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDataTypeStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDataTypeStyle.java
deleted file mode 100644
index 1c8c1d95155..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDataTypeStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDataTypeStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDataTypeStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDataTypeStyle extends DataTypeStyleImpl implements CSSStylableElement, CSSDataTypeStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDataTypeStyle dataTypeStyle;
-	
-	public GMFCSSDataTypeStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.dataTypeStyle = new CSSDataTypeStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return dataTypeStyle.getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDecorationNode.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDecorationNode.java
deleted file mode 100644
index 66538ebceea..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDecorationNode.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DecorationNodeImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDecorationNode extends DecorationNodeImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSDecorationNode(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDescriptionStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDescriptionStyle.java
deleted file mode 100644
index 24a74de8182..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDescriptionStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDescriptionStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDescriptionStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDescriptionStyle extends DescriptionStyleImpl implements CSSStylableElement, CSSDescriptionStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDescriptionStyle descriptionStyle;
-	
-	public GMFCSSDescriptionStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.descriptionStyle = new CSSDescriptionStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSDescription(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDescriptionStyle_Description())){
-			return super.getDescription();
-		} else {
-			return descriptionStyle.getCSSDescription();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getDescription(){
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagram.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagram.java
deleted file mode 100644
index 03960de43b9..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagram.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.gmf.runtime.notation.impl.DiagramImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDiagram extends DiagramImpl implements CSSStylableElement {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-
-	public GMFCSSDiagram(ExtendedCSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-
-	public void normalize() {
-		normalize();
-	}
-
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-
-	public void initialize() {
-		initialize();
-	}
-
-	public void dispose() {
-		dispose();
-	}
-
-	public ExtendedCSSEngine getEngine() {
-		return engine;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramLinkStyle.java
deleted file mode 100644
index 37c48dd161f..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramLinkStyle.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDiagramLinkStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDiagramLinkStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDiagramLinkStyle extends DiagramLinkStyleImpl implements CSSStylableElement, CSSDiagramLinkStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDiagramLinkStyle diagramLinkStyle;
-	
-	public GMFCSSDiagramLinkStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.diagramLinkStyle = new CSSDiagramLinkStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramStyle.java
deleted file mode 100644
index b8e7b6215a9..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramStyle.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDiagramStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDiagramStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDiagramStyle extends DiagramStyleImpl implements CSSStylableElement, CSSDiagramStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDiagramStyle diagramStyle;
-	
-	public GMFCSSDiagramStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.diagramStyle = new CSSDiagramStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSPageX(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageX())){
-			return super.getPageX();
-		} else {
-			return diagramStyle.getCSSPageX();
-		}
-	}
-
-	public int getCSSPageY(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageY())){
-			return super.getPageY();
-		} else {
-			return diagramStyle.getCSSPageY();
-		}
-	}
-
-	public int getCSSPageWidth(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageWidth())){
-			return super.getPageWidth();
-		} else {
-			return diagramStyle.getCSSPageWidth();
-		}
-	}
-
-	public int getCSSPageHeight(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageHeight())){
-			return super.getPageHeight();
-		} else {
-			return diagramStyle.getCSSPageHeight();
-		}
-	}
-
-	public java.lang.String getCSSDescription(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDescriptionStyle_Description())){
-			return super.getDescription();
-		} else {
-			return diagramStyle.getCSSDescription();
-		}
-	}
-
-
-	@Override
-	public int getPageX(){
-		//return super.getPageX();
-		return getCSSPageX();
-	}
-
-	@Override
-	public int getPageY(){
-		//return super.getPageY();
-		return getCSSPageY();
-	}
-
-	@Override
-	public int getPageWidth(){
-		//return super.getPageWidth();
-		return getCSSPageWidth();
-	}
-
-	@Override
-	public int getPageHeight(){
-		//return super.getPageHeight();
-		return getCSSPageHeight();
-	}
-
-	@Override
-	public java.lang.String getDescription(){
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleListValueStyle.java
deleted file mode 100644
index 80f5d92aea5..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleListValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DoubleListValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDoubleListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDoubleListValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDoubleListValueStyle extends DoubleListValueStyleImpl implements CSSStylableElement, CSSDoubleListValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDoubleListValueStyle doubleListValueStyle;
-	
-	public GMFCSSDoubleListValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.doubleListValueStyle = new CSSDoubleListValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return doubleListValueStyle.getCSSName();
-		}
-	}
-
-	public EList getCSSDoubleListValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDoubleListValueStyle_DoubleListValue())){
-			return super.getDoubleListValue();
-		} else {
-			return doubleListValueStyle.getCSSDoubleListValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public EList getDoubleListValue(){
-		//return super.getDoubleListValue();
-		return getCSSDoubleListValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleValueStyle.java
deleted file mode 100644
index 0e40da9931c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DoubleValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDoubleValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDoubleValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDoubleValueStyle extends DoubleValueStyleImpl implements CSSStylableElement, CSSDoubleValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDoubleValueStyle doubleValueStyle;
-	
-	public GMFCSSDoubleValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.doubleValueStyle = new CSSDoubleValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return doubleValueStyle.getCSSName();
-		}
-	}
-
-	public double getCSSDoubleValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDoubleValueStyle_DoubleValue())){
-			return super.getDoubleValue();
-		} else {
-			return doubleValueStyle.getCSSDoubleValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public double getDoubleValue(){
-		//return super.getDoubleValue();
-		return getCSSDoubleValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDrawerStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDrawerStyle.java
deleted file mode 100644
index 6ec37571b82..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDrawerStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDrawerStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSDrawerStyle extends DrawerStyleImpl implements CSSStylableElement, CSSDrawerStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDrawerStyle drawerStyle;
-	
-	public GMFCSSDrawerStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.drawerStyle = new CSSDrawerStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSCollapsed(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed())){
-			return super.isCollapsed();
-		} else {
-			return drawerStyle.isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectListValueStyle.java
deleted file mode 100644
index 9c9dde9fc7a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectListValueStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.EObjectListValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSEObjectListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSEObjectListValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSEObjectListValueStyle extends EObjectListValueStyleImpl implements CSSStylableElement, CSSEObjectListValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSEObjectListValueStyle eObjectListValueStyle;
-	
-	public GMFCSSEObjectListValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.eObjectListValueStyle = new CSSEObjectListValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return eObjectListValueStyle.getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectValueStyle.java
deleted file mode 100644
index dc95276efc6..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectValueStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.EObjectValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSEObjectValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSEObjectValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSEObjectValueStyle extends EObjectValueStyleImpl implements CSSStylableElement, CSSEObjectValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSEObjectValueStyle eObjectValueStyle;
-	
-	public GMFCSSEObjectValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.eObjectValueStyle = new CSSEObjectValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return eObjectValueStyle.getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEdge.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEdge.java
deleted file mode 100644
index 3dc8c0e220a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEdge.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.EdgeImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSEdge extends EdgeImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSEdge(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFillStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFillStyle.java
deleted file mode 100644
index b228aaa1da8..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFillStyle.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.FillStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSFillStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSFillStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSFillStyle extends FillStyleImpl implements CSSStylableElement, CSSFillStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSFillStyle fillStyle;
-	
-	public GMFCSSFillStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.fillStyle = new CSSFillStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSFillColor(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFillStyle_FillColor())){
-			return super.getFillColor();
-		} else {
-			return fillStyle.getCSSFillColor();
-		}
-	}
-
-	public int getCSSTransparency(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFillStyle_Transparency())){
-			return super.getTransparency();
-		} else {
-			return fillStyle.getCSSTransparency();
-		}
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFillStyle_Gradient())){
-			return super.getGradient();
-		} else {
-			return fillStyle.getCSSGradient();
-		}
-	}
-
-
-	@Override
-	public int getFillColor(){
-		//return super.getFillColor();
-		return getCSSFillColor();
-	}
-
-	@Override
-	public int getTransparency(){
-		//return super.getTransparency();
-		return getCSSTransparency();
-	}
-
-	@Override
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient(){
-		//return super.getGradient();
-		return getCSSGradient();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFilteringStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFilteringStyle.java
deleted file mode 100644
index b52e814875e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFilteringStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSFilteringStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSFilteringStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSFilteringStyle extends FilteringStyleImpl implements CSSStylableElement, CSSFilteringStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSFilteringStyle filteringStyle;
-	
-	public GMFCSSFilteringStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.filteringStyle = new CSSFilteringStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public Filtering getCSSFiltering(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_Filtering())){
-			return super.getFiltering();
-		} else {
-			return filteringStyle.getCSSFiltering();
-		}
-	}
-
-	public java.util.List getCSSFilteringKeys(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys())){
-			return super.getFilteringKeys();
-		} else {
-			return filteringStyle.getCSSFilteringKeys();
-		}
-	}
-
-
-	@Override
-	public Filtering getFiltering(){
-		//return super.getFiltering();
-		return getCSSFiltering();
-	}
-
-	@Override
-	public java.util.List getFilteringKeys(){
-		//return super.getFilteringKeys();
-		return getCSSFilteringKeys();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFontStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFontStyle.java
deleted file mode 100644
index f24d0621cbb..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFontStyle.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.FontStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSFontStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSFontStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSFontStyle extends FontStyleImpl implements CSSStylableElement, CSSFontStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSFontStyle fontStyle;
-	
-	public GMFCSSFontStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.fontStyle = new CSSFontStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSFontColor(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontColor())){
-			return super.getFontColor();
-		} else {
-			return fontStyle.getCSSFontColor();
-		}
-	}
-
-	public java.lang.String getCSSFontName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontName())){
-			return super.getFontName();
-		} else {
-			return fontStyle.getCSSFontName();
-		}
-	}
-
-	public int getCSSFontHeight(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontHeight())){
-			return super.getFontHeight();
-		} else {
-			return fontStyle.getCSSFontHeight();
-		}
-	}
-
-	public boolean isCSSBold(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFontStyle_Bold())){
-			return super.isBold();
-		} else {
-			return fontStyle.isCSSBold();
-		}
-	}
-
-	public boolean isCSSItalic(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFontStyle_Italic())){
-			return super.isItalic();
-		} else {
-			return fontStyle.isCSSItalic();
-		}
-	}
-
-	public boolean isCSSUnderline(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFontStyle_Underline())){
-			return super.isUnderline();
-		} else {
-			return fontStyle.isCSSUnderline();
-		}
-	}
-
-	public boolean isCSSStrikeThrough(){
-		if (eIsSet(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough())){
-			return super.isStrikeThrough();
-		} else {
-			return fontStyle.isCSSStrikeThrough();
-		}
-	}
-
-
-	@Override
-	public int getFontColor(){
-		//return super.getFontColor();
-		return getCSSFontColor();
-	}
-
-	@Override
-	public java.lang.String getFontName(){
-		//return super.getFontName();
-		return getCSSFontName();
-	}
-
-	@Override
-	public int getFontHeight(){
-		//return super.getFontHeight();
-		return getCSSFontHeight();
-	}
-
-	@Override
-	public boolean isBold(){
-		//return super.isBold();
-		return isCSSBold();
-	}
-
-	@Override
-	public boolean isItalic(){
-		//return super.isItalic();
-		return isCSSItalic();
-	}
-
-	@Override
-	public boolean isUnderline(){
-		//return super.isUnderline();
-		return isCSSUnderline();
-	}
-
-	@Override
-	public boolean isStrikeThrough(){
-		//return super.isStrikeThrough();
-		return isCSSStrikeThrough();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuide.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuide.java
deleted file mode 100644
index 47d97061d15..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuide.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.GuideImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSGuide extends GuideImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSGuide(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuideStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuideStyle.java
deleted file mode 100644
index a30f80ce977..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuideStyle.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSGuideStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSGuideStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSGuideStyle extends GuideStyleImpl implements CSSStylableElement, CSSGuideStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSGuideStyle guideStyle;
-	
-	public GMFCSSGuideStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.guideStyle = new CSSGuideStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSHintedDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSHintedDiagramLinkStyle.java
deleted file mode 100644
index 54319b16ff7..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSHintedDiagramLinkStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSHintedDiagramLinkStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSHintedDiagramLinkStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSHintedDiagramLinkStyle extends HintedDiagramLinkStyleImpl implements CSSStylableElement, CSSHintedDiagramLinkStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSHintedDiagramLinkStyle hintedDiagramLinkStyle;
-	
-	public GMFCSSHintedDiagramLinkStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.hintedDiagramLinkStyle = new CSSHintedDiagramLinkStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSHint(){
-		if (eIsSet(NotationPackage.eINSTANCE.getHintedDiagramLinkStyle_Hint())){
-			return super.getHint();
-		} else {
-			return hintedDiagramLinkStyle.getCSSHint();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getHint(){
-		//return super.getHint();
-		return getCSSHint();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIdentityAnchor.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIdentityAnchor.java
deleted file mode 100644
index de2a55f25aa..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIdentityAnchor.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.IdentityAnchorImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSIdentityAnchor extends IdentityAnchorImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSIdentityAnchor(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImage.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImage.java
deleted file mode 100644
index fc613198fce..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImage.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ImageImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSImage extends ImageImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSImage(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageBufferStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageBufferStyle.java
deleted file mode 100644
index d014cf2e127..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageBufferStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSImageBufferStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSImageBufferStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSImageBufferStyle extends ImageBufferStyleImpl implements CSSStylableElement, CSSImageBufferStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSImageBufferStyle imageBufferStyle;
-	
-	public GMFCSSImageBufferStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.imageBufferStyle = new CSSImageBufferStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.Boolean getCSSAntiAlias(){
-		if (eIsSet(NotationPackage.eINSTANCE.getImageStyle_AntiAlias())){
-			return super.getAntiAlias();
-		} else {
-			return imageBufferStyle.getCSSAntiAlias();
-		}
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio(){
-		if (eIsSet(NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio())){
-			return super.getMaintainAspectRatio();
-		} else {
-			return imageBufferStyle.getCSSMaintainAspectRatio();
-		}
-	}
-
-
-	@Override
-	public java.lang.Boolean getAntiAlias(){
-		//return super.getAntiAlias();
-		return getCSSAntiAlias();
-	}
-
-	@Override
-	public java.lang.Boolean getMaintainAspectRatio(){
-		//return super.getMaintainAspectRatio();
-		return getCSSMaintainAspectRatio();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageStyle.java
deleted file mode 100644
index 241e1723f1b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSImageStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSImageStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSImageStyle extends ImageStyleImpl implements CSSStylableElement, CSSImageStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSImageStyle imageStyle;
-	
-	public GMFCSSImageStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.imageStyle = new CSSImageStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.Boolean getCSSAntiAlias(){
-		if (eIsSet(NotationPackage.eINSTANCE.getImageStyle_AntiAlias())){
-			return super.getAntiAlias();
-		} else {
-			return imageStyle.getCSSAntiAlias();
-		}
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio(){
-		if (eIsSet(NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio())){
-			return super.getMaintainAspectRatio();
-		} else {
-			return imageStyle.getCSSMaintainAspectRatio();
-		}
-	}
-
-
-	@Override
-	public java.lang.Boolean getAntiAlias(){
-		//return super.getAntiAlias();
-		return getCSSAntiAlias();
-	}
-
-	@Override
-	public java.lang.Boolean getMaintainAspectRatio(){
-		//return super.getMaintainAspectRatio();
-		return getCSSMaintainAspectRatio();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntListValueStyle.java
deleted file mode 100644
index bf2ba99266b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntListValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.IntListValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSIntListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSIntListValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSIntListValueStyle extends IntListValueStyleImpl implements CSSStylableElement, CSSIntListValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSIntListValueStyle intListValueStyle;
-	
-	public GMFCSSIntListValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.intListValueStyle = new CSSIntListValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return intListValueStyle.getCSSName();
-		}
-	}
-
-	public EList getCSSIntListValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getIntListValueStyle_IntListValue())){
-			return super.getIntListValue();
-		} else {
-			return intListValueStyle.getCSSIntListValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public EList getIntListValue(){
-		//return super.getIntListValue();
-		return getCSSIntListValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntValueStyle.java
deleted file mode 100644
index 89c6dbb8bc1..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.IntValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSIntValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSIntValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSIntValueStyle extends IntValueStyleImpl implements CSSStylableElement, CSSIntValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSIntValueStyle intValueStyle;
-	
-	public GMFCSSIntValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.intValueStyle = new CSSIntValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return intValueStyle.getCSSName();
-		}
-	}
-
-	public int getCSSIntValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getIntValueStyle_IntValue())){
-			return super.getIntValue();
-		} else {
-			return intValueStyle.getCSSIntValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public int getIntValue(){
-		//return super.getIntValue();
-		return getCSSIntValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineStyle.java
deleted file mode 100644
index 6407ea3ab62..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineStyle.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.LineStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSLineStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSLineStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-@SuppressWarnings("restriction")
-public class GMFCSSLineStyle extends LineStyleImpl implements CSSStylableElement, CSSLineStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSLineStyle lineStyle;
-
-	public GMFCSSLineStyle(ExtendedCSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.lineStyle = new CSSLineStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSLineColor() {
-		if(eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineColor())) {
-			return super.getLineColor();
-		} else {
-			return lineStyle.getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth() {
-		if(eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineWidth())) {
-			return super.getLineWidth();
-		} else {
-			return lineStyle.getCSSLineWidth();
-		}
-	}
-
-
-	@Override
-	public int getLineColor() {
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth() {
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-
-	public void normalize() {
-		normalize();
-	}
-
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-
-	public void initialize() {
-		initialize();
-	}
-
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineTypeStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineTypeStyle.java
deleted file mode 100644
index 38f2b9ec039..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineTypeStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSLineTypeStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSLineTypeStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSLineTypeStyle extends LineTypeStyleImpl implements CSSStylableElement, CSSLineTypeStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSLineTypeStyle lineTypeStyle;
-	
-	public GMFCSSLineTypeStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.lineTypeStyle = new CSSLineTypeStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public LineType getCSSLineType(){
-		if (eIsSet(NotationPackage.eINSTANCE.getLineTypeStyle_LineType())){
-			return super.getLineType();
-		} else {
-			return lineTypeStyle.getCSSLineType();
-		}
-	}
-
-
-	@Override
-	public LineType getLineType(){
-		//return super.getLineType();
-		return getCSSLineType();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListCompartment.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListCompartment.java
deleted file mode 100644
index 1b983f9cc6a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListCompartment.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDrawerStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSListCompartment extends ListCompartmentImpl implements CSSStylableElement, CSSDrawerStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDrawerStyle drawerStyle;
-	
-	public GMFCSSListCompartment(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.drawerStyle = new CSSDrawerStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSCollapsed(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed())){
-			return super.isCollapsed();
-		} else {
-			return drawerStyle.isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListValueStyle.java
deleted file mode 100644
index 2740eb87c0d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ListValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSListValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSListValueStyle extends ListValueStyleImpl implements CSSStylableElement, CSSListValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSListValueStyle listValueStyle;
-	
-	public GMFCSSListValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.listValueStyle = new CSSListValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return listValueStyle.getCSSName();
-		}
-	}
-
-	public EList getCSSRawValuesList(){
-		if (eIsSet(NotationPackage.eINSTANCE.getListValueStyle_RawValuesList())){
-			return super.getRawValuesList();
-		} else {
-			return listValueStyle.getCSSRawValuesList();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public EList getRawValuesList(){
-		//return super.getRawValuesList();
-		return getCSSRawValuesList();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLocation.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLocation.java
deleted file mode 100644
index ff0e3d0a802..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLocation.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.LocationImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSLocation extends LocationImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSLocation(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSMultiDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSMultiDiagramLinkStyle.java
deleted file mode 100644
index 120a14879f5..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSMultiDiagramLinkStyle.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSMultiDiagramLinkStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSMultiDiagramLinkStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSMultiDiagramLinkStyle extends MultiDiagramLinkStyleImpl implements CSSStylableElement, CSSMultiDiagramLinkStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSMultiDiagramLinkStyle multiDiagramLinkStyle;
-	
-	public GMFCSSMultiDiagramLinkStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.multiDiagramLinkStyle = new CSSMultiDiagramLinkStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNamedStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNamedStyle.java
deleted file mode 100644
index 0d0a1898df7..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNamedStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSNamedStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSNamedStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSNamedStyle extends NamedStyleImpl implements CSSStylableElement, CSSNamedStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSNamedStyle namedStyle;
-	
-	public GMFCSSNamedStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.namedStyle = new CSSNamedStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return namedStyle.getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNode.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNode.java
deleted file mode 100644
index 4355406e7e0..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNode.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.NodeImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSNode extends NodeImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSNode(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNodeEntry.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNodeEntry.java
deleted file mode 100644
index 9ea2a295cbf..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNodeEntry.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.NodeEntryImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSNodeEntry extends NodeEntryImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSNodeEntry(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPageStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPageStyle.java
deleted file mode 100644
index 8a73e85bfa0..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPageStyle.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.PageStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSPageStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSPageStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSPageStyle extends PageStyleImpl implements CSSStylableElement, CSSPageStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSPageStyle pageStyle;
-	
-	public GMFCSSPageStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.pageStyle = new CSSPageStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSPageX(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageX())){
-			return super.getPageX();
-		} else {
-			return pageStyle.getCSSPageX();
-		}
-	}
-
-	public int getCSSPageY(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageY())){
-			return super.getPageY();
-		} else {
-			return pageStyle.getCSSPageY();
-		}
-	}
-
-	public int getCSSPageWidth(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageWidth())){
-			return super.getPageWidth();
-		} else {
-			return pageStyle.getCSSPageWidth();
-		}
-	}
-
-	public int getCSSPageHeight(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageHeight())){
-			return super.getPageHeight();
-		} else {
-			return pageStyle.getCSSPageHeight();
-		}
-	}
-
-
-	@Override
-	public int getPageX(){
-		//return super.getPageX();
-		return getCSSPageX();
-	}
-
-	@Override
-	public int getPageY(){
-		//return super.getPageY();
-		return getCSSPageY();
-	}
-
-	@Override
-	public int getPageWidth(){
-		//return super.getPageWidth();
-		return getCSSPageWidth();
-	}
-
-	@Override
-	public int getPageHeight(){
-		//return super.getPageHeight();
-		return getCSSPageHeight();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPropertiesSetStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPropertiesSetStyle.java
deleted file mode 100644
index dd5e6a75dfd..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPropertiesSetStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSPropertiesSetStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSPropertiesSetStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSPropertiesSetStyle extends PropertiesSetStyleImpl implements CSSStylableElement, CSSPropertiesSetStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSPropertiesSetStyle propertiesSetStyle;
-	
-	public GMFCSSPropertiesSetStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.propertiesSetStyle = new CSSPropertiesSetStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return propertiesSetStyle.getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPropertyValue.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPropertyValue.java
deleted file mode 100644
index 78c10484540..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPropertyValue.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.PropertyValueImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSPropertyValue extends PropertyValueImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSPropertyValue(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRatio.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRatio.java
deleted file mode 100644
index 1147efc66c6..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRatio.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.RatioImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSRatio extends RatioImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSRatio(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRelativeBendpoints.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRelativeBendpoints.java
deleted file mode 100644
index bbad8a15421..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRelativeBendpoints.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.RelativeBendpointsImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSRelativeBendpoints extends RelativeBendpointsImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSRelativeBendpoints(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoundedCornersStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoundedCornersStyle.java
deleted file mode 100644
index 084f913a44e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoundedCornersStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSRoundedCornersStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSRoundedCornersStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSRoundedCornersStyle extends RoundedCornersStyleImpl implements CSSStylableElement, CSSRoundedCornersStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSRoundedCornersStyle roundedCornersStyle;
-	
-	public GMFCSSRoundedCornersStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.roundedCornersStyle = new CSSRoundedCornersStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius())){
-			return super.getRoundedBendpointsRadius();
-		} else {
-			return roundedCornersStyle.getCSSRoundedBendpointsRadius();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoutingStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoutingStyle.java
deleted file mode 100644
index e2790d2ba8b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoutingStyle.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSRoutingStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSRoutingStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSRoutingStyle extends RoutingStyleImpl implements CSSStylableElement, CSSRoutingStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSRoutingStyle routingStyle;
-	
-	public GMFCSSRoutingStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.routingStyle = new CSSRoutingStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius())){
-			return super.getRoundedBendpointsRadius();
-		} else {
-			return routingStyle.getCSSRoundedBendpointsRadius();
-		}
-	}
-
-	public Routing getCSSRouting(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_Routing())){
-			return super.getRouting();
-		} else {
-			return routingStyle.getCSSRouting();
-		}
-	}
-
-	public Smoothness getCSSSmoothness(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_Smoothness())){
-			return super.getSmoothness();
-		} else {
-			return routingStyle.getCSSSmoothness();
-		}
-	}
-
-	public boolean isCSSAvoidObstructions(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions())){
-			return super.isAvoidObstructions();
-		} else {
-			return routingStyle.isCSSAvoidObstructions();
-		}
-	}
-
-	public boolean isCSSClosestDistance(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance())){
-			return super.isClosestDistance();
-		} else {
-			return routingStyle.isCSSClosestDistance();
-		}
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus())){
-			return super.getJumpLinkStatus();
-		} else {
-			return routingStyle.getCSSJumpLinkStatus();
-		}
-	}
-
-	public JumpLinkType getCSSJumpLinkType(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType())){
-			return super.getJumpLinkType();
-		} else {
-			return routingStyle.getCSSJumpLinkType();
-		}
-	}
-
-	public boolean isCSSJumpLinksReverse(){
-		if (eIsSet(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse())){
-			return super.isJumpLinksReverse();
-		} else {
-			return routingStyle.isCSSJumpLinksReverse();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-	@Override
-	public Routing getRouting(){
-		//return super.getRouting();
-		return getCSSRouting();
-	}
-
-	@Override
-	public Smoothness getSmoothness(){
-		//return super.getSmoothness();
-		return getCSSSmoothness();
-	}
-
-	@Override
-	public boolean isAvoidObstructions(){
-		//return super.isAvoidObstructions();
-		return isCSSAvoidObstructions();
-	}
-
-	@Override
-	public boolean isClosestDistance(){
-		//return super.isClosestDistance();
-		return isCSSClosestDistance();
-	}
-
-	@Override
-	public JumpLinkStatus getJumpLinkStatus(){
-		//return super.getJumpLinkStatus();
-		return getCSSJumpLinkStatus();
-	}
-
-	@Override
-	public JumpLinkType getJumpLinkType(){
-		//return super.getJumpLinkType();
-		return getCSSJumpLinkType();
-	}
-
-	@Override
-	public boolean isJumpLinksReverse(){
-		//return super.isJumpLinksReverse();
-		return isCSSJumpLinksReverse();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSemanticListCompartment.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSemanticListCompartment.java
deleted file mode 100644
index 14cb1526d1a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSemanticListCompartment.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDrawerStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSSemanticListCompartment extends SemanticListCompartmentImpl implements CSSStylableElement, CSSDrawerStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDrawerStyle drawerStyle;
-	
-	public GMFCSSSemanticListCompartment(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.drawerStyle = new CSSDrawerStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSCollapsed(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed())){
-			return super.isCollapsed();
-		} else {
-			return drawerStyle.isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShape.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShape.java
deleted file mode 100644
index 5c258d0e332..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShape.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.ShapeImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSShapeStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSShapeStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-@SuppressWarnings("restriction")
-public class GMFCSSShape extends ShapeImpl implements CSSStylableElement, CSSShapeStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSShapeStyle shapeStyle;
-
-	public GMFCSSShape(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.shapeStyle = new CSSShapeStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSFontColor() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontColor())) {
-			return super.getFontColor();
-		} else {
-			return shapeStyle.getCSSFontColor();
-		}
-	}
-
-	public java.lang.String getCSSFontName() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontName())) {
-			return super.getFontName();
-		} else {
-			return shapeStyle.getCSSFontName();
-		}
-	}
-
-	public int getCSSFontHeight() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontHeight())) {
-			return super.getFontHeight();
-		} else {
-			return shapeStyle.getCSSFontHeight();
-		}
-	}
-
-	public boolean isCSSBold() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_Bold())) {
-			return super.isBold();
-		} else {
-			return shapeStyle.isCSSBold();
-		}
-	}
-
-	public boolean isCSSItalic() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_Italic())) {
-			return super.isItalic();
-		} else {
-			return shapeStyle.isCSSItalic();
-		}
-	}
-
-	public boolean isCSSUnderline() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_Underline())) {
-			return super.isUnderline();
-		} else {
-			return shapeStyle.isCSSUnderline();
-		}
-	}
-
-	public boolean isCSSStrikeThrough() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough())) {
-			return super.isStrikeThrough();
-		} else {
-			return shapeStyle.isCSSStrikeThrough();
-		}
-	}
-
-	public java.lang.String getCSSDescription() {
-		if(eIsSet(NotationPackage.eINSTANCE.getDescriptionStyle_Description())) {
-			return super.getDescription();
-		} else {
-			return shapeStyle.getCSSDescription();
-		}
-	}
-
-	public int getCSSFillColor() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFillStyle_FillColor())) {
-			return super.getFillColor();
-		} else {
-			return shapeStyle.getCSSFillColor();
-		}
-	}
-
-	public int getCSSTransparency() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFillStyle_Transparency())) {
-			return super.getTransparency();
-		} else {
-			return shapeStyle.getCSSTransparency();
-		}
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFillStyle_Gradient())) {
-			return super.getGradient();
-		} else {
-			return shapeStyle.getCSSGradient();
-		}
-	}
-
-	public int getCSSLineColor() {
-		if(eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineColor())) {
-			return super.getLineColor();
-		} else {
-			return shapeStyle.getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth() {
-		if(eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineWidth())) {
-			return super.getLineWidth();
-		} else {
-			return shapeStyle.getCSSLineWidth();
-		}
-	}
-
-	public int getCSSRoundedBendpointsRadius() {
-		if(eIsSet(NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius())) {
-			return super.getRoundedBendpointsRadius();
-		} else {
-			return shapeStyle.getCSSRoundedBendpointsRadius();
-		}
-	}
-
-
-	@Override
-	public int getFontColor() {
-		//return super.getFontColor();
-		return getCSSFontColor();
-	}
-
-	@Override
-	public java.lang.String getFontName() {
-		//return super.getFontName();
-		return getCSSFontName();
-	}
-
-	@Override
-	public int getFontHeight() {
-		//return super.getFontHeight();
-		return getCSSFontHeight();
-	}
-
-	@Override
-	public boolean isBold() {
-		//return super.isBold();
-		return isCSSBold();
-	}
-
-	@Override
-	public boolean isItalic() {
-		//return super.isItalic();
-		return isCSSItalic();
-	}
-
-	@Override
-	public boolean isUnderline() {
-		//return super.isUnderline();
-		return isCSSUnderline();
-	}
-
-	@Override
-	public boolean isStrikeThrough() {
-		//return super.isStrikeThrough();
-		return isCSSStrikeThrough();
-	}
-
-	@Override
-	public java.lang.String getDescription() {
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-	@Override
-	public int getFillColor() {
-		//return super.getFillColor();
-		return getCSSFillColor();
-	}
-
-	@Override
-	public int getTransparency() {
-		//return super.getTransparency();
-		return getCSSTransparency();
-	}
-
-	@Override
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient() {
-		//return super.getGradient();
-		return getCSSGradient();
-	}
-
-	@Override
-	public int getLineColor() {
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth() {
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-	@Override
-	public int getRoundedBendpointsRadius() {
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-	public boolean getCSSElementIcon() {
-		return shapeStyle.getCSSElementIcon();
-	}
-
-	public boolean getCSSShadow() {
-		return shapeStyle.getCSSShadow();
-	}
-
-	public int getCSSQualifiedNameDepth() {
-		return shapeStyle.getCSSQualifiedNameDepth();
-	}
-
-	public String getCSSStereotypeDisplay() {
-		return shapeStyle.getCSSStereotypeDisplay();
-	}
-
-	public String getCSSTextAlignment() {
-		return shapeStyle.getCSSTextAlignment();
-	}
-
-	public String getCSSDisplayPlace() {
-		return shapeStyle.getCSSDisplayPlace();
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-
-	public void setAttribute(String name, String value) throws DOMException {
-		cssAdapter.setAttribute(name, value);
-	}
-
-	public void removeAttribute(String name) throws DOMException {
-		cssAdapter.removeAttribute(name);
-	}
-
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		cssAdapter.setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		cssAdapter.removeAttributeNS(namespaceURI, localName);
-	}
-
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		cssAdapter.setIdAttribute(name, isId);
-	}
-
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		cssAdapter.setIdAttributeNS(namespaceURI, localName, isId);
-	}
-
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		cssAdapter.setIdAttributeNode(idAttr, isId);
-	}
-
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		cssAdapter.setNodeValue(nodeValue);
-	}
-
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-
-	public void normalize() {
-		cssAdapter.normalize();
-	}
-
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		cssAdapter.setPrefix(prefix);
-	}
-
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		cssAdapter.copyDefaultStyleDeclarations(stylableElement);
-	}
-
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		cssAdapter.setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-
-	public void onStylesApplied(NodeList nodes) {
-		cssAdapter.onStylesApplied(nodes);
-	}
-
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-
-	public void initialize() {
-		cssAdapter.initialize();
-	}
-
-	public void dispose() {
-		cssAdapter.dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShapeStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShapeStyle.java
deleted file mode 100644
index 05bfb67c9d8..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShapeStyle.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSShapeStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSShapeStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-@SuppressWarnings("restriction")
-public class GMFCSSShapeStyle extends ShapeStyleImpl implements CSSStylableElement, CSSShapeStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSShapeStyle shapeStyle;
-
-	public GMFCSSShapeStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.shapeStyle = new CSSShapeStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSFontColor() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontColor())) {
-			return super.getFontColor();
-		} else {
-			return shapeStyle.getCSSFontColor();
-		}
-	}
-
-	public java.lang.String getCSSFontName() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontName())) {
-			return super.getFontName();
-		} else {
-			return shapeStyle.getCSSFontName();
-		}
-	}
-
-	public int getCSSFontHeight() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_FontHeight())) {
-			return super.getFontHeight();
-		} else {
-			return shapeStyle.getCSSFontHeight();
-		}
-	}
-
-	public boolean isCSSBold() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_Bold())) {
-			return super.isBold();
-		} else {
-			return shapeStyle.isCSSBold();
-		}
-	}
-
-	public boolean isCSSItalic() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_Italic())) {
-			return super.isItalic();
-		} else {
-			return shapeStyle.isCSSItalic();
-		}
-	}
-
-	public boolean isCSSUnderline() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_Underline())) {
-			return super.isUnderline();
-		} else {
-			return shapeStyle.isCSSUnderline();
-		}
-	}
-
-	public boolean isCSSStrikeThrough() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough())) {
-			return super.isStrikeThrough();
-		} else {
-			return shapeStyle.isCSSStrikeThrough();
-		}
-	}
-
-	public java.lang.String getCSSDescription() {
-		if(eIsSet(NotationPackage.eINSTANCE.getDescriptionStyle_Description())) {
-			return super.getDescription();
-		} else {
-			return shapeStyle.getCSSDescription();
-		}
-	}
-
-	public int getCSSFillColor() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFillStyle_FillColor())) {
-			return super.getFillColor();
-		} else {
-			return shapeStyle.getCSSFillColor();
-		}
-	}
-
-	public int getCSSTransparency() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFillStyle_Transparency())) {
-			return super.getTransparency();
-		} else {
-			return shapeStyle.getCSSTransparency();
-		}
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient() {
-		if(eIsSet(NotationPackage.eINSTANCE.getFillStyle_Gradient())) {
-			return super.getGradient();
-		} else {
-			return shapeStyle.getCSSGradient();
-		}
-	}
-
-	public int getCSSLineColor() {
-		if(eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineColor())) {
-			return super.getLineColor();
-		} else {
-			return shapeStyle.getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth() {
-		if(eIsSet(NotationPackage.eINSTANCE.getLineStyle_LineWidth())) {
-			return super.getLineWidth();
-		} else {
-			return shapeStyle.getCSSLineWidth();
-		}
-	}
-
-	public int getCSSRoundedBendpointsRadius() {
-		if(eIsSet(NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius())) {
-			return super.getRoundedBendpointsRadius();
-		} else {
-			return shapeStyle.getCSSRoundedBendpointsRadius();
-		}
-	}
-
-	public boolean getCSSElementIcon() {
-		return shapeStyle.getCSSElementIcon();
-	}
-
-	public boolean getCSSShadow() {
-		return shapeStyle.getCSSShadow();
-	}
-
-	public int getCSSQualifiedNameDepth() {
-		return shapeStyle.getCSSQualifiedNameDepth();
-	}
-
-	public String getCSSStereotypeDisplay() {
-		return shapeStyle.getCSSStereotypeDisplay();
-	}
-
-	public String getCSSTextAlignment() {
-		return shapeStyle.getCSSTextAlignment();
-	}
-
-	public String getCSSDisplayPlace() {
-		return shapeStyle.getCSSDisplayPlace();
-	}
-
-
-	@Override
-	public int getFontColor() {
-		//return super.getFontColor();
-		return getCSSFontColor();
-	}
-
-	@Override
-	public java.lang.String getFontName() {
-		//return super.getFontName();
-		return getCSSFontName();
-	}
-
-	@Override
-	public int getFontHeight() {
-		//return super.getFontHeight();
-		return getCSSFontHeight();
-	}
-
-	@Override
-	public boolean isBold() {
-		//return super.isBold();
-		return isCSSBold();
-	}
-
-	@Override
-	public boolean isItalic() {
-		//return super.isItalic();
-		return isCSSItalic();
-	}
-
-	@Override
-	public boolean isUnderline() {
-		//return super.isUnderline();
-		return isCSSUnderline();
-	}
-
-	@Override
-	public boolean isStrikeThrough() {
-		//return super.isStrikeThrough();
-		return isCSSStrikeThrough();
-	}
-
-	@Override
-	public java.lang.String getDescription() {
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-	@Override
-	public int getFillColor() {
-		//return super.getFillColor();
-		return getCSSFillColor();
-	}
-
-	@Override
-	public int getTransparency() {
-		//return super.getTransparency();
-		return getCSSTransparency();
-	}
-
-	@Override
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient() {
-		//return super.getGradient();
-		return getCSSGradient();
-	}
-
-	@Override
-	public int getLineColor() {
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth() {
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-	@Override
-	public int getRoundedBendpointsRadius() {
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-
-	public void normalize() {
-		normalize();
-	}
-
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-
-	public void initialize() {
-		initialize();
-	}
-
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSingleValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSingleValueStyle.java
deleted file mode 100644
index 91519fb1343..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSingleValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.SingleValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSSingleValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSSingleValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSSingleValueStyle extends SingleValueStyleImpl implements CSSStylableElement, CSSSingleValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSSingleValueStyle singleValueStyle;
-	
-	public GMFCSSSingleValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.singleValueStyle = new CSSSingleValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return singleValueStyle.getCSSName();
-		}
-	}
-
-	public java.lang.String getCSSRawValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getSingleValueStyle_RawValue())){
-			return super.getRawValue();
-		} else {
-			return singleValueStyle.getCSSRawValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public java.lang.String getRawValue(){
-		//return super.getRawValue();
-		return getCSSRawValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSize.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSize.java
deleted file mode 100644
index 9423afbbb71..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSize.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.SizeImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSSize extends SizeImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSSize(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSortingStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSortingStyle.java
deleted file mode 100644
index f7954f8e8ee..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSortingStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSSortingStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSSortingStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSSortingStyle extends SortingStyleImpl implements CSSStylableElement, CSSSortingStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSSortingStyle sortingStyle;
-	
-	public GMFCSSSortingStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.sortingStyle = new CSSSortingStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public Sorting getCSSSorting(){
-		if (eIsSet(NotationPackage.eINSTANCE.getSortingStyle_Sorting())){
-			return super.getSorting();
-		} else {
-			return sortingStyle.getCSSSorting();
-		}
-	}
-
-	public java.util.Map getCSSSortingKeys(){
-		if (eIsSet(NotationPackage.eINSTANCE.getSortingStyle_SortingKeys())){
-			return super.getSortingKeys();
-		} else {
-			return sortingStyle.getCSSSortingKeys();
-		}
-	}
-
-
-	@Override
-	public Sorting getSorting(){
-		//return super.getSorting();
-		return getCSSSorting();
-	}
-
-	@Override
-	public java.util.Map getSortingKeys(){
-		//return super.getSortingKeys();
-		return getCSSSortingKeys();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStandardDiagram.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStandardDiagram.java
deleted file mode 100644
index 374ba2974b7..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStandardDiagram.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSDiagramStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSDiagramStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSStandardDiagram extends StandardDiagramImpl implements CSSStylableElement, CSSDiagramStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSDiagramStyle diagramStyle;
-	
-	public GMFCSSStandardDiagram(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.diagramStyle = new CSSDiagramStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public int getCSSPageX(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageX())){
-			return super.getPageX();
-		} else {
-			return diagramStyle.getCSSPageX();
-		}
-	}
-
-	public int getCSSPageY(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageY())){
-			return super.getPageY();
-		} else {
-			return diagramStyle.getCSSPageY();
-		}
-	}
-
-	public int getCSSPageWidth(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageWidth())){
-			return super.getPageWidth();
-		} else {
-			return diagramStyle.getCSSPageWidth();
-		}
-	}
-
-	public int getCSSPageHeight(){
-		if (eIsSet(NotationPackage.eINSTANCE.getPageStyle_PageHeight())){
-			return super.getPageHeight();
-		} else {
-			return diagramStyle.getCSSPageHeight();
-		}
-	}
-
-	public java.lang.String getCSSDescription(){
-		if (eIsSet(NotationPackage.eINSTANCE.getDescriptionStyle_Description())){
-			return super.getDescription();
-		} else {
-			return diagramStyle.getCSSDescription();
-		}
-	}
-
-
-	@Override
-	public int getPageX(){
-		//return super.getPageX();
-		return getCSSPageX();
-	}
-
-	@Override
-	public int getPageY(){
-		//return super.getPageY();
-		return getCSSPageY();
-	}
-
-	@Override
-	public int getPageWidth(){
-		//return super.getPageWidth();
-		return getCSSPageWidth();
-	}
-
-	@Override
-	public int getPageHeight(){
-		//return super.getPageHeight();
-		return getCSSPageHeight();
-	}
-
-	@Override
-	public java.lang.String getDescription(){
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringListValueStyle.java
deleted file mode 100644
index 590322b4140..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringListValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.StringListValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSStringListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSStringListValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSStringListValueStyle extends StringListValueStyleImpl implements CSSStylableElement, CSSStringListValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSStringListValueStyle stringListValueStyle;
-	
-	public GMFCSSStringListValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.stringListValueStyle = new CSSStringListValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return stringListValueStyle.getCSSName();
-		}
-	}
-
-	public EList getCSSStringListValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getStringListValueStyle_StringListValue())){
-			return super.getStringListValue();
-		} else {
-			return stringListValueStyle.getCSSStringListValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public EList getStringListValue(){
-		//return super.getStringListValue();
-		return getCSSStringListValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringToPropertyValueMapEntry.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringToPropertyValueMapEntry.java
deleted file mode 100644
index d52da80dfc2..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringToPropertyValueMapEntry.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.StringToPropertyValueMapEntryImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSStringToPropertyValueMapEntry extends StringToPropertyValueMapEntryImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSStringToPropertyValueMapEntry(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringValueStyle.java
deleted file mode 100644
index e502f1c0d46..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringValueStyle.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.StringValueStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSStringValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSStringValueStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSStringValueStyle extends StringValueStyleImpl implements CSSStylableElement, CSSStringValueStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSStringValueStyle stringValueStyle;
-	
-	public GMFCSSStringValueStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.stringValueStyle = new CSSStringValueStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		if (eIsSet(NotationPackage.eINSTANCE.getNamedStyle_Name())){
-			return super.getName();
-		} else {
-			return stringValueStyle.getCSSName();
-		}
-	}
-
-	public java.lang.String getCSSStringValue(){
-		if (eIsSet(NotationPackage.eINSTANCE.getStringValueStyle_StringValue())){
-			return super.getStringValue();
-		} else {
-			return stringValueStyle.getCSSStringValue();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-	@Override
-	public java.lang.String getStringValue(){
-		//return super.getStringValue();
-		return getCSSStringValue();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTextStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTextStyle.java
deleted file mode 100644
index 117d4cd73dd..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTextStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.TextStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSTextStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSTextStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSTextStyle extends TextStyleImpl implements CSSStylableElement, CSSTextStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSTextStyle textStyle;
-	
-	public GMFCSSTextStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.textStyle = new CSSTextStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public TextAlignment getCSSTextAlignment(){
-		if (eIsSet(NotationPackage.eINSTANCE.getTextStyle_TextAlignment())){
-			return super.getTextAlignment();
-		} else {
-			return textStyle.getCSSTextAlignment();
-		}
-	}
-
-
-	@Override
-	public TextAlignment getTextAlignment(){
-		//return super.getTextAlignment();
-		return getCSSTextAlignment();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTitleStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTitleStyle.java
deleted file mode 100644
index 31a5c5e9754..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTitleStyle.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSTitleStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl.CSSTitleStyleImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSTitleStyle extends TitleStyleImpl implements CSSStylableElement, CSSTitleStyle {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	private CSSTitleStyle titleStyle;
-	
-	public GMFCSSTitleStyle(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-		this.titleStyle = new CSSTitleStyleImpl(this, this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-	public boolean isCSSShowTitle(){
-		if (eIsSet(NotationPackage.eINSTANCE.getTitleStyle_ShowTitle())){
-			return super.isShowTitle();
-		} else {
-			return titleStyle.isCSSShowTitle();
-		}
-	}
-
-
-	@Override
-	public boolean isShowTitle(){
-		//return super.isShowTitle();
-		return isCSSShowTitle();
-	}
-
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSView.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSView.java
deleted file mode 100644
index 66d0d9a67ee..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSView.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.dom.CSSExtendedProperties;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSExtendedPropertiesImpl;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.gmf.runtime.notation.impl.ViewImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom.GMFCSSAdapter;
-
-@SuppressWarnings("restriction")
-public class GMFCSSView extends ViewImpl implements CSSStylableElement {
-
-	protected CSSEngine engine;
-
-	private CSSStylableElement cssAdapter;
-
-	
-	public GMFCSSView(CSSEngine engine) {
-		this.engine = engine;
-		this.cssAdapter = new GMFCSSAdapter(this, engine);
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards all calls to cssAdapter	//
-	//////////////////////////////////////////
-
-	public String getTagName() {
-		return cssAdapter.getTagName();
-	}
-	
-	public String getAttribute(String name) {
-		return cssAdapter.getAttribute(name);
-	}
-	
-	public void setAttribute(String name, String value) throws DOMException {
-		setAttribute(name, value);
-	}
-	
-	public void removeAttribute(String name) throws DOMException {
-		removeAttribute(name);
-	}
-	
-	public Attr getAttributeNode(String name) {
-		return cssAdapter.getAttributeNode(name);
-	}
-	
-	public Attr setAttributeNode(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNode(newAttr);
-	}
-	
-	public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-		return cssAdapter.removeAttributeNode(oldAttr);
-	}
-	
-	public NodeList getElementsByTagName(String name) {
-		return cssAdapter.getElementsByTagName(name);
-	}
-	
-	public String getAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNS(namespaceURI, localName);
-	}
-	
-	public void setAttributeNS(String namespaceURI, String qualifiedName, String value) throws DOMException {
-		setAttributeNS(namespaceURI, qualifiedName, value);
-	}
-	
-	public void removeAttributeNS(String namespaceURI, String localName) throws DOMException {
-		removeAttributeNS(namespaceURI, localName);
-	}
-	
-	public Attr getAttributeNodeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getAttributeNodeNS(namespaceURI, localName);
-	}
-	
-	public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-		return cssAdapter.setAttributeNodeNS(newAttr);
-	}
-	
-	public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.getElementsByTagNameNS(namespaceURI, localName);
-	}
-	
-	public boolean hasAttribute(String name) {
-		return cssAdapter.hasAttribute(name);
-	}
-	
-	public boolean hasAttributeNS(String namespaceURI, String localName) throws DOMException {
-		return cssAdapter.hasAttributeNS(namespaceURI, localName);
-	}
-	
-	public TypeInfo getSchemaTypeInfo() {
-		return cssAdapter.getSchemaTypeInfo();
-	}
-	
-	public void setIdAttribute(String name, boolean isId) throws DOMException {
-		setIdAttribute(name, isId);
-	}
-	
-	public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
-		setIdAttributeNS(namespaceURI, localName, isId);
-	}
-	
-	public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
-		setIdAttributeNode(idAttr, isId);
-	}
-	
-	public String getNodeName() {
-		return cssAdapter.getNodeName();
-	}
-	
-	public String getNodeValue() throws DOMException {
-		return cssAdapter.getNodeValue();
-	}
-	
-	public void setNodeValue(String nodeValue) throws DOMException {
-		setNodeValue(nodeValue);
-	}
-	
-	public short getNodeType() {
-		return cssAdapter.getNodeType();
-	}
-	
-	public Node getParentNode() {
-		return cssAdapter.getParentNode();
-	}
-	
-	public NodeList getChildNodes() {
-		return cssAdapter.getChildNodes();
-	}
-	
-	public Node getFirstChild() {
-		return cssAdapter.getFirstChild();
-	}
-	
-	public Node getLastChild() {
-		return cssAdapter.getLastChild();
-	}
-	
-	public Node getPreviousSibling() {
-		return cssAdapter.getPreviousSibling();
-	}
-	
-	public Node getNextSibling() {
-		return cssAdapter.getNextSibling();
-	}
-	
-	public NamedNodeMap getAttributes() {
-		return cssAdapter.getAttributes();
-	}
-	
-	public Document getOwnerDocument() {
-		return cssAdapter.getOwnerDocument();
-	}
-	
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return cssAdapter.insertBefore(newChild, refChild);
-	}
-	
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return cssAdapter.replaceChild(newChild, oldChild);
-	}
-	
-	public Node removeChild(Node oldChild) throws DOMException {
-		return cssAdapter.removeChild(oldChild);
-	}
-	
-	public Node appendChild(Node newChild) throws DOMException {
-		return cssAdapter.appendChild(newChild);
-	}
-	
-	public boolean hasChildNodes() {
-		return cssAdapter.hasChildNodes();
-	}
-	
-	public Node cloneNode(boolean deep) {
-		return cssAdapter.cloneNode(deep);
-	}
-	
-	public void normalize() {
-		normalize();
-	}
-	
-	public boolean isSupported(String feature, String version) {
-		return cssAdapter.isSupported(feature, version);
-	}
-	
-	public String getNamespaceURI() {
-		return cssAdapter.getNamespaceURI();
-	}
-	
-	public String getPrefix() {
-		return cssAdapter.getPrefix();
-	}
-	
-	public void setPrefix(String prefix) throws DOMException {
-		setPrefix(prefix);
-	}
-	
-	public String getLocalName() {
-		return cssAdapter.getLocalName();
-	}
-	
-	public boolean hasAttributes() {
-		return cssAdapter.hasAttributes();
-	}
-	
-	public String getBaseURI() {
-		return cssAdapter.getBaseURI();
-	}
-	
-	public short compareDocumentPosition(Node other) throws DOMException {
-		return cssAdapter.compareDocumentPosition(other);
-	}
-	
-	public String getTextContent() throws DOMException {
-		return cssAdapter.getTextContent();
-	}
-	
-	public void setTextContent(String textContent) throws DOMException {
-		setTextContent(textContent);
-	}
-	
-	public boolean isSameNode(Node other) {
-		return cssAdapter.isSameNode(other);
-	}
-	
-	public String lookupPrefix(String namespaceURI) {
-		return cssAdapter.lookupPrefix(namespaceURI);
-	}
-	
-	public boolean isDefaultNamespace(String namespaceURI) {
-		return cssAdapter.isDefaultNamespace(namespaceURI);
-	}
-	
-	public String lookupNamespaceURI(String prefix) {
-		return cssAdapter.lookupNamespaceURI(prefix);
-	}
-	
-	public boolean isEqualNode(Node arg) {
-		return cssAdapter.isEqualNode(arg);
-	}
-	
-	public Object getFeature(String feature, String version) {
-		return cssAdapter.getFeature(feature, version);
-	}
-	
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		return cssAdapter.setUserData(key, data, handler);
-	}
-	
-	public Object getUserData(String key) {
-		return cssAdapter.getUserData(key);
-	}
-	
-	public Object getNativeWidget() {
-		return cssAdapter.getNativeWidget();
-	}
-	
-	public String getCSSId() {
-		return cssAdapter.getCSSId();
-	}
-	
-	public String getCSSClass() {
-		return cssAdapter.getCSSClass();
-	}
-	
-	public String getCSSStyle() {
-		return cssAdapter.getCSSStyle();
-	}
-	
-	public CSSStyleDeclaration getDefaultStyleDeclaration(String pseudoE) {
-		return cssAdapter.getDefaultStyleDeclaration(pseudoE);
-	}
-	
-	public void copyDefaultStyleDeclarations(CSSStylableElement stylableElement) {
-		copyDefaultStyleDeclarations(stylableElement);
-	}
-	
-	public void setDefaultStyleDeclaration(String pseudoE, CSSStyleDeclaration defaultStyleDeclaration) {
-		setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration);
-	}
-	
-	public boolean isPseudoInstanceOf(String s) {
-		return cssAdapter.isPseudoInstanceOf(s);
-	}
-	
-	public String[] getStaticPseudoInstances() {
-		return cssAdapter.getStaticPseudoInstances();
-	}
-	
-	public boolean isStaticPseudoInstance(String s) {
-		return cssAdapter.isStaticPseudoInstance(s);
-	}
-	
-	public void onStylesApplied(NodeList nodes) {
-		onStylesApplied(nodes);
-	}
-	
-	public CSSExtendedProperties getStyle() {
-		return cssAdapter.getStyle();
-	}
-	
-	public void initialize() {
-		initialize();
-	}
-	
-	public void dispose() {
-		dispose();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/factory/GMFCSSFactory.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/factory/GMFCSSFactory.java
deleted file mode 100644
index eabfb695c94..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/factory/GMFCSSFactory.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.factory;
-
-import org.eclipse.gmf.runtime.notation.ArrowStyle;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.BasicDecorationNode;
-import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
-import org.eclipse.gmf.runtime.notation.BooleanListValueStyle;
-import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.ByteArrayValueStyle;
-import org.eclipse.gmf.runtime.notation.CanonicalStyle;
-import org.eclipse.gmf.runtime.notation.Compartment;
-import org.eclipse.gmf.runtime.notation.Connector;
-import org.eclipse.gmf.runtime.notation.ConnectorStyle;
-import org.eclipse.gmf.runtime.notation.DataTypeStyle;
-import org.eclipse.gmf.runtime.notation.DecorationNode;
-import org.eclipse.gmf.runtime.notation.DescriptionStyle;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.DiagramLinkStyle;
-import org.eclipse.gmf.runtime.notation.DiagramStyle;
-import org.eclipse.gmf.runtime.notation.DoubleListValueStyle;
-import org.eclipse.gmf.runtime.notation.DoubleValueStyle;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;
-import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.FilteringStyle;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.GuideStyle;
-import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
-import org.eclipse.gmf.runtime.notation.IdentityAnchor;
-import org.eclipse.gmf.runtime.notation.Image;
-import org.eclipse.gmf.runtime.notation.ImageBufferStyle;
-import org.eclipse.gmf.runtime.notation.ImageStyle;
-import org.eclipse.gmf.runtime.notation.IntListValueStyle;
-import org.eclipse.gmf.runtime.notation.IntValueStyle;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.LineTypeStyle;
-import org.eclipse.gmf.runtime.notation.ListCompartment;
-import org.eclipse.gmf.runtime.notation.ListValueStyle;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle;
-import org.eclipse.gmf.runtime.notation.NamedStyle;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.PageStyle;
-import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
-import org.eclipse.gmf.runtime.notation.PropertyValue;
-import org.eclipse.gmf.runtime.notation.Ratio;
-import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.gmf.runtime.notation.SemanticListCompartment;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.SingleValueStyle;
-import org.eclipse.gmf.runtime.notation.Size;
-import org.eclipse.gmf.runtime.notation.SortingStyle;
-import org.eclipse.gmf.runtime.notation.StandardDiagram;
-import org.eclipse.gmf.runtime.notation.StringListValueStyle;
-import org.eclipse.gmf.runtime.notation.StringValueStyle;
-import org.eclipse.gmf.runtime.notation.TextStyle;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.gmf.runtime.notation.impl.NotationFactoryImpl;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSArrowStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSBasicCompartment;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSBasicDecorationNode;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSBasicSemanticCompartment;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSBooleanListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSBooleanValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSBounds;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSByteArrayValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSCanonicalStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSCompartment;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSConnector;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSConnectorStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDataTypeStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDecorationNode;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDescriptionStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDiagram;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDiagramLinkStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDiagramStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDoubleListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDoubleValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDrawerStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSEObjectListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSEObjectValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSEdge;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSFillStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSFilteringStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSFontStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSGuide;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSGuideStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSHintedDiagramLinkStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSIdentityAnchor;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSImage;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSImageBufferStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSImageStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSIntListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSIntValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSLineStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSLineTypeStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSListCompartment;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSLocation;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSMultiDiagramLinkStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSNamedStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSNode;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSNodeEntry;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSPageStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSPropertiesSetStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSPropertyValue;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSRatio;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSRelativeBendpoints;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSRoundedCornersStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSRoutingStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSSemanticListCompartment;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSShape;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSShapeStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSSingleValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSSize;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSSortingStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSStandardDiagram;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSStringListValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSStringToPropertyValueMapEntry;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSStringValueStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSTextStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSTitleStyle;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-
-public class GMFCSSFactory extends NotationFactoryImpl {
-
-	public static GMFCSSFactory getInstance() {
-		return (GMFCSSFactory)NotationFactory.eINSTANCE;
-	}
-
-	@Override
-	public Edge createEdge() {
-		Edge edge = new GMFCSSEdge(getCSSEngine());
-		return edge;
-	}
-
-
-	@Override
-	public Node createNode() {
-		Node node = new GMFCSSNode(getCSSEngine());
-		return node;
-	}
-
-
-	@Override
-	public FillStyle createFillStyle() {
-		FillStyle fillStyle = new GMFCSSFillStyle(getCSSEngine());
-		return fillStyle;
-	}
-
-
-	@Override
-	public LineStyle createLineStyle() {
-		LineStyle lineStyle = new GMFCSSLineStyle(getCSSEngine());
-		return lineStyle;
-	}
-
-
-	@Override
-	public FontStyle createFontStyle() {
-		FontStyle fontStyle = new GMFCSSFontStyle(getCSSEngine());
-		return fontStyle;
-	}
-
-
-	@Override
-	public TitleStyle createTitleStyle() {
-		TitleStyle titleStyle = new GMFCSSTitleStyle(getCSSEngine());
-		return titleStyle;
-	}
-
-
-	@Override
-	public SortingStyle createSortingStyle() {
-		SortingStyle sortingStyle = new GMFCSSSortingStyle(getCSSEngine());
-		return sortingStyle;
-	}
-
-
-	@Override
-	public DescriptionStyle createDescriptionStyle() {
-		DescriptionStyle descriptionStyle = new GMFCSSDescriptionStyle(getCSSEngine());
-		return descriptionStyle;
-	}
-
-
-	@Override
-	public Size createSize() {
-		Size size = new GMFCSSSize(getCSSEngine());
-		return size;
-	}
-
-
-	@Override
-	public Location createLocation() {
-		Location location = new GMFCSSLocation(getCSSEngine());
-		return location;
-	}
-
-
-	@Override
-	public Bounds createBounds() {
-		Bounds bounds = new GMFCSSBounds(getCSSEngine());
-		return bounds;
-	}
-
-
-	@Override
-	public Ratio createRatio() {
-		Ratio ratio = new GMFCSSRatio(getCSSEngine());
-		return ratio;
-	}
-
-
-	@Override
-	public IdentityAnchor createIdentityAnchor() {
-		IdentityAnchor identityAnchor = new GMFCSSIdentityAnchor(getCSSEngine());
-		return identityAnchor;
-	}
-
-
-	@Override
-	public RoutingStyle createRoutingStyle() {
-		RoutingStyle routingStyle = new GMFCSSRoutingStyle(getCSSEngine());
-		return routingStyle;
-	}
-
-
-	@Override
-	public RelativeBendpoints createRelativeBendpoints() {
-		RelativeBendpoints relativeBendpoints = new GMFCSSRelativeBendpoints(getCSSEngine());
-		return relativeBendpoints;
-	}
-
-
-	@Override
-	public Diagram createDiagram() {
-		Diagram diagram = new GMFCSSDiagram(getCSSEngine());
-		return diagram;
-	}
-
-
-	@Override
-	public Image createImage() {
-		Image image = new GMFCSSImage(getCSSEngine());
-		return image;
-	}
-
-
-	@Override
-	public CanonicalStyle createCanonicalStyle() {
-		CanonicalStyle canonicalStyle = new GMFCSSCanonicalStyle(getCSSEngine());
-		return canonicalStyle;
-	}
-
-
-	@Override
-	public ShapeStyle createShapeStyle() {
-		ShapeStyle shapeStyle = new GMFCSSShapeStyle(getCSSEngine());
-		return shapeStyle;
-	}
-
-
-	@Override
-	public ConnectorStyle createConnectorStyle() {
-		ConnectorStyle connectorStyle = new GMFCSSConnectorStyle(getCSSEngine());
-		return connectorStyle;
-	}
-
-
-	@Override
-	public PageStyle createPageStyle() {
-		PageStyle pageStyle = new GMFCSSPageStyle(getCSSEngine());
-		return pageStyle;
-	}
-
-
-	@Override
-	public DrawerStyle createDrawerStyle() {
-		DrawerStyle drawerStyle = new GMFCSSDrawerStyle(getCSSEngine());
-		return drawerStyle;
-	}
-
-
-	@Override
-	public GuideStyle createGuideStyle() {
-		GuideStyle guideStyle = new GMFCSSGuideStyle(getCSSEngine());
-		return guideStyle;
-	}
-
-
-	@Override
-	public Guide createGuide() {
-		Guide guide = new GMFCSSGuide(getCSSEngine());
-		return guide;
-	}
-
-
-	@Override
-	public java.util.Map.Entry createNodeEntry() {
-		java.util.Map.Entry nodeEntry = new GMFCSSNodeEntry(getCSSEngine());
-		return nodeEntry;
-	}
-
-
-	@Override
-	public FilteringStyle createFilteringStyle() {
-		FilteringStyle filteringStyle = new GMFCSSFilteringStyle(getCSSEngine());
-		return filteringStyle;
-	}
-
-
-	@Override
-	public DiagramStyle createDiagramStyle() {
-		DiagramStyle diagramStyle = new GMFCSSDiagramStyle(getCSSEngine());
-		return diagramStyle;
-	}
-
-
-	@Override
-	public ImageStyle createImageStyle() {
-		ImageStyle imageStyle = new GMFCSSImageStyle(getCSSEngine());
-		return imageStyle;
-	}
-
-
-	@Override
-	public ImageBufferStyle createImageBufferStyle() {
-		ImageBufferStyle imageBufferStyle = new GMFCSSImageBufferStyle(getCSSEngine());
-		return imageBufferStyle;
-	}
-
-
-	@Override
-	public PropertiesSetStyle createPropertiesSetStyle() {
-		PropertiesSetStyle propertiesSetStyle = new GMFCSSPropertiesSetStyle(getCSSEngine());
-		return propertiesSetStyle;
-	}
-
-
-	@Override
-	public java.util.Map.Entry createStringToPropertyValueMapEntry() {
-		java.util.Map.Entry stringToPropertyValueMapEntry = new GMFCSSStringToPropertyValueMapEntry(getCSSEngine());
-		return stringToPropertyValueMapEntry;
-	}
-
-
-	@Override
-	public PropertyValue createPropertyValue() {
-		PropertyValue propertyValue = new GMFCSSPropertyValue(getCSSEngine());
-		return propertyValue;
-	}
-
-
-	@Override
-	public SingleValueStyle createSingleValueStyle() {
-		SingleValueStyle singleValueStyle = new GMFCSSSingleValueStyle(getCSSEngine());
-		return singleValueStyle;
-	}
-
-
-	@Override
-	public ListValueStyle createListValueStyle() {
-		ListValueStyle listValueStyle = new GMFCSSListValueStyle(getCSSEngine());
-		return listValueStyle;
-	}
-
-
-	@Override
-	public NamedStyle createNamedStyle() {
-		NamedStyle namedStyle = new GMFCSSNamedStyle(getCSSEngine());
-		return namedStyle;
-	}
-
-
-	@Override
-	public DataTypeStyle createDataTypeStyle() {
-		DataTypeStyle dataTypeStyle = new GMFCSSDataTypeStyle(getCSSEngine());
-		return dataTypeStyle;
-	}
-
-
-	@Override
-	public IntValueStyle createIntValueStyle() {
-		IntValueStyle intValueStyle = new GMFCSSIntValueStyle(getCSSEngine());
-		return intValueStyle;
-	}
-
-
-	@Override
-	public IntListValueStyle createIntListValueStyle() {
-		IntListValueStyle intListValueStyle = new GMFCSSIntListValueStyle(getCSSEngine());
-		return intListValueStyle;
-	}
-
-
-	@Override
-	public BooleanValueStyle createBooleanValueStyle() {
-		BooleanValueStyle booleanValueStyle = new GMFCSSBooleanValueStyle(getCSSEngine());
-		return booleanValueStyle;
-	}
-
-
-	@Override
-	public DoubleValueStyle createDoubleValueStyle() {
-		DoubleValueStyle doubleValueStyle = new GMFCSSDoubleValueStyle(getCSSEngine());
-		return doubleValueStyle;
-	}
-
-
-	@Override
-	public DoubleListValueStyle createDoubleListValueStyle() {
-		DoubleListValueStyle doubleListValueStyle = new GMFCSSDoubleListValueStyle(getCSSEngine());
-		return doubleListValueStyle;
-	}
-
-
-	@Override
-	public StringValueStyle createStringValueStyle() {
-		StringValueStyle stringValueStyle = new GMFCSSStringValueStyle(getCSSEngine());
-		return stringValueStyle;
-	}
-
-
-	@Override
-	public StringListValueStyle createStringListValueStyle() {
-		StringListValueStyle stringListValueStyle = new GMFCSSStringListValueStyle(getCSSEngine());
-		return stringListValueStyle;
-	}
-
-
-	@Override
-	public EObjectValueStyle createEObjectValueStyle() {
-		EObjectValueStyle eObjectValueStyle = new GMFCSSEObjectValueStyle(getCSSEngine());
-		return eObjectValueStyle;
-	}
-
-
-	@Override
-	public EObjectListValueStyle createEObjectListValueStyle() {
-		EObjectListValueStyle eObjectListValueStyle = new GMFCSSEObjectListValueStyle(getCSSEngine());
-		return eObjectListValueStyle;
-	}
-
-
-	@Override
-	public ByteArrayValueStyle createByteArrayValueStyle() {
-		ByteArrayValueStyle byteArrayValueStyle = new GMFCSSByteArrayValueStyle(getCSSEngine());
-		return byteArrayValueStyle;
-	}
-
-
-	@Override
-	public BooleanListValueStyle createBooleanListValueStyle() {
-		BooleanListValueStyle booleanListValueStyle = new GMFCSSBooleanListValueStyle(getCSSEngine());
-		return booleanListValueStyle;
-	}
-
-
-	@Override
-	public HintedDiagramLinkStyle createHintedDiagramLinkStyle() {
-		HintedDiagramLinkStyle hintedDiagramLinkStyle = new GMFCSSHintedDiagramLinkStyle(getCSSEngine());
-		return hintedDiagramLinkStyle;
-	}
-
-
-	@Override
-	public DiagramLinkStyle createDiagramLinkStyle() {
-		DiagramLinkStyle diagramLinkStyle = new GMFCSSDiagramLinkStyle(getCSSEngine());
-		return diagramLinkStyle;
-	}
-
-
-	@Override
-	public MultiDiagramLinkStyle createMultiDiagramLinkStyle() {
-		MultiDiagramLinkStyle multiDiagramLinkStyle = new GMFCSSMultiDiagramLinkStyle(getCSSEngine());
-		return multiDiagramLinkStyle;
-	}
-
-
-	@Override
-	public TextStyle createTextStyle() {
-		TextStyle textStyle = new GMFCSSTextStyle(getCSSEngine());
-		return textStyle;
-	}
-
-
-	@Override
-	public LineTypeStyle createLineTypeStyle() {
-		LineTypeStyle lineTypeStyle = new GMFCSSLineTypeStyle(getCSSEngine());
-		return lineTypeStyle;
-	}
-
-
-	@Override
-	public ArrowStyle createArrowStyle() {
-		ArrowStyle arrowStyle = new GMFCSSArrowStyle(getCSSEngine());
-		return arrowStyle;
-	}
-
-
-	@Override
-	public Shape createShape() {
-		Shape shape = new GMFCSSShape(getCSSEngine());
-		return shape;
-	}
-
-
-	@Override
-	public Compartment createCompartment() {
-		Compartment compartment = new GMFCSSCompartment(getCSSEngine());
-		return compartment;
-	}
-
-
-	@Override
-	public ListCompartment createListCompartment() {
-		ListCompartment listCompartment = new GMFCSSListCompartment(getCSSEngine());
-		return listCompartment;
-	}
-
-
-	@Override
-	public Connector createConnector() {
-		Connector connector = new GMFCSSConnector(getCSSEngine());
-		return connector;
-	}
-
-
-	@Override
-	public StandardDiagram createStandardDiagram() {
-		StandardDiagram standardDiagram = new GMFCSSStandardDiagram(getCSSEngine());
-		return standardDiagram;
-	}
-
-
-	@Override
-	public DecorationNode createDecorationNode() {
-		DecorationNode decorationNode = new GMFCSSDecorationNode(getCSSEngine());
-		return decorationNode;
-	}
-
-
-	@Override
-	public BasicDecorationNode createBasicDecorationNode() {
-		BasicDecorationNode basicDecorationNode = new GMFCSSBasicDecorationNode(getCSSEngine());
-		return basicDecorationNode;
-	}
-
-
-	@Override
-	public BasicCompartment createBasicCompartment() {
-		BasicCompartment basicCompartment = new GMFCSSBasicCompartment(getCSSEngine());
-		return basicCompartment;
-	}
-
-
-	@Override
-	public BasicSemanticCompartment createBasicSemanticCompartment() {
-		BasicSemanticCompartment basicSemanticCompartment = new GMFCSSBasicSemanticCompartment(getCSSEngine());
-		return basicSemanticCompartment;
-	}
-
-
-	@Override
-	public SemanticListCompartment createSemanticListCompartment() {
-		SemanticListCompartment semanticListCompartment = new GMFCSSSemanticListCompartment(getCSSEngine());
-		return semanticListCompartment;
-	}
-
-
-	@Override
-	public RoundedCornersStyle createRoundedCornersStyle() {
-		RoundedCornersStyle roundedCornersStyle = new GMFCSSRoundedCornersStyle(getCSSEngine());
-		return roundedCornersStyle;
-	}
-
-
-	public ExtendedCSSEngine getCSSEngine() {
-		return ExtendedCSSEngine.instance;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSArrowStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSArrowStyle.java
deleted file mode 100644
index 5299b482d6a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSArrowStyle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSArrowStyle {
-	
-	public ArrowType getCSSArrowSource();
-
-
-	public ArrowType getCSSArrowTarget();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanListValueStyle.java
deleted file mode 100644
index db603cacc36..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanListValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSBooleanListValueStyle extends CSSNamedStyle{
-	
-	public EList getCSSBooleanListValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanValueStyle.java
deleted file mode 100644
index 6ed1be273fe..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSBooleanValueStyle extends CSSNamedStyle{
-	
-	public boolean isCSSBooleanValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSByteArrayValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSByteArrayValueStyle.java
deleted file mode 100644
index 1b53cd94593..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSByteArrayValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSByteArrayValueStyle extends CSSNamedStyle{
-	
-	public byte[] getCSSByteArrayValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSCanonicalStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSCanonicalStyle.java
deleted file mode 100644
index 09c518d0366..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSCanonicalStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSCanonicalStyle {
-	
-	public boolean isCSSCanonical();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSConnectorStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSConnectorStyle.java
deleted file mode 100644
index dcfbf4e04f7..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSConnectorStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSConnectorStyle extends CSSRoundedCornersStyle, CSSRoutingStyle, CSSLineStyle{
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDataTypeStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDataTypeStyle.java
deleted file mode 100644
index 8f7241edd7e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDataTypeStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSDataTypeStyle extends CSSNamedStyle{
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDescriptionStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDescriptionStyle.java
deleted file mode 100644
index 998220aa5c3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDescriptionStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSDescriptionStyle {
-	
-	public java.lang.String getCSSDescription();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramLinkStyle.java
deleted file mode 100644
index a0f38e73320..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramLinkStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSDiagramLinkStyle {
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramStyle.java
deleted file mode 100644
index 26b2d1e9f0f..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSDiagramStyle extends CSSPageStyle, CSSGuideStyle, CSSDescriptionStyle{
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleListValueStyle.java
deleted file mode 100644
index 2827b9199a8..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleListValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSDoubleListValueStyle extends CSSNamedStyle{
-	
-	public EList getCSSDoubleListValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleValueStyle.java
deleted file mode 100644
index 31a8b4bf0d3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSDoubleValueStyle extends CSSNamedStyle{
-	
-	public double getCSSDoubleValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDrawerStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDrawerStyle.java
deleted file mode 100644
index 5599a6373e1..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDrawerStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSDrawerStyle {
-	
-	public boolean isCSSCollapsed();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectListValueStyle.java
deleted file mode 100644
index afa503b127b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectListValueStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSEObjectListValueStyle extends CSSNamedStyle{
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectValueStyle.java
deleted file mode 100644
index 32974d30882..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectValueStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSEObjectValueStyle extends CSSNamedStyle{
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFillStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFillStyle.java
deleted file mode 100644
index 3812412488b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFillStyle.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-
-public interface CSSFillStyle {
-
-	public String GRADIENT_VERTICAL = "vertical";
-
-	public String GRADIENT_HORIZONTAL = "horizontal";
-
-
-	public int getCSSFillColor();
-
-
-	public int getCSSTransparency();
-
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFilteringStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFilteringStyle.java
deleted file mode 100644
index d079c59dd75..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFilteringStyle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSFilteringStyle {
-	
-	public Filtering getCSSFiltering();
-
-
-	public java.util.List getCSSFilteringKeys();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFontStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFontStyle.java
deleted file mode 100644
index 1c5083d69e3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFontStyle.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSFontStyle {
-	
-	public int getCSSFontColor();
-
-
-	public java.lang.String getCSSFontName();
-
-
-	public int getCSSFontHeight();
-
-
-	public boolean isCSSBold();
-
-
-	public boolean isCSSItalic();
-
-
-	public boolean isCSSUnderline();
-
-
-	public boolean isCSSStrikeThrough();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSGuideStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSGuideStyle.java
deleted file mode 100644
index 0df0f5b811b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSGuideStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSGuideStyle {
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSHintedDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSHintedDiagramLinkStyle.java
deleted file mode 100644
index 3d7b1284a66..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSHintedDiagramLinkStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSHintedDiagramLinkStyle extends CSSDiagramLinkStyle{
-	
-	public java.lang.String getCSSHint();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageBufferStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageBufferStyle.java
deleted file mode 100644
index 4dc178c2d88..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageBufferStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSImageBufferStyle extends CSSImageStyle{
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageStyle.java
deleted file mode 100644
index 7106c57df42..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageStyle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSImageStyle {
-	
-	public java.lang.Boolean getCSSAntiAlias();
-
-
-	public java.lang.Boolean getCSSMaintainAspectRatio();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntListValueStyle.java
deleted file mode 100644
index 8688a400c67..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntListValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSIntListValueStyle extends CSSNamedStyle{
-	
-	public EList getCSSIntListValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntValueStyle.java
deleted file mode 100644
index 5fc65c1d3db..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSIntValueStyle extends CSSNamedStyle{
-	
-	public int getCSSIntValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineStyle.java
deleted file mode 100644
index f8693906123..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineStyle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSLineStyle {
-	
-	public int getCSSLineColor();
-
-
-	public int getCSSLineWidth();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineTypeStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineTypeStyle.java
deleted file mode 100644
index 8dd26d216db..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineTypeStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSLineTypeStyle {
-	
-	public LineType getCSSLineType();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSListValueStyle.java
deleted file mode 100644
index c00263ffe6c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSListValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSListValueStyle extends CSSNamedStyle, CSSDataTypeStyle{
-	
-	public EList getCSSRawValuesList();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSMultiDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSMultiDiagramLinkStyle.java
deleted file mode 100644
index 387ced0e682..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSMultiDiagramLinkStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSMultiDiagramLinkStyle {
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSNamedStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSNamedStyle.java
deleted file mode 100644
index ced1312e2cc..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSNamedStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSNamedStyle {
-	
-	public java.lang.String getCSSName();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPageStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPageStyle.java
deleted file mode 100644
index b970b5278b7..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPageStyle.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSPageStyle {
-	
-	public int getCSSPageX();
-
-
-	public int getCSSPageY();
-
-
-	public int getCSSPageWidth();
-
-
-	public int getCSSPageHeight();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPropertiesSetStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPropertiesSetStyle.java
deleted file mode 100644
index 124d6988d1d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPropertiesSetStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSPropertiesSetStyle extends CSSNamedStyle{
-	
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoundedCornersStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoundedCornersStyle.java
deleted file mode 100644
index e8227342963..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoundedCornersStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSRoundedCornersStyle {
-	
-	public int getCSSRoundedBendpointsRadius();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoutingStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoutingStyle.java
deleted file mode 100644
index 3d65120378d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoutingStyle.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSRoutingStyle extends CSSRoundedCornersStyle{
-	
-	public Routing getCSSRouting();
-
-
-	public Smoothness getCSSSmoothness();
-
-
-	public boolean isCSSAvoidObstructions();
-
-
-	public boolean isCSSClosestDistance();
-
-
-	public JumpLinkStatus getCSSJumpLinkStatus();
-
-
-	public JumpLinkType getCSSJumpLinkType();
-
-
-	public boolean isCSSJumpLinksReverse();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSShapeStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSShapeStyle.java
deleted file mode 100644
index 2980ccbfdf5..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSShapeStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.custom.UMLCustomStyle;
-
-public interface CSSShapeStyle extends CSSFontStyle, CSSDescriptionStyle, CSSFillStyle, CSSLineStyle, CSSRoundedCornersStyle, UMLCustomStyle {
-
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSingleValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSingleValueStyle.java
deleted file mode 100644
index 3c79d51ee07..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSingleValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSSingleValueStyle extends CSSNamedStyle, CSSDataTypeStyle{
-	
-	public java.lang.String getCSSRawValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSortingStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSortingStyle.java
deleted file mode 100644
index 003d18c7828..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSortingStyle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSSortingStyle {
-	
-	public Sorting getCSSSorting();
-
-
-	public java.util.Map getCSSSortingKeys();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringListValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringListValueStyle.java
deleted file mode 100644
index cf043a4293a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringListValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSStringListValueStyle extends CSSNamedStyle{
-	
-	public EList getCSSStringListValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringValueStyle.java
deleted file mode 100644
index 7186bdd2fd3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringValueStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSStringValueStyle extends CSSNamedStyle{
-	
-	public java.lang.String getCSSStringValue();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTextStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTextStyle.java
deleted file mode 100644
index 7aba52b7e4d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTextStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSTextStyle {
-	
-	public TextAlignment getCSSTextAlignment();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTitleStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTitleStyle.java
deleted file mode 100644
index 66da5173113..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTitleStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-
-public interface CSSTitleStyle {
-	
-	public boolean isCSSShowTitle();
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSArrowStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSArrowStyleImpl.java
deleted file mode 100644
index 62cb8d19357..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSArrowStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSArrowStyleImpl implements CSSArrowStyle{
-	
-	private ArrowStyle arrowStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSArrowStyleImpl(ArrowStyle arrowStyle, CSSStylableElement element, CSSEngine engine){
-		this.arrowStyle = arrowStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public ArrowType getCSSArrowSource(){
-		String cssValue = engine.retrieveCSSProperty(element, "arrowSource", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getArrowStyle_ArrowSource().getDefaultValue(); 
-			return (ArrowType)defaultValue;
-		}
-		return ArrowType.get(cssValue);
-	}
-
-	public ArrowType getCSSArrowTarget(){
-		String cssValue = engine.retrieveCSSProperty(element, "arrowTarget", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getArrowStyle_ArrowTarget().getDefaultValue(); 
-			return (ArrowType)defaultValue;
-		}
-		return ArrowType.get(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanListValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanListValueStyleImpl.java
deleted file mode 100644
index 812300f23af..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanListValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSBooleanListValueStyleImpl implements CSSBooleanListValueStyle{
-	
-	private BooleanListValueStyle booleanListValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSBooleanListValueStyleImpl(BooleanListValueStyle booleanListValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.booleanListValueStyle = booleanListValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public EList getCSSBooleanListValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "booleanListValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getBooleanListValueStyle_BooleanListValue().getDefaultValue(); 
-			return (EList)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanValueStyleImpl.java
deleted file mode 100644
index ca18b226880..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSBooleanValueStyleImpl implements CSSBooleanValueStyle{
-	
-	private BooleanValueStyle booleanValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSBooleanValueStyleImpl(BooleanValueStyle booleanValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.booleanValueStyle = booleanValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public boolean isCSSBooleanValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "booleanValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getBooleanValueStyle_BooleanValue().getDefaultValue(); 
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)Boolean.parseBoolean(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSByteArrayValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSByteArrayValueStyleImpl.java
deleted file mode 100644
index cc69c365205..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSByteArrayValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSByteArrayValueStyleImpl implements CSSByteArrayValueStyle{
-	
-	private ByteArrayValueStyle byteArrayValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSByteArrayValueStyleImpl(ByteArrayValueStyle byteArrayValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.byteArrayValueStyle = byteArrayValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public byte[] getCSSByteArrayValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "byteArrayValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getByteArrayValueStyle_ByteArrayValue().getDefaultValue(); 
-			return (byte[])defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSCanonicalStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSCanonicalStyleImpl.java
deleted file mode 100644
index cb40a2fdb0d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSCanonicalStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSCanonicalStyleImpl implements CSSCanonicalStyle{
-	
-	private CanonicalStyle canonicalStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSCanonicalStyleImpl(CanonicalStyle canonicalStyle, CSSStylableElement element, CSSEngine engine){
-		this.canonicalStyle = canonicalStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public boolean isCSSCanonical(){
-		String cssValue = engine.retrieveCSSProperty(element, "canonical", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getCanonicalStyle_Canonical().getDefaultValue(); 
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)Boolean.parseBoolean(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSConnectorStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSConnectorStyleImpl.java
deleted file mode 100644
index 4ffe020f378..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSConnectorStyleImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.gmf.runtime.notation.ConnectorStyle;
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.papyrus.infra.emf.Activator;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.converters.ColorToGMFConverter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSConnectorStyle;
-import org.w3c.dom.css.CSSValue;
-
-@SuppressWarnings("restriction")
-public class CSSConnectorStyleImpl implements CSSConnectorStyle {
-
-	private ConnectorStyle connectorStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSConnectorStyleImpl(ConnectorStyle connectorStyle, CSSStylableElement element, CSSEngine engine) {
-		this.connectorStyle = connectorStyle;
-		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius() {
-		String cssValue = engine.retrieveCSSProperty(element, "roundedBendpointsRadius", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-
-	public Routing getCSSRouting() {
-		String cssValue = engine.retrieveCSSProperty(element, "routing", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Routing().getDefaultValue();
-			return (Routing)defaultValue;
-		}
-		return Routing.get(cssValue);
-	}
-
-	public Smoothness getCSSSmoothness() {
-		String cssValue = engine.retrieveCSSProperty(element, "smoothness", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Smoothness().getDefaultValue();
-			return (Smoothness)defaultValue;
-		}
-		return Smoothness.get(cssValue);
-	}
-
-	public boolean isCSSAvoidObstructions() {
-		String cssValue = engine.retrieveCSSProperty(element, "avoidObstructions", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSClosestDistance() {
-		String cssValue = engine.retrieveCSSProperty(element, "closestDistance", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus() {
-		String cssValue = engine.retrieveCSSProperty(element, "jumpLinkStatus", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus().getDefaultValue();
-			return (JumpLinkStatus)defaultValue;
-		}
-		return JumpLinkStatus.get(cssValue);
-	}
-
-	public JumpLinkType getCSSJumpLinkType() {
-		String cssValue = engine.retrieveCSSProperty(element, "jumpLinkType", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType().getDefaultValue();
-			return (JumpLinkType)defaultValue;
-		}
-		return JumpLinkType.get(cssValue);
-	}
-
-	public boolean isCSSJumpLinksReverse() {
-		String cssValue = engine.retrieveCSSProperty(element, "jumpLinksReverse", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public int getCSSLineColor() {
-		String cssValue = engine.retrieveCSSProperty(element, "lineColor", "");
-
-		try {
-			CSSValue value = engine.parsePropertyValue(cssValue);
-			return (Integer)engine.convert(value, ColorToGMFConverter.GMFColor, null);
-		} catch (Exception ex) {
-			Activator.log.error(ex);
-		}
-
-		return (Integer)NotationPackage.eINSTANCE.getLineStyle_LineColor().getDefaultValue();
-	}
-
-	public int getCSSLineWidth() {
-		String cssValue = engine.retrieveCSSProperty(element, "lineWidth", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDataTypeStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDataTypeStyleImpl.java
deleted file mode 100644
index c6d40c21019..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDataTypeStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSDataTypeStyleImpl implements CSSDataTypeStyle{
-	
-	private DataTypeStyle dataTypeStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSDataTypeStyleImpl(DataTypeStyle dataTypeStyle, CSSStylableElement element, CSSEngine engine){
-		this.dataTypeStyle = dataTypeStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDescriptionStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDescriptionStyleImpl.java
deleted file mode 100644
index 3fb99e278d4..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDescriptionStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSDescriptionStyleImpl implements CSSDescriptionStyle{
-	
-	private DescriptionStyle descriptionStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSDescriptionStyleImpl(DescriptionStyle descriptionStyle, CSSStylableElement element, CSSEngine engine){
-		this.descriptionStyle = descriptionStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSDescription(){
-		String cssValue = engine.retrieveCSSProperty(element, "description", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getDescriptionStyle_Description().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramLinkStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramLinkStyleImpl.java
deleted file mode 100644
index abcf8cd43f3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramLinkStyleImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSDiagramLinkStyleImpl implements CSSDiagramLinkStyle{
-	
-	private DiagramLinkStyle diagramLinkStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSDiagramLinkStyleImpl(DiagramLinkStyle diagramLinkStyle, CSSStylableElement element, CSSEngine engine){
-		this.diagramLinkStyle = diagramLinkStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramStyleImpl.java
deleted file mode 100644
index 3c65d6d8eab..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramStyleImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSDiagramStyleImpl implements CSSDiagramStyle{
-	
-	private DiagramStyle diagramStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSDiagramStyleImpl(DiagramStyle diagramStyle, CSSStylableElement element, CSSEngine engine){
-		this.diagramStyle = diagramStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSPageX(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageX", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageX().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public int getCSSPageY(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageY", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageY().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public int getCSSPageWidth(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageWidth", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageWidth().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public int getCSSPageHeight(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageHeight", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageHeight().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public java.lang.String getCSSDescription(){
-		String cssValue = engine.retrieveCSSProperty(element, "description", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getDescriptionStyle_Description().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleListValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleListValueStyleImpl.java
deleted file mode 100644
index a21dc8418a8..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleListValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSDoubleListValueStyleImpl implements CSSDoubleListValueStyle{
-	
-	private DoubleListValueStyle doubleListValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSDoubleListValueStyleImpl(DoubleListValueStyle doubleListValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.doubleListValueStyle = doubleListValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public EList getCSSDoubleListValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "doubleListValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getDoubleListValueStyle_DoubleListValue().getDefaultValue(); 
-			return (EList)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleValueStyleImpl.java
deleted file mode 100644
index 7fde7cd1758..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSDoubleValueStyleImpl implements CSSDoubleValueStyle{
-	
-	private DoubleValueStyle doubleValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSDoubleValueStyleImpl(DoubleValueStyle doubleValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.doubleValueStyle = doubleValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public double getCSSDoubleValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "doubleValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getDoubleValueStyle_DoubleValue().getDefaultValue(); 
-			return (Double)defaultValue;
-		}
-		return (Double)Double.parseDouble(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDrawerStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDrawerStyleImpl.java
deleted file mode 100644
index a3e7a76314b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDrawerStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSDrawerStyleImpl implements CSSDrawerStyle{
-	
-	private DrawerStyle drawerStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSDrawerStyleImpl(DrawerStyle drawerStyle, CSSStylableElement element, CSSEngine engine){
-		this.drawerStyle = drawerStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public boolean isCSSCollapsed(){
-		String cssValue = engine.retrieveCSSProperty(element, "collapsed", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed().getDefaultValue(); 
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)Boolean.parseBoolean(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectListValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectListValueStyleImpl.java
deleted file mode 100644
index fff561c355c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectListValueStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSEObjectListValueStyleImpl implements CSSEObjectListValueStyle{
-	
-	private EObjectListValueStyle eObjectListValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSEObjectListValueStyleImpl(EObjectListValueStyle eObjectListValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.eObjectListValueStyle = eObjectListValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectValueStyleImpl.java
deleted file mode 100644
index 8cf092a18c1..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectValueStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSEObjectValueStyleImpl implements CSSEObjectValueStyle{
-	
-	private EObjectValueStyle eObjectValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSEObjectValueStyleImpl(EObjectValueStyle eObjectValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.eObjectValueStyle = eObjectValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFillStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFillStyleImpl.java
deleted file mode 100644
index d2addc1c1fa..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFillStyleImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSFillStyleImpl implements CSSFillStyle{
-	
-	private FillStyle fillStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSFillStyleImpl(FillStyle fillStyle, CSSStylableElement element, CSSEngine engine){
-		this.fillStyle = fillStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSFillColor(){
-		String cssValue = engine.retrieveCSSProperty(element, "fillColor", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_FillColor().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public int getCSSTransparency(){
-		String cssValue = engine.retrieveCSSProperty(element, "transparency", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_Transparency().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
-		String cssValue = engine.retrieveCSSProperty(element, "gradient", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_Gradient().getDefaultValue(); 
-			return (org.eclipse.gmf.runtime.notation.datatype.GradientData)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFilteringStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFilteringStyleImpl.java
deleted file mode 100644
index 1e5551563b5..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFilteringStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSFilteringStyleImpl implements CSSFilteringStyle{
-	
-	private FilteringStyle filteringStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSFilteringStyleImpl(FilteringStyle filteringStyle, CSSStylableElement element, CSSEngine engine){
-		this.filteringStyle = filteringStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public Filtering getCSSFiltering(){
-		String cssValue = engine.retrieveCSSProperty(element, "filtering", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getFilteringStyle_Filtering().getDefaultValue(); 
-			return (Filtering)defaultValue;
-		}
-		return Filtering.get(cssValue);
-	}
-
-	public java.util.List getCSSFilteringKeys(){
-		String cssValue = engine.retrieveCSSProperty(element, "filteringKeys", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys().getDefaultValue(); 
-			return (java.util.List)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFontStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFontStyleImpl.java
deleted file mode 100644
index 90713b5659c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFontStyleImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.emf.Activator;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.converters.ColorToGMFConverter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSFontStyle;
-import org.w3c.dom.css.CSSValue;
-
-@SuppressWarnings("restriction")
-public class CSSFontStyleImpl implements CSSFontStyle {
-
-	private FontStyle fontStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSFontStyleImpl(FontStyle fontStyle, CSSStylableElement element, CSSEngine engine) {
-		this.fontStyle = fontStyle;
-		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSFontColor() {
-		String cssValue = engine.retrieveCSSProperty(element, "fontColor", "");
-		try {
-			CSSValue value = engine.parsePropertyValue(cssValue);
-			return (Integer)engine.convert(value, ColorToGMFConverter.GMFColor, null);
-		} catch (Exception ex) {
-			Activator.log.error(ex);
-		}
-
-		return (Integer)NotationPackage.eINSTANCE.getFontStyle_FontColor().getDefaultValue();
-	}
-
-	public java.lang.String getCSSFontName() {
-		String cssValue = engine.retrieveCSSProperty(element, "fontName", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontName().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public int getCSSFontHeight() {
-		String cssValue = engine.retrieveCSSProperty(element, "fontHeight", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontHeight().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-
-	public boolean isCSSBold() {
-		String cssValue = engine.retrieveCSSProperty(element, "bold", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Bold().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSItalic() {
-		String cssValue = engine.retrieveCSSProperty(element, "italic", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Italic().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSUnderline() {
-		String cssValue = engine.retrieveCSSProperty(element, "underline", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Underline().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSStrikeThrough() {
-		String cssValue = engine.retrieveCSSProperty(element, "strikeThrough", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSGuideStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSGuideStyleImpl.java
deleted file mode 100644
index 6261babec51..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSGuideStyleImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSGuideStyleImpl implements CSSGuideStyle{
-	
-	private GuideStyle guideStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSGuideStyleImpl(GuideStyle guideStyle, CSSStylableElement element, CSSEngine engine){
-		this.guideStyle = guideStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSHintedDiagramLinkStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSHintedDiagramLinkStyleImpl.java
deleted file mode 100644
index 054c245c9ca..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSHintedDiagramLinkStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSHintedDiagramLinkStyleImpl implements CSSHintedDiagramLinkStyle{
-	
-	private HintedDiagramLinkStyle hintedDiagramLinkStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSHintedDiagramLinkStyleImpl(HintedDiagramLinkStyle hintedDiagramLinkStyle, CSSStylableElement element, CSSEngine engine){
-		this.hintedDiagramLinkStyle = hintedDiagramLinkStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSHint(){
-		String cssValue = engine.retrieveCSSProperty(element, "hint", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getHintedDiagramLinkStyle_Hint().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageBufferStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageBufferStyleImpl.java
deleted file mode 100644
index 9cb24155ed2..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageBufferStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSImageBufferStyleImpl implements CSSImageBufferStyle{
-	
-	private ImageBufferStyle imageBufferStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSImageBufferStyleImpl(ImageBufferStyle imageBufferStyle, CSSStylableElement element, CSSEngine engine){
-		this.imageBufferStyle = imageBufferStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.Boolean getCSSAntiAlias(){
-		String cssValue = engine.retrieveCSSProperty(element, "antiAlias", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue(); 
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio(){
-		String cssValue = engine.retrieveCSSProperty(element, "maintainAspectRatio", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue(); 
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageStyleImpl.java
deleted file mode 100644
index bbe13e16001..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSImageStyleImpl implements CSSImageStyle{
-	
-	private ImageStyle imageStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSImageStyleImpl(ImageStyle imageStyle, CSSStylableElement element, CSSEngine engine){
-		this.imageStyle = imageStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.Boolean getCSSAntiAlias(){
-		String cssValue = engine.retrieveCSSProperty(element, "antiAlias", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue(); 
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio(){
-		String cssValue = engine.retrieveCSSProperty(element, "maintainAspectRatio", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue(); 
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntListValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntListValueStyleImpl.java
deleted file mode 100644
index 56c17340021..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntListValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSIntListValueStyleImpl implements CSSIntListValueStyle{
-	
-	private IntListValueStyle intListValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSIntListValueStyleImpl(IntListValueStyle intListValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.intListValueStyle = intListValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public EList getCSSIntListValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "intListValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getIntListValueStyle_IntListValue().getDefaultValue(); 
-			return (EList)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntValueStyleImpl.java
deleted file mode 100644
index b9cff0dce5f..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSIntValueStyleImpl implements CSSIntValueStyle{
-	
-	private IntValueStyle intValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSIntValueStyleImpl(IntValueStyle intValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.intValueStyle = intValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public int getCSSIntValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "intValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getIntValueStyle_IntValue().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineStyleImpl.java
deleted file mode 100644
index 420adb5c65b..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineStyleImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.emf.Activator;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.converters.ColorToGMFConverter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSLineStyle;
-import org.w3c.dom.css.CSSValue;
-
-@SuppressWarnings("restriction")
-public class CSSLineStyleImpl implements CSSLineStyle {
-
-	private LineStyle lineStyle;
-
-	private ExtendedCSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSLineStyleImpl(LineStyle lineStyle, CSSStylableElement element, ExtendedCSSEngine engine) {
-		this.lineStyle = lineStyle;
-		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSLineColor() {
-		CSSValue value = engine.retrievePropertyValue(element, "lineColor");
-
-		try {
-			return (Integer)engine.convert(value, ColorToGMFConverter.GMFColor, null);
-		} catch (Exception ex) {
-			Activator.log.error(ex);
-		}
-
-		return (Integer)NotationPackage.eINSTANCE.getLineStyle_LineColor().getDefaultValue();
-	}
-
-	public int getCSSLineWidth() {
-		String cssValue = engine.retrieveCSSProperty(element, "lineWidth", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineTypeStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineTypeStyleImpl.java
deleted file mode 100644
index fb8a9ad3ef9..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineTypeStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSLineTypeStyleImpl implements CSSLineTypeStyle{
-	
-	private LineTypeStyle lineTypeStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSLineTypeStyleImpl(LineTypeStyle lineTypeStyle, CSSStylableElement element, CSSEngine engine){
-		this.lineTypeStyle = lineTypeStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public LineType getCSSLineType(){
-		String cssValue = engine.retrieveCSSProperty(element, "lineType", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getLineTypeStyle_LineType().getDefaultValue(); 
-			return (LineType)defaultValue;
-		}
-		return LineType.get(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSListValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSListValueStyleImpl.java
deleted file mode 100644
index b628700d1f3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSListValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSListValueStyleImpl implements CSSListValueStyle{
-	
-	private ListValueStyle listValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSListValueStyleImpl(ListValueStyle listValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.listValueStyle = listValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public EList getCSSRawValuesList(){
-		String cssValue = engine.retrieveCSSProperty(element, "rawValuesList", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getListValueStyle_RawValuesList().getDefaultValue(); 
-			return (EList)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSMultiDiagramLinkStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSMultiDiagramLinkStyleImpl.java
deleted file mode 100644
index b63b85ee25c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSMultiDiagramLinkStyleImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSMultiDiagramLinkStyleImpl implements CSSMultiDiagramLinkStyle{
-	
-	private MultiDiagramLinkStyle multiDiagramLinkStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSMultiDiagramLinkStyleImpl(MultiDiagramLinkStyle multiDiagramLinkStyle, CSSStylableElement element, CSSEngine engine){
-		this.multiDiagramLinkStyle = multiDiagramLinkStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSNamedStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSNamedStyleImpl.java
deleted file mode 100644
index a31d65eb6e2..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSNamedStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSNamedStyleImpl implements CSSNamedStyle{
-	
-	private NamedStyle namedStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSNamedStyleImpl(NamedStyle namedStyle, CSSStylableElement element, CSSEngine engine){
-		this.namedStyle = namedStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPageStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPageStyleImpl.java
deleted file mode 100644
index a935f6553e6..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPageStyleImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSPageStyleImpl implements CSSPageStyle{
-	
-	private PageStyle pageStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSPageStyleImpl(PageStyle pageStyle, CSSStylableElement element, CSSEngine engine){
-		this.pageStyle = pageStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSPageX(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageX", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageX().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public int getCSSPageY(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageY", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageY().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public int getCSSPageWidth(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageWidth", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageWidth().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public int getCSSPageHeight(){
-		String cssValue = engine.retrieveCSSProperty(element, "pageHeight", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageHeight().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPropertiesSetStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPropertiesSetStyleImpl.java
deleted file mode 100644
index 86219ebea7c..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPropertiesSetStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSPropertiesSetStyleImpl implements CSSPropertiesSetStyle{
-	
-	private PropertiesSetStyle propertiesSetStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSPropertiesSetStyleImpl(PropertiesSetStyle propertiesSetStyle, CSSStylableElement element, CSSEngine engine){
-		this.propertiesSetStyle = propertiesSetStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoundedCornersStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoundedCornersStyleImpl.java
deleted file mode 100644
index e39b800d5cb..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoundedCornersStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSRoundedCornersStyleImpl implements CSSRoundedCornersStyle{
-	
-	private RoundedCornersStyle roundedCornersStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSRoundedCornersStyleImpl(RoundedCornersStyle roundedCornersStyle, CSSStylableElement element, CSSEngine engine){
-		this.roundedCornersStyle = roundedCornersStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius(){
-		String cssValue = engine.retrieveCSSProperty(element, "roundedBendpointsRadius", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoutingStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoutingStyleImpl.java
deleted file mode 100644
index 51d02c7e240..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoutingStyleImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSRoutingStyleImpl implements CSSRoutingStyle{
-	
-	private RoutingStyle routingStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSRoutingStyleImpl(RoutingStyle routingStyle, CSSStylableElement element, CSSEngine engine){
-		this.routingStyle = routingStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius(){
-		String cssValue = engine.retrieveCSSProperty(element, "roundedBendpointsRadius", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue(); 
-			return (Integer)defaultValue;
-		}
-		return (Integer)Integer.parseInt(cssValue);
-	}
-
-	public Routing getCSSRouting(){
-		String cssValue = engine.retrieveCSSProperty(element, "routing", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Routing().getDefaultValue(); 
-			return (Routing)defaultValue;
-		}
-		return Routing.get(cssValue);
-	}
-
-	public Smoothness getCSSSmoothness(){
-		String cssValue = engine.retrieveCSSProperty(element, "smoothness", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Smoothness().getDefaultValue(); 
-			return (Smoothness)defaultValue;
-		}
-		return Smoothness.get(cssValue);
-	}
-
-	public boolean isCSSAvoidObstructions(){
-		String cssValue = engine.retrieveCSSProperty(element, "avoidObstructions", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions().getDefaultValue(); 
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSClosestDistance(){
-		String cssValue = engine.retrieveCSSProperty(element, "closestDistance", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance().getDefaultValue(); 
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)Boolean.parseBoolean(cssValue);
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus(){
-		String cssValue = engine.retrieveCSSProperty(element, "jumpLinkStatus", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus().getDefaultValue(); 
-			return (JumpLinkStatus)defaultValue;
-		}
-		return JumpLinkStatus.get(cssValue);
-	}
-
-	public JumpLinkType getCSSJumpLinkType(){
-		String cssValue = engine.retrieveCSSProperty(element, "jumpLinkType", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType().getDefaultValue(); 
-			return (JumpLinkType)defaultValue;
-		}
-		return JumpLinkType.get(cssValue);
-	}
-
-	public boolean isCSSJumpLinksReverse(){
-		String cssValue = engine.retrieveCSSProperty(element, "jumpLinksReverse", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse().getDefaultValue(); 
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)Boolean.parseBoolean(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSShapeStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSShapeStyleImpl.java
deleted file mode 100644
index 4ed0261f6cf..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSShapeStyleImpl.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.gmf.runtime.notation.GradientStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.datatype.GradientData;
-import org.eclipse.papyrus.infra.emf.Activator;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.converters.ColorToGMFConverter;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.helper.ParserHelper;
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.CSSShapeStyle;
-import org.w3c.dom.css.CSSValue;
-
-@SuppressWarnings("restriction")
-public class CSSShapeStyleImpl implements CSSShapeStyle {
-
-	private ShapeStyle shapeStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSShapeStyleImpl(ShapeStyle shapeStyle, CSSStylableElement element, CSSEngine engine) {
-		this.shapeStyle = shapeStyle;
-		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSFontColor() {
-		String cssValue = engine.retrieveCSSProperty(element, "fontColor", "");
-		try {
-			CSSValue value = engine.parsePropertyValue(cssValue);
-			return (Integer)engine.convert(value, ColorToGMFConverter.GMFColor, null);
-		} catch (Exception ex) {
-			Activator.log.error(ex);
-		}
-
-		return (Integer)NotationPackage.eINSTANCE.getFontStyle_FontColor().getDefaultValue();
-	}
-
-	public java.lang.String getCSSFontName() {
-		String cssValue = engine.retrieveCSSProperty(element, "fontName", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontName().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public int getCSSFontHeight() {
-		String cssValue = engine.retrieveCSSProperty(element, "fontHeight", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontHeight().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-
-	public boolean isCSSBold() {
-		String cssValue = engine.retrieveCSSProperty(element, "bold", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Bold().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSItalic() {
-		String cssValue = engine.retrieveCSSProperty(element, "italic", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Italic().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSUnderline() {
-		String cssValue = engine.retrieveCSSProperty(element, "underline", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Underline().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean isCSSStrikeThrough() {
-		String cssValue = engine.retrieveCSSProperty(element, "strikeThrough", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public java.lang.String getCSSDescription() {
-		String cssValue = engine.retrieveCSSProperty(element, "description", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getDescriptionStyle_Description().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public int getCSSFillColor() {
-		String cssValue = engine.retrieveCSSProperty(element, "fillColor", "");
-
-		try {
-			CSSValue value = engine.parsePropertyValue(cssValue);
-			return (Integer)engine.convert(value, ColorToGMFConverter.GMFColor, null);
-		} catch (Exception ex) {
-			Activator.log.error(ex);
-		}
-
-		return (Integer)NotationPackage.eINSTANCE.getFillStyle_FillColor().getDefaultValue();
-	}
-
-	public int getCSSTransparency() {
-		String cssValue = engine.retrieveCSSProperty(element, "transparency", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_Transparency().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-
-	//Type 1 :
-	//gradientColor:#ABCDEF;
-	//gradientStyle:vertical;
-
-	//Type 2 :
-	//(gradient:#FEDCBA #ABCDEF horizontal;) //Currently not supported, as diagrams usually seek for #fillColor()
-	//gradient:#ABCDEF horizontal;
-	//gradient:#ABCDEF
-	//gradient:horizontal
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient() {
-		//Type 1
-		String gradientColor = engine.retrieveCSSProperty(element, "gradientColor", "");
-		String gradientStyle = engine.retrieveCSSProperty(element, "gradientStyle", "");
-
-		if(gradientColor != null || gradientStyle != null) {
-			int color1 = getGradientColor(gradientColor);
-			int color2 = 0; //Unused by Papyrus diagrams
-			int style = getGradientStyle(gradientStyle);
-			GradientData data = new GradientData(color1, color2, style);
-			return data;
-		}
-
-		//Type 2
-		String gradient = engine.retrieveCSSProperty(element, "gradient", "");
-
-		if(gradient != null) {
-			if(gradient.equals("none")) {
-				return null;
-			}
-			int[] gradientValues = parseGradient(gradient);
-			return new GradientData(gradientValues[0], gradientValues[1], gradientValues[2]);
-		}
-
-		//Default
-		return getDefaultGradient();
-	}
-
-	/** [color1, color2, style] */
-	private int[] parseGradient(String gradient) {
-		String color1, color2, style;
-		color1 = color2 = style = null;
-
-		String[] values = ParserHelper.parseValues(engine, gradient);
-
-		if(values.length == 3) {
-			color1 = values[0];
-			color2 = values[1];
-			style = values[2];
-		} else if(values.length == 2) {
-			color1 = values[0];
-			String value = values[1];
-			if(isGradientStyle(value)) {
-				style = value;
-			} else {
-				color2 = value;
-			}
-		} else if(values.length == 1) {
-			String value = values[0];
-			if(isGradientStyle(value)) {
-				style = value;
-			} else {
-				color1 = value;
-			}
-		}
-
-		return parseGradient(color1, color2, style);
-	}
-
-	private int[] parseGradient(String sColor1, String sColor2, String sStyle) {
-		int color1, color2, style;
-		color1 = color2 = style = -1;
-
-		color1 = getGradientColor(sColor1);
-		color2 = 0; //Unused
-		style = getGradientStyle(sStyle);
-
-		return new int[]{ color1, color2, style };
-	}
-
-	private boolean isGradientStyle(String value) {
-		return GRADIENT_VERTICAL.equals(value) || GRADIENT_HORIZONTAL.equals(value);
-	}
-
-	private int getGradientColor(String gradientColor) {
-		if(gradientColor != null) {
-			try {
-				CSSValue value = engine.parsePropertyValue(gradientColor);
-				return (Integer)engine.convert(value, ColorToGMFConverter.GMFColor, null);
-			} catch (Exception ex) {
-				Activator.log.error("Cannot parse color " + gradientColor, ex);
-			}
-		}
-
-		//Default value
-		return new GradientData().getGradientColor1();
-	}
-
-	private int getGradientStyle(String gradientStyle) {
-		if(GRADIENT_VERTICAL.equals(gradientStyle)) {
-			return GradientStyle.VERTICAL;
-		} else if(GRADIENT_HORIZONTAL.equals(gradientStyle)) {
-			return GradientStyle.HORIZONTAL;
-		}
-
-		//Default value
-		return new GradientData().getGradientStyle();
-	}
-
-	private GradientData getDefaultGradient() {
-		Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_Gradient().getDefaultValue();
-		return (GradientData)defaultValue;
-	}
-
-	public int getCSSLineColor() {
-		String cssValue = engine.retrieveCSSProperty(element, "lineColor", "");
-
-		try {
-			CSSValue value = engine.parsePropertyValue(cssValue);
-			return (Integer)engine.convert(value, ColorToGMFConverter.GMFColor, null);
-		} catch (Exception ex) {
-			Activator.log.error(ex);
-		}
-
-		return (Integer)NotationPackage.eINSTANCE.getLineStyle_LineColor().getDefaultValue();
-	}
-
-	public int getCSSLineWidth() {
-		String cssValue = engine.retrieveCSSProperty(element, "lineWidth", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-
-	public int getCSSRoundedBendpointsRadius() {
-		String cssValue = engine.retrieveCSSProperty(element, "roundedBendpointsRadius", "");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return Integer.parseInt(cssValue);
-	}
-
-	public boolean getCSSElementIcon() {
-		String cssValue = engine.retrieveCSSProperty(element, "elementIcon", "");
-		if(cssValue == null) {
-			return false;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public boolean getCSSShadow() {
-		String cssValue = engine.retrieveCSSProperty(element, "shadow", "");
-		if(cssValue == null) {
-			return false;
-		}
-		return Boolean.parseBoolean(cssValue);
-	}
-
-	public int getCSSQualifiedNameDepth() {
-		String cssValue = engine.retrieveCSSProperty(element, "qualifiedNameDepth", "");
-		if(cssValue == null) {
-			return 1000;
-		}
-
-		if("full".equals(cssValue.toLowerCase())) {
-			return 0;
-		}
-
-		if("none".equals(cssValue.toLowerCase())) {
-			return 1000;
-		}
-
-		int value = Integer.parseInt(cssValue);
-		return value > 0 ? -value : value;
-	}
-
-	public String getCSSStereotypeDisplay() {
-		String cssValue = engine.retrieveCSSProperty(element, "stereotypeDisplay", "");
-		if(cssValue == null) {
-			return "Text";
-		}
-
-		return cssValue;
-	}
-
-	public String getCSSTextAlignment() {
-		String cssValue = engine.retrieveCSSProperty(element, "textAlignment", "");
-		if(cssValue == null) {
-			return "Horizontal";
-		}
-		return cssValue;
-	}
-
-	public String getCSSDisplayPlace() {
-		String cssValue = engine.retrieveCSSProperty(element, "displayPlace", "");
-		if(cssValue == null) {
-			return "Compartment";
-		}
-		return cssValue;
-	}
-
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSingleValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSingleValueStyleImpl.java
deleted file mode 100644
index f32f39100df..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSingleValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSSingleValueStyleImpl implements CSSSingleValueStyle{
-	
-	private SingleValueStyle singleValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSSingleValueStyleImpl(SingleValueStyle singleValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.singleValueStyle = singleValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public java.lang.String getCSSRawValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "rawValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getSingleValueStyle_RawValue().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSortingStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSortingStyleImpl.java
deleted file mode 100644
index 6960a0eef0d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSortingStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSSortingStyleImpl implements CSSSortingStyle{
-	
-	private SortingStyle sortingStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSSortingStyleImpl(SortingStyle sortingStyle, CSSStylableElement element, CSSEngine engine){
-		this.sortingStyle = sortingStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public Sorting getCSSSorting(){
-		String cssValue = engine.retrieveCSSProperty(element, "sorting", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getSortingStyle_Sorting().getDefaultValue(); 
-			return (Sorting)defaultValue;
-		}
-		return Sorting.get(cssValue);
-	}
-
-	public java.util.Map getCSSSortingKeys(){
-		String cssValue = engine.retrieveCSSProperty(element, "sortingKeys", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getSortingStyle_SortingKeys().getDefaultValue(); 
-			return (java.util.Map)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringListValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringListValueStyleImpl.java
deleted file mode 100644
index 9b31ccea2e8..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringListValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSStringListValueStyleImpl implements CSSStringListValueStyle{
-	
-	private StringListValueStyle stringListValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSStringListValueStyleImpl(StringListValueStyle stringListValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.stringListValueStyle = stringListValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public EList getCSSStringListValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "stringListValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getStringListValueStyle_StringListValue().getDefaultValue(); 
-			return (EList)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringValueStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringValueStyleImpl.java
deleted file mode 100644
index f7b4116ff59..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringValueStyleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSStringValueStyleImpl implements CSSStringValueStyle{
-	
-	private StringValueStyle stringValueStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSStringValueStyleImpl(StringValueStyle stringValueStyle, CSSStylableElement element, CSSEngine engine){
-		this.stringValueStyle = stringValueStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName(){
-		String cssValue = engine.retrieveCSSProperty(element, "name", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-
-	public java.lang.String getCSSStringValue(){
-		String cssValue = engine.retrieveCSSProperty(element, "stringValue", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getStringValueStyle_StringValue().getDefaultValue(); 
-			return (String)defaultValue;
-		}
-		return cssValue;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTextStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTextStyleImpl.java
deleted file mode 100644
index 1b1c2a3b2dd..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTextStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSTextStyleImpl implements CSSTextStyle{
-	
-	private TextStyle textStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSTextStyleImpl(TextStyle textStyle, CSSStylableElement element, CSSEngine engine){
-		this.textStyle = textStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public TextAlignment getCSSTextAlignment(){
-		String cssValue = engine.retrieveCSSProperty(element, "textAlignment", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getTextStyle_TextAlignment().getDefaultValue(); 
-			return (TextAlignment)defaultValue;
-		}
-		return TextAlignment.get(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTitleStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTitleStyleImpl.java
deleted file mode 100644
index f8082560670..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTitleStyleImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.style.*;
-import org.eclipse.gmf.runtime.notation.*;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.e4.ui.css.core.engine.CSSEngine;
-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-
-@SuppressWarnings("restriction")
-public class CSSTitleStyleImpl implements CSSTitleStyle{
-	
-	private TitleStyle titleStyle;
-
-	private CSSEngine engine;
-
-	private CSSStylableElement element;
-
-	public CSSTitleStyleImpl(TitleStyle titleStyle, CSSStylableElement element, CSSEngine engine){
-		this.titleStyle = titleStyle;
- 		this.engine = engine;
-		this.element = element;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public boolean isCSSShowTitle(){
-		String cssValue = engine.retrieveCSSProperty(element, "showTitle", "");
-		if (cssValue == null){
-			Object defaultValue = NotationPackage.eINSTANCE.getTitleStyle_ShowTitle().getDefaultValue(); 
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)Boolean.parseBoolean(cssValue);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/Activator.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/Activator.java
deleted file mode 100644
index 514e03c6fba..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/Activator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

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

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.prototype.infra.gmfdiag.css"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 * 

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/converters/ColorToGMFConverter.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/converters/ColorToGMFConverter.java
deleted file mode 100644
index f191edaed76..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/converters/ColorToGMFConverter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.converters;

-

-import org.eclipse.e4.ui.css.core.css2.CSS2ColorHelper;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverter;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.e4.ui.css.core.impl.dom.Measure;

-import org.w3c.dom.css.CSSPrimitiveValue;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.css.RGBColor;

-

-

-public class ColorToGMFConverter extends AbstractCSSValueConverter implements ICSSValueConverter {

-

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

-

-	public ColorToGMFConverter() {

-		super(GMFColor);

-	}

-

-	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {

-		RGBColor color;

-		if(value instanceof RGBColor) {

-			color = (RGBColor)value;

-		} else if(value instanceof CSSPrimitiveValue) {

-			CSSPrimitiveValue cssValue = (CSSPrimitiveValue)value;

-			color = CSS2ColorHelper.getRGBColor(cssValue.getStringValue());

-		} else {

-			throw new IllegalArgumentException("Cannot convert " + value + " to GMF Color");

-		}

-

-		return getIntColor(color);

-	}

-

-	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {

-		throw new UnsupportedOperationException();

-	}

-

-	public static int getIntColor(RGBColor color) {

-		int red = getInt(color.getRed());

-		int green = getInt(color.getGreen());

-		int blue = getInt(color.getBlue());

-

-		return blue * 256 * 256 + green * 256 + red;

-	}

-

-	public static int getInt(CSSPrimitiveValue value) {

-		if(value instanceof Measure) {

-			Measure measure = (Measure)value;

-			return measure.getIntegerValue(CSSValue.CSS_PRIMITIVE_VALUE);

-		}

-		return (int)value.getFloatValue(CSSValue.CSS_PRIMITIVE_VALUE);

-	}

-

-	public static int getIntColor(String value, CSSValue cssValue) {

-		RGBColor color;

-		if(cssValue instanceof RGBColor) {

-			//color:rgb(125, 255, 0);

-			color = (RGBColor)cssValue;

-		} else {

-			//color:red; || color:#FFFFFF;

-			color = CSS2ColorHelper.getRGBColor(value);

-		}

-

-		if(color == null) {

-			try {

-				return Integer.parseInt(value);

-			} catch (NumberFormatException ex) {

-				return -1;

-			}

-		}

-

-		return getIntColor(color);

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/custom/UMLCustomStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/custom/UMLCustomStyle.java
deleted file mode 100644
index ffbb644412e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/custom/UMLCustomStyle.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.custom;

-

-

-public interface UMLCustomStyle {

-

-	/**

-	 * Indicates whether the element's icon should be displayed in the diagram

-	 */

-	boolean getCSSElementIcon();

-

-	/**

-	 * Indicates whether a shadow should be displayed under the element in the diagram

-	 * 

-	 * @return

-	 */

-	boolean getCSSShadow();

-

-	/**

-	 * Indicates the depth of the element's qualified name to display

-	 * 

-	 * Full (0)

-	 * None (-1000)

-	 * Integer

-	 */

-	int getCSSQualifiedNameDepth();

-

-	/**

-	 * Indicates the way the stereotype should be displayed

-	 * 

-	 * Text

-	 * Text and Icon

-	 * Icon

-	 * Shape

-	 */

-	String getCSSStereotypeDisplay();

-

-	/**

-	 * If the stereotype display is set to Text, indicates the text alignment

-	 * 

-	 * Vertical

-	 * Horizontal

-	 */

-	String getCSSTextAlignment();

-

-	/**

-	 * Returns the position of the stereotype properties

-	 * 

-	 * Compartment

-	 * With braces

-	 * Comment

-	 */

-	String getCSSDisplayPlace();

-

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/dom/GMFCSSAdapter.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/dom/GMFCSSAdapter.java
deleted file mode 100644
index 9ea968fcc7d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/dom/GMFCSSAdapter.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.dom;

-

-import java.util.Arrays;

-import java.util.HashMap;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.e4.ui.css.core.dom.ElementAdapter;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.emf.Activator;

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

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-

-

-public class GMFCSSAdapter extends ElementAdapter implements NodeList {

-

-	//TODO : Use an extension point for this map, or find another way to map Diagram ID to CSS Element name

-	public static final Map<String, String> diagramNameMappings = new HashMap<String, String>();

-

-	static {

-		//UML

-		diagramNameMappings.put("CompositeStructure", "CompositeDiagram");

-		diagramNameMappings.put("Package", "PackageDiagram");

-		diagramNameMappings.put("PapyrusUMLActivityDiagram", "ActivityDiagram");

-		diagramNameMappings.put("PapyrusUMLClassDiagram", "ClassDiagram");

-		diagramNameMappings.put("PapyrusUMLCommunicationDiagram", "CommunicationDiagram");

-		diagramNameMappings.put("PapyrusUMLComponentDiagram", "ComponentDiagram");

-		diagramNameMappings.put("PapyrusUMLDeploymentDiagram", "DeploymentDiagram");

-		diagramNameMappings.put("PapyrusUMLProfileDiagram", "ProfileDiagram");

-		diagramNameMappings.put("PapyrusUMLSequenceDiagram", "SequenceDiagram");

-		diagramNameMappings.put("PapyrusUMLStateMachineDiagram", "StateMachineDiagram");

-		diagramNameMappings.put("UseCase", "UseCaseDiagram");

-

-		//SysML

-		diagramNameMappings.put("BlockDefinition", "BlockDiagram");

-		diagramNameMappings.put("InternalBlock", "InternalBlockDiagram");

-		diagramNameMappings.put("PapyrusSysMLRequirement", "RequirementDiagram");

-		diagramNameMappings.put("Parametric", "ParametricDiagram");

-	}

-

-	/**

-	 * The UML Element associated to the current styled element

-	 * Might also be a GMF Diagram

-	 */

-	private EObject semanticElement;

-

-	/**

-	 * The current GMF Element

-	 */

-	private EObject notationElement;

-

-	private String namespaceURI;

-

-	private String localName;

-

-	private Node[] children;

-

-	private Node parentNode;

-

-	/**

-	 * The css id property

-	 */

-	public static final String CSS_GMF_ID_KEY = "cssId";

-

-	/**

-	 * The css class property

-	 */

-	public static final String CSS_GMF_CLASS_KEY = "cssClass";

-

-	/**

-	 * The css style property

-	 */

-	public static final String CSS_GMF_STYLE_KEY = "cssStyle";

-

-	/**

-	 * The name of the EAnnotation containing css informations

-	 * 

-	 * @see CSS_GMF_ID_KEY

-	 * @see CSS_GMF_CLASS_KEY

-	 * @see CSS_GMF_STYLE_KEY

-	 */

-	public static final String CSS_ANNOTATION = "PapyrusCSSStyle";

-

-	public static String getCSSID(EObject sourceElement) {

-		return getCSSValue(sourceElement, CSS_GMF_ID_KEY);

-	}

-

-	public static String getCSSClass(EObject sourceElement) {

-		return getCSSValue(sourceElement, CSS_GMF_CLASS_KEY);

-	}

-

-	public static String getCSSStyle(EObject sourceElement) {

-		return getCSSValue(sourceElement, CSS_GMF_STYLE_KEY);

-	}

-

-	public static EAnnotation getStyleAnnotation(EModelElement modelElement) {

-		if(modelElement == null) {

-			return null;

-		}

-

-		return modelElement.getEAnnotation(CSS_ANNOTATION);

-	}

-

-	private static String getCSSValue(EObject sourceElement, String key) {

-		EModelElement modelElement = findModelElement(sourceElement);

-		EAnnotation annotation = getStyleAnnotation(modelElement);

-		if(annotation == null) {

-			return null;

-		}

-

-		return annotation.getDetails().get(key);

-	}

-

-	private static EModelElement findModelElement(EObject sourceElement) {

-		if(sourceElement == null) {

-			return null;

-		}

-

-		if(sourceElement instanceof EModelElement) {

-			return (EModelElement)sourceElement;

-		}

-

-		return findModelElement(sourceElement.eContainer());

-	}

-

-	public GMFCSSAdapter(EObject eObject, CSSEngine engine) {

-		super(eObject, engine);

-

-		notationElement = eObject;

-	}

-

-	private EObject getSemanticElement() {

-		if(semanticElement == null) {

-			semanticElement = findSemanticElement(notationElement);

-		}

-		return semanticElement;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * Returns the first parent Notation Element representing a different semantic object

-	 * than self.

-	 */

-	public Node getParentNode() {

-		if(parentNode == null) {

-			EObject gmfElement = notationElement;

-			while(gmfElement != null) {

-				EObject semanticElement = findSemanticElement(gmfElement);

-

-				if(semanticElement != this.getSemanticElement()) {

-					break;

-				}

-

-				if(gmfElement == gmfElement.eContainer()) {

-					gmfElement = null;

-					break;

-				}

-

-				gmfElement = gmfElement.eContainer();

-			}

-

-			if(gmfElement instanceof Node) {

-				parentNode = (Node)gmfElement;

-			}

-		}

-

-		return parentNode;

-	}

-

-	public NodeList getChildNodes() {

-		return this;

-	}

-

-	public String getNamespaceURI() {

-		return EMFHelper.getQualifiedName(getSemanticElement().eClass().getEPackage(), ".");

-	}

-

-	public String getCSSId() {

-		return getCSSID(notationElement);

-	}

-

-	public String getCSSClass() {

-		return getCSSClass(notationElement);

-	}

-

-	public String getCSSStyle() {

-		return getCSSStyle(notationElement);

-	}

-

-	@Override

-	public String getLocalName() {

-		if(getSemanticElement() instanceof Diagram) {

-			Diagram diagram = (Diagram)getSemanticElement();

-			String type = diagram.getType();

-			if(diagramNameMappings.containsKey(type)) {

-				return diagramNameMappings.get(type);

-			}

-			return type;

-		}

-

-		return getSemanticElement().eClass().getName();

-	}

-

-	@Override

-	public String getAttribute(String attr) {

-		EStructuralFeature feature = semanticElement.eClass().getEStructuralFeature(attr);

-		if(feature != null) {

-			Object value = semanticElement.eGet(feature);

-			if(value != null) {

-				return value.toString();

-			}

-		}

-

-		return "";

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * Returns the GMF EObject handled by this adapter

-	 */

-	@Override

-	public EObject getNativeWidget() {

-		return notationElement;

-	}

-

-

-

-	/////////////

-	//Node List//

-	/////////////

-

-

-

-	public Node item(int index) {

-		return getChildren()[index];

-	}

-

-	public int getLength() {

-		return getChildren().length;

-	}

-

-	private Node[] getChildren() {

-		if(children == null) {

-			children = computeChildren(notationElement);

-		}

-

-		return children;

-	}

-

-	/**

-	 * Returns the list of notation child elements attached to semantic

-	 * elements different than self's semantic element.

-	 * 

-	 * If a notation child element represents the same semantic element

-	 * than self, returns its own children (Recursively).

-	 */

-	private static Node[] computeChildren(EObject notationElement) {

-		EObject semanticElement = findSemanticElement(notationElement);

-		List<Node> childList = new LinkedList<Node>();

-		for(EObject child : notationElement.eContents()) {

-			if(child instanceof View) {

-				View notationChild = (View)child;

-				if(findSemanticElement(notationChild) != semanticElement) {

-					childList.add((Node)notationChild);

-				} else {

-					childList.addAll(Arrays.asList(computeChildren(notationChild)));

-				}

-			}

-		}

-

-		return childList.toArray(new Node[childList.size()]);

-	}

-

-	/**

-	 * Returns the semantic element attached to the given notation element

-	 * 

-	 * The result element can also be a Diagram

-	 */

-	private static EObject findSemanticElement(EObject notationElement) {

-		if(notationElement instanceof Diagram) {

-			return notationElement;

-		}

-

-		EObject currentElement = notationElement;

-

-		do {

-			if(currentElement instanceof View) {

-				View view = (View)currentElement;

-				return view.getElement();

-			}

-			currentElement = currentElement.eContainer();

-		} while(currentElement != null);

-

-		Activator.log.warn("Cannot find a valid source for " + notationElement);

-		return notationElement;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/ExtendedCSSEngine.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/ExtendedCSSEngine.java
deleted file mode 100644
index 60e4b3dde61..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/ExtendedCSSEngine.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

-

-import java.net.URL;

-

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-

-

-public interface ExtendedCSSEngine extends LazyCSSEngine, CSSEngine {

-

-	public static final ExtendedCSSEngine instance = new ExtendedCSSEngineImpl();

-

-	/**

-	 * Parses a stylesheet from a given URL.

-	 * The kind of stylesheet (CSS vs CSSX) is determined according to the

-	 * file's extension (Standard parser for CSS, extended parser for CSSX)

-	 * 

-	 * @param inputURL

-	 */

-	public void parseStyleSheet(URL inputURL);

-

-	/**

-	 * Parses a stylesheet from a given URL.

-	 * If extended is true, the CSSX parser will be used. Otherwise,

-	 * the standard CSS parser is used.

-	 * 

-	 * @param inputURL

-	 * @param extended

-	 */

-	public void parseStyleSheet(URL inputURL, boolean extended);

-

-	/**

-	 * Resets the CSS cache

-	 */

-	public void resetCache();

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java
deleted file mode 100644
index eecfeadf220..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.e4.ui.css.core.dom.ExtendedDocumentCSS;

-import org.eclipse.e4.ui.css.core.dom.parsers.CSSParser;

-import org.eclipse.e4.ui.css.core.dom.parsers.CSSParserFactory;

-import org.eclipse.e4.ui.css.core.dom.parsers.ICSSParserFactory;

-import org.eclipse.e4.ui.css.core.impl.engine.AbstractCSSEngine;

-import org.eclipse.e4.ui.css.core.impl.sac.CSSConditionFactoryImpl;

-import org.eclipse.e4.ui.css.core.impl.sac.CSSSelectorFactoryImpl;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.Activator;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.GMFCSSDiagram;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.converters.ColorToGMFConverter;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.enginecopy.ExtendedViewCSSImpl;

-import org.w3c.css.sac.ConditionFactory;

-import org.w3c.dom.Element;

-import org.w3c.dom.css.CSSStyleDeclaration;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.css.ViewCSS;

-

-

-/**

- * An Implementation of a Lazy, Extended CSS Engine

- * 

- * Lazy means the engine doesn't apply a style to an element. Instead,

- * the element requests a value for a given property.

- * 

- * Extended means the engine can parse CSSX files, which can handle custom

- * query selectors, as well as standard CSS files.

- * 

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class ExtendedCSSEngineImpl extends AbstractCSSEngine implements ExtendedCSSEngine {

-

-	public static final ConditionFactory CONDITIONFACTORY_INSTANCE = new CSSConditionFactoryImpl(null, "class", null, "id");

-

-	private boolean isExtended = false;

-

-	private long lastInit;

-

-	private final Map<Element, CSSStyleDeclaration> declarationsCache = new HashMap<Element, CSSStyleDeclaration>();

-

-	ExtendedViewCSSImpl viewCSS;

-

-	private ExtendedCSSEngine parent;

-

-	public ExtendedCSSEngineImpl() {

-		this(null);

-	}

-

-	public ExtendedCSSEngineImpl(ExtendedCSSEngine parent) {

-		super();

-		init(parent);

-	}

-

-	public ExtendedCSSEngineImpl(ExtendedCSSEngine parent, ExtendedDocumentCSS documentCSS) {

-		super(documentCSS);

-		init(parent);

-	}

-

-	private void init(ExtendedCSSEngine parent) {

-		viewCSS = new ExtendedViewCSSImpl(getDocumentCSS());

-		this.parent = parent;

-		//TODO : Register converters

-		this.registerCSSValueConverter(new ColorToGMFConverter());

-		//this.registerCSSValueConverter(...);

-	}

-

-	private void refreshStyleSheets() {

-		if(lastInit + 3000 > System.currentTimeMillis()) {

-			return;

-		}

-

-		lastInit = System.currentTimeMillis();

-		reset();

-

-		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_base.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_fill.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_simple.css");

-		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_theme.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus.cssx"); //Sample CSSX engine (Proto)

-	}

-

-	private void addStyleSheet(String styleSheet) {

-		try {

-			URL styleSheetURL = new URL(styleSheet);

-			parseStyleSheet(styleSheetURL);

-		} catch (MalformedURLException ex) {

-			Activator.log.error("Cannot find the specified stylesheet : " + styleSheet, ex);

-		}

-	}

-

-	@Override

-	public String retrieveCSSProperty(Object widget, String property, String pseudo) {

-		CSSValue value = retrievePropertyValue((Element)widget, property);

-		if(value == null) {

-			return null;

-		}

-		return value.getCssText();

-	}

-

-	/**

-	 * Implements the right priority between css declaration in different stylesheets

-	 * 

-	 * - First, look for rule specificity in all declared StyleSheet

-	 * - Then, if two rules have the same specificity, returns the last declared rule

-	 */

-	public CSSValue retrievePropertyValue(Element element, String property) {

-		//		ExtendedCSSEngine engine = findEngine(element);

-		//		return engine.retrievePropertyValue(element, property);

-		refreshStyleSheets();

-

-		CSSStyleDeclaration declaration = getStyleDeclaration(element);

-

-		return declaration.getPropertyCSSValue(property);

-	}

-

-	private ExtendedCSSEngine findEngine(Element element) {

-		do {

-			if(element instanceof GMFCSSDiagram) {

-				return ((GMFCSSDiagram)element).getEngine();

-			}

-		} while((element = (Element)element.getParentNode()) != null);

-

-		return WorkspaceCSSEngine.instance; //Should not happen

-	}

-

-	private CSSStyleDeclaration getStyleDeclaration(Element element) {

-		return getStyleDeclaration(element, null);

-	}

-

-	private CSSStyleDeclaration getStyleDeclaration(Element element, String pseudo) {

-		if(!declarationsCache.containsKey(element)) {

-			declarationsCache.put(element, getViewCSS().getComputedStyle(element, pseudo));

-		}

-		return declarationsCache.get(element);

-	}

-

-	@Override

-	public ViewCSS getViewCSS() {

-		return viewCSS;

-	}

-

-	@Override

-	public void reset() {

-		resetCache();

-		super.reset();

-	}

-

-	@Override

-	public CSSParser makeCSSParser() {

-		if(isExtended) {

-			return makeExtendedCSSParser();

-		}

-

-		// Create CSS Parser

-		ICSSParserFactory factory = CSSParserFactory.newInstance();

-		CSSParser parser = factory.makeCSSParser();

-

-		// Register Batik CSS Selector factory.

-		parser.setSelectorFactory(CSSSelectorFactoryImpl.INSTANCE);

-

-		// Register Custom CSS Condition factory.

-		parser.setConditionFactory(CONDITIONFACTORY_INSTANCE);

-

-		return parser;

-	}

-

-	private CSSParser makeExtendedCSSParser() {

-		throw new UnsupportedOperationException();

-	}

-

-	public void parseStyleSheet(URL inputURL) {

-		boolean extended = inputURL.getPath().endsWith(".cssx");

-		parseStyleSheet(inputURL, extended);

-	}

-

-	public void parseStyleSheet(URL inputURL, boolean extended) {

-		if(extended) {

-			isExtended = true;

-		}

-		try {

-			parseStyleSheet(inputURL.openStream());

-		} catch (IOException ex) {

-			Activator.log.error("Cannot open the required URL", ex);

-		} finally {

-			isExtended = false;

-		}

-	}

-

-	public void resetCache() {

-		declarationsCache.clear();

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFCSSEngineImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFCSSEngineImpl.java
deleted file mode 100644
index ea975503fc9..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFCSSEngineImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-

-import org.eclipse.e4.ui.css.core.dom.ExtendedDocumentCSS;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.e4.ui.css.core.impl.engine.CSSEngineImpl;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.Activator;

-import org.w3c.dom.Element;

-import org.w3c.dom.css.CSSStyleDeclaration;

-import org.w3c.dom.css.CSSStyleSheet;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.css.DocumentCSS;

-import org.w3c.dom.css.ViewCSS;

-import org.w3c.dom.stylesheets.StyleSheet;

-

-//TODO : Observe the resource for modifications

-//TODO : Remove the refresh timer

-//TODO : Read CSS file from ModelSet

-public class GMFCSSEngineImpl extends CSSEngineImpl {

-

-	private long lastInit;

-

-	private GMFCSSEngineImpl() {

-		setErrorHandler(new GMFErrorHandler());

-		//Set converters

-		init();

-	}

-

-	public static CSSEngine instance = new GMFCSSEngineImpl();

-

-	@Override

-	public ViewCSS getViewCSS() {

-		init();

-		return super.getViewCSS();

-	}

-

-	private void init() {

-		if(lastInit + 5000 > System.currentTimeMillis()) {

-			return;

-		}

-

-		lastInit = System.currentTimeMillis();

-		reset();

-

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_base.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_simple.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_theme.css");

-		//		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus.cssx"); //Sample CSSX engine (Proto)

-

-		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_fill.css");

-		addStyleSheet("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/papyrus_base.css");

-	}

-

-	@Override

-	public String retrieveCSSProperty(Object widget, String property, String pseudo) {

-		CSSStyleDeclaration style = getViewCSS().getComputedStyle((Element)element, pseudo);

-		if(style == null) {

-			return null;

-		}

-		

-		String value = style.getPropertyCSSValue(propertyName)tPropertyValue(property);

-		

-		return value;

-	}

-

-	private void addStyleSheet(String url) {

-		try {

-			URL styleSheetURL = new URL(url);

-			InputStream inputStream = styleSheetURL.openStream();

-			if(url.endsWith(".cssx")) {

-				parsePapyrusStyleSheet(inputStream);

-			} else {

-				parseStyleSheet(inputStream);

-			}

-		} catch (FileNotFoundException ex) {

-			Activator.log.error(ex);

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	private StyleSheet parsePapyrusStyleSheet(InputStream inputStream) {

-		SampleCSSXParser parser = new SampleCSSXParser();

-		CSSStyleSheet s = parser.createStyleSheet();

-

-		DocumentCSS documentCSS = getDocumentCSS();

-		if(documentCSS instanceof ExtendedDocumentCSS) {

-			((ExtendedDocumentCSS)documentCSS).addStyleSheet(s);

-		}

-		return s;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFErrorHandler.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFErrorHandler.java
deleted file mode 100644
index ff9b1efbcaa..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFErrorHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

-

-import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.Activator;

-

-

-public class GMFErrorHandler implements CSSErrorHandler {

-

-	public void error(Exception ex) {

-		Activator.log.error("CSS Error", ex);

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/LazyCSSEngine.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/LazyCSSEngine.java
deleted file mode 100644
index 3f00aec3112..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/LazyCSSEngine.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

-

-import org.w3c.dom.Element;

-import org.w3c.dom.css.CSSValue;

-

-

-/**

- * An interface for Lazy CSS Engine

- * 

- * The Engine doesn't modify an Element. Instead, for an element, it returns the

- * value of the required property.

- * 

- * @author Camille Letavernier

- */

-public interface LazyCSSEngine {

-

-	public CSSValue retrievePropertyValue(Element element, String property);

-

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/SampleCSSXParser.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/SampleCSSXParser.java
deleted file mode 100644
index 3e268ec5a1e..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/SampleCSSXParser.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

-

-import org.eclipse.e4.ui.css.core.css2.CSS2PrimitiveValueImpl;

-import org.eclipse.e4.ui.css.core.dom.CSSProperty;

-import org.eclipse.e4.ui.css.core.impl.dom.CSSPropertyImpl;

-import org.eclipse.e4.ui.css.core.impl.dom.CSSRuleListImpl;

-import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleDeclarationImpl;

-import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleRuleImpl;

-import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleSheetImpl;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.selector.CSSXSelector;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.selector.CSSXSelectorList;

-import org.w3c.css.sac.Selector;

-import org.w3c.dom.css.CSSRuleList;

-import org.w3c.dom.css.CSSStyleSheet;

-import org.w3c.dom.css.CSSValue;

-

-/**

- * 

- * CSSX Proof of Concept

- * The parser doesn't actually parse anything

- * It simply returns a Java implementation of the CSS Rules

- * 

- * @author Camille Letavernier

- * 

- */

-public class SampleCSSXParser {

-

-	public CSSStyleSheet createStyleSheet() {

-		CSSStyleSheetImpl s = new CSSStyleSheetImpl();

-

-		CSSRuleList rules = createRuleList();

-

-		s.setRuleList(rules);

-

-		return s;

-	}

-

-	public CSSRuleList createRuleList() {

-		CSSRuleListImpl rules = new CSSRuleListImpl();

-

-		CSSXSelectorList selectorList = new CSSXSelectorList();

-

-		Selector selector = new CSSXSelector();

-		selectorList.addSelector(selector);

-

-		CSSStyleRuleImpl rule = new CSSStyleRuleImpl(null, null, selectorList);

-		rule.setStyle(createStyleDeclaration());

-		rules.add(rule);

-

-		return rules;

-	}

-

-	private CSSStyleDeclarationImpl createStyleDeclaration() {

-		CSSStyleDeclarationImpl styleDeclaration = new CSSStyleDeclarationImpl(null);

-

-		styleDeclaration.addProperty(createCSSProperty());

-

-		return styleDeclaration;

-	}

-

-	private CSSProperty createCSSProperty() {

-		CSSValue value = new CSS2PrimitiveValueImpl("red") {

-

-			@Override

-			public String getCssText() {

-				return getStringValue();

-			}

-		};

-

-		CSSPropertyImpl property = new CSSPropertyImpl("lineColor", value, false);

-		return property;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/CSSComputedStyleImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/CSSComputedStyleImpl.java
deleted file mode 100644
index 8f13e897e54..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/CSSComputedStyleImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Angelo Zerr and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
- *     EclipseSource - revision
- *     IBM Corporation - ongoing development
- *******************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.enginecopy;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.e4.ui.css.core.dom.CSSProperty;
-import org.eclipse.e4.ui.css.core.dom.CSSPropertyList;
-import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleDeclarationImpl;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-
-/**
- * CSS computed style which concatenate list of CSSComputedStyleImpl to manage
- * styles coming from Condition Selector (ex : Label#MyId) and other selectors
- * (ex : Label).
- */
-@SuppressWarnings({ "serial", "restriction" })
-public class CSSComputedStyleImpl extends CSSStyleDeclarationImpl implements CSSStyleDeclaration {
-
-	private List<StyleWrapper> styleRules;
-
-	public CSSComputedStyleImpl(List<StyleWrapper> styleRules) {
-		super(null);
-		this.styleRules = styleRules;
-		// TODO [rst] Optimize: A list of StyleWrapper instances could be sorted
-		// only once after reading the stylesheet(s).
-		Collections.sort(this.styleRules, StyleWrapper.COMPARATOR);
-		Iterator<StyleWrapper> iterator = this.styleRules.iterator();
-		while(iterator.hasNext()) {
-			StyleWrapper styleWrapper = iterator.next();
-			addCSSPropertyList(((CSSStyleDeclarationImpl)styleWrapper.style).getCSSPropertyList());
-		}
-	}
-
-	private void addCSSPropertyList(CSSPropertyList properties) {
-		int length = properties.getLength();
-		for(int i = 0; i < length; i++) {
-			CSSProperty property = properties.item(i);
-
-			super.removeProperty(property.getName());
-			super.addProperty(property);
-		}
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java
deleted file mode 100644
index 24f9f382a9d..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.enginecopy;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.e4.ui.css.core.dom.ExtendedCSSRule;

-import org.eclipse.e4.ui.css.core.impl.dom.ViewCSSImpl;

-import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;

-import org.w3c.css.sac.Selector;

-import org.w3c.css.sac.SelectorList;

-import org.w3c.dom.Element;

-import org.w3c.dom.css.CSSRule;

-import org.w3c.dom.css.CSSRuleList;

-import org.w3c.dom.css.CSSStyleDeclaration;

-import org.w3c.dom.css.CSSStyleRule;

-import org.w3c.dom.css.CSSStyleSheet;

-import org.w3c.dom.css.DocumentCSS;

-import org.w3c.dom.stylesheets.StyleSheetList;

-

-

-@SuppressWarnings("restriction")

-public class ExtendedViewCSSImpl extends ViewCSSImpl {

-

-	public ExtendedViewCSSImpl(DocumentCSS documentCSS) {

-		super(documentCSS);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * Implementation based on {@link ViewCSSImpl#getComputedStyle(Element, String)} The base implementations returns the first CSSStyleDeclaration.

-	 * 

-	 * When a StyleDeclaration is found in a StyleSheet, it is added to a list of declarations.

-	 * Then, these declarations are merged

-	 */

-	@Override

-	public CSSStyleDeclaration getComputedStyle(Element elt, String pseudo) {

-		StyleSheetList styleSheetList = documentCSS.getStyleSheets();

-

-		List<StyleWrapper> declarations = new ArrayList<StyleWrapper>();

-

-		int l = styleSheetList.getLength();

-		for(int i = 0; i < l; i++) {

-			CSSStyleSheet styleSheet = (CSSStyleSheet)styleSheetList.item(i);

-			List<StyleWrapper> styleWrappers = getStyleWrappers(styleSheet, elt, pseudo);

-			declarations.addAll(styleWrappers);

-		}

-

-		return new CSSComputedStyleImpl(declarations);

-	}

-

-	/**

-	 * Implementation based on {@link ViewCSSImpl#getComputedStyle(CSSStyleSheet, Element, String)}

-	 * 

-	 * Returns the StyleWrappers instead of a StyleDeclaration

-	 */

-	private List<StyleWrapper> getStyleWrappers(CSSStyleSheet styleSheet, Element elt, String pseudoElt) {

-		List<StyleWrapper> styleDeclarations = new ArrayList<StyleWrapper>();

-		CSSRuleList ruleList = styleSheet.getCssRules();

-		int length = ruleList.getLength();

-		int position = 0;

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

-			CSSRule rule = ruleList.item(i);

-			switch(rule.getType()) {

-			case CSSRule.STYLE_RULE:

-			{

-				CSSStyleRule styleRule = (CSSStyleRule)rule;

-				if(rule instanceof ExtendedCSSRule) {

-					ExtendedCSSRule r = (ExtendedCSSRule)rule;

-					SelectorList selectorList = r.getSelectorList();

-					// Loop for SelectorList

-					int l = selectorList.getLength();

-					for(int j = 0; j < l; j++) {

-						Selector selector = selectorList.item(j);

-						if(selector instanceof ExtendedSelector) {

-							ExtendedSelector extendedSelector = (ExtendedSelector)selector;

-							if(extendedSelector.match(elt, pseudoElt)) {

-								CSSStyleDeclaration style = styleRule.getStyle();

-								int specificity = extendedSelector.getSpecificity();

-								StyleWrapper wrapper = new StyleWrapper(style, specificity, position++);

-								styleDeclarations.add(wrapper);

-							}

-						} else {

-							// TODO : selector is not batik ExtendedSelector,

-							// Manage this case...

-						}

-					}

-				} else {

-					// TODO : CSS rule is not ExtendedCSSRule,

-					// Manage this case...

-				}

-			}

-			}

-		}

-

-		return styleDeclarations;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/StyleWrapper.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/StyleWrapper.java
deleted file mode 100644
index b425f8a0230..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/enginecopy/StyleWrapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution, 
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   EclipseSource - initial API and implementation
- ******************************************************************************/
-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.enginecopy;
-
-import java.util.Comparator;
-
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-/**
- * A wrapper that holds a reference to the styles defined in a CSS rule block,
- * together with all the information needed to calculate a matching selector's
- * precedence.
- */
-final class StyleWrapper {
-
-	private static class StyleWrapperComparator implements Comparator<StyleWrapper> {
-
-		public int compare(final StyleWrapper wrapper1, final StyleWrapper wrapper2) {
-			int result = 0;
-			if(wrapper1.specificity > wrapper2.specificity) {
-				result = 1;
-			} else if(wrapper1.specificity < wrapper2.specificity) {
-				result = -1;
-			} else if(wrapper1.position > wrapper2.position) {
-				result = 1;
-			} else if(wrapper1.position < wrapper2.position) {
-				result = -1;
-			}
-			return result;
-		}
-	}
-
-	/**
-	 * A comparator for {@link StyleWrapper}s.
-	 */
-	public static final StyleWrapperComparator COMPARATOR = new StyleWrapperComparator();
-
-	public final CSSStyleDeclaration style;
-
-	public final int specificity;
-
-	public final int position;
-
-	public StyleWrapper(CSSStyleDeclaration style, int specificity, int position) {
-		this.style = style;
-		this.specificity = specificity;
-		this.position = position;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/selector/CSSXSelector.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/selector/CSSXSelector.java
deleted file mode 100644
index cca4b392554..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/selector/CSSXSelector.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.selector;

-

-import java.util.Set;

-

-import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;

-import org.w3c.dom.Element;

-

-

-public class CSSXSelector implements ExtendedSelector {

-

-	public short getSelectorType() {

-		return 1001;

-	}

-

-	public boolean match(Element e, String pseudoE) {

-		return true;

-	}

-

-	public int getSpecificity() {

-		return 0;

-	}

-

-	public void fillAttributeSet(Set attrSet) {

-

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/selector/CSSXSelectorList.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/selector/CSSXSelectorList.java
deleted file mode 100644
index cb5024554df..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/selector/CSSXSelectorList.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.selector;

-

-import java.util.LinkedList;

-import java.util.List;

-

-import org.w3c.css.sac.Selector;

-import org.w3c.css.sac.SelectorList;

-

-

-public class CSSXSelectorList implements SelectorList {

-

-	private List<Selector> selectors = new LinkedList<Selector>();

-

-	public int getLength() {

-		return selectors.size();

-	}

-

-	public Selector item(int index) {

-		return selectors.get(index);

-	}

-

-	public void addSelector(Selector selector) {

-		selectors.add(selector);

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/handler/RefreshHandler.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/handler/RefreshHandler.java
deleted file mode 100644
index 195e97562c3..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/handler/RefreshHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.handler;

-

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

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

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

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

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

-import org.eclipse.papyrus.infra.core.utils.EditorUtils;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.factory.GMFCSSFactory;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.helper.DiagramHelper;

-import org.eclipse.ui.IEditorPart;

-

-

-public class RefreshHandler extends AbstractHandler {

-

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		GMFCSSFactory.getInstance().getCSSEngine().resetCache();

-

-		IEditorPart activeEditor = EditorUtils.getMultiDiagramEditor().getActiveEditor();

-		if(activeEditor instanceof DiagramEditor) {

-			DiagramEditor diagramEditor = (DiagramEditor)activeEditor;

-			DiagramEditPart topEditPart = diagramEditor.getDiagramEditPart();

-			if(topEditPart != null) {

-				DiagramHelper.refresh(topEditPart, true);

-			}

-		}

-

-		return null;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/helper/DiagramHelper.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/helper/DiagramHelper.java
deleted file mode 100644
index c3a360b2f5a..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/helper/DiagramHelper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.helper;

-

-import java.util.List;

-

-import org.eclipse.gef.EditPart;

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

-

-

-public class DiagramHelper {

-

-	public static void refresh(EditPart editPart, boolean recursive) {

-		editPart.refresh();

-		if(recursive) {

-			for(EditPart childEditPart : (List<EditPart>)editPart.getChildren()) {

-				refresh(childEditPart, true);

-			}

-		}

-	}

-

-	public static void refresh(DiagramEditPart diagramEditPart, boolean recursive) {

-		diagramEditPart.refresh();

-		if(recursive) {

-			for(EditPart childEditPart : (List<EditPart>)diagramEditPart.getChildren()) {

-				refresh(childEditPart, true);

-			}

-			for(EditPart childEditPart : (List<EditPart>)diagramEditPart.getConnections()) {

-				refresh(childEditPart, true);

-			}

-		}

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/helper/ParserHelper.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/helper/ParserHelper.java
deleted file mode 100644
index 04d2aec78e0..00000000000
--- a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/helper/ParserHelper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.prototype.infra.gmfdiag.css.helper;

-

-import java.io.IOException;

-

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.papyrus.prototype.infra.gmfdiag.css.Activator;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.css.CSSValueList;

-

-

-public class ParserHelper {

-

-	//TODO : Handle quote-protected values

-	//parseValue("fo o" bar "foobar") = ["fo o","bar","foobar"]

-	public static String[] parseValues(CSSEngine engine, String value) {

-		CSSValue cssValue;

-		try {

-			cssValue = engine.parsePropertyValue(value);

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-			return new String[0];

-		}

-

-		if(cssValue instanceof CSSValueList) {

-			CSSValueList list = (CSSValueList)cssValue;

-			return toArray(list);

-		}

-

-		return new String[]{ cssValue.getCssText() };

-	}

-

-	public static String[] toArray(CSSValueList valueList) {

-		String[] result = new String[valueList.getLength()];

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

-			result[i] = valueList.item(i).getCssText();

-		}

-		return result;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.classpath b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.project b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.project
deleted file mode 100644
index 41cb67dc32e..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.tools.utils</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>com.ibm.etools.common.migration.MigrationBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

-	</natures>

-</projectDescription>

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c20d04158e3..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Aug 26 16:57:01 CEST 2008

-eclipse.preferences.version=1

-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/sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF
deleted file mode 100644
index 536e021eb14..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.uml2.uml,

- org.eclipse.jface;bundle-version="3.4.1",

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

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

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

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

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

-Export-Package: org.eclipse.papyrus.uml.tools.utils

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.9.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/about.html b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

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

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

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

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

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

-

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

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

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

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

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

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

-

-</body>

-</html>

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/build.properties b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/build.properties
deleted file mode 100644
index a4412fd7bd3..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#

-#Mon Sep 12 09:30:24 CEST 2011

-bin.includes=META-INF/,.,plugin.properties,plugin.xml,about.html

-output..=bin/

-src.includes=about.html,META-INF/,.,plugin.properties,plugin.xml

-source..=src/

-bin..=bin/

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/plugin.properties b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/plugin.properties
deleted file mode 100644
index 7289324c408..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################

-# Copyright (c) 2008 CEA LIST.

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

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

-# which accompanies this distribution, and is available at

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

-#

-# Contributors:

-#     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation

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

-pluginName=Papyrus UML Utils (Incubation)

-pluginProvider=Eclipse Modeling Project

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/plugin.xml b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/plugin.xml
deleted file mode 100644
index b3e7c6012eb..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!--
- ################################################################################
-# Copyright (c) 2008 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     CEA LIST - initial API and implementation
-##################################################################################
--->
-
-<plugin>
-</plugin>
\ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/Activator.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/Activator.java
deleted file mode 100644
index 2d84a190ad4..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/Activator.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	/**
-	 * 
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.tools.utils";
-
-	// The shared instance
-	/**
-	 * 
-	 */
-	private static Activator plugin;
-
-	// Resource bundle.
-	/**
-	 * 
-	 */
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("com.cea.papyrus.umlutils.PluginManagerResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	/**
-	 * 
-	 * 
-	 * @param context
-	 * 
-	 * @throws Exception
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/**
-	 * 
-	 * 
-	 * @param context
-	 * 
-	 * @throws Exception
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not found.
-	 * 
-	 * @param key
-	 * 
-	 * @return
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = Activator.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,.
-	 * 
-	 * @return
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	/**
-	 * Logs a warning message in the plugin log
-	 * 
-	 * @param message
-	 *        the message to log
-	 */
-	public static void logWarning(String message) {
-		getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, message));
-	}
-
-	/**
-	 * Logs an error message in the plugin log
-	 * 
-	 * @param message
-	 *        the message to log
-	 */
-	public static void logError(String message) {
-		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, message));
-	}
-
-	/**
-	 * Logs an information message in the plugin log
-	 * 
-	 * @param message
-	 *        the message to log
-	 */
-	public static void logInfo(String message) {
-		getDefault().getLog().log(new Status(IStatus.INFO, Activator.PLUGIN_ID, message));
-	}
-
-	/**
-	 * Logs an error message in the plugin log
-	 * 
-	 * @param exception
-	 *        the exception to log
-	 */
-	public static void logException(Exception exception) {
-		getDefault().getLog().log(
-				new Status(IStatus.ERROR, Activator.PLUGIN_ID, exception.getLocalizedMessage(), exception));
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ActivityUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ActivityUtil.java
deleted file mode 100644
index ef4bf5e1620..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ActivityUtil.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

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

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

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

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

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

-

-/**

- * This class encapsulates an <code>org.eclipse.uml2.uml.Activity</code><BR>

- */

-

-public class ActivityUtil {

-

-	/**

-	 * Returns the uml2Activity's initial node. We consider that there is at most one initial node

-	 * in an activity.

-	 * 

-	 * @param uml2Activity

-	 *        investigated

-	 * @return the initial node of uml2Activity, null otherwise.

-	 */

-	// @unused

-	public static InitialNode getInitialNode(Activity uml2Activity) {

-		Iterator<ActivityNode> nodesIter = uml2Activity.getNodes().iterator();

-		while(nodesIter.hasNext()) {

-			ActivityNode currentNode = nodesIter.next();

-			if(currentNode instanceof InitialNode)

-				return (InitialNode)currentNode;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the activity node that is connected to uml2ActivityNode by a control flow. We

-	 * consider that there is at most one outgoing control flow from an activity node (first one

-	 * found is returned).

-	 * 

-	 * @param uml2ActivityNode

-	 *        origin node

-	 * @return next node of uml2ActivityNode, null otherwise.

-	 */

-	// @unused

-	public static ActivityNode getNextNode(ActivityNode uml2ActivityNode) {

-		Iterator<ActivityEdge> edgeIter = uml2ActivityNode.getOutgoings().iterator();

-		while(edgeIter.hasNext()) {

-			ActivityEdge currentEdge = edgeIter.next();

-			if(currentEdge instanceof ControlFlow)

-				return currentEdge.getTarget();

-		}

-		return null;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java
deleted file mode 100644
index 3f256a7d23c..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-

-package org.eclipse.papyrus.uml.tools.utils;

-

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.CollaborationUse</code><BR>

- */

-public class CollaborationUseUtil {

-

-	public final static String UNDEFINED_TYPE_NAME = "<Undefined>";

-

-	/**

-	 * return the full label of the CollaborationUse, given UML2 specification.

-	 * 

-	 * @return the string corresponding to the label of the CollaborationUse

-	 */

-	public static String getLabel(CollaborationUse collaborationUse) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		buffer.append(NamedElementUtil.getVisibilityAsSign(collaborationUse));

-

-		// name

-		buffer.append(" ");

-		buffer.append(collaborationUse.getName());

-

-		// type

-		if(collaborationUse.getType() != null) {

-			buffer.append(": " + collaborationUse.getType().getName());

-		} else {

-			buffer.append(": " + UNDEFINED_TYPE_NAME);

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * return the custom label of the CollaborationUse, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the CollaborationUse

-	 */

-	public static String getCustomLabel(CollaborationUse collaborationUse, int style) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-

-		buffer.append(" ");

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(collaborationUse));

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(collaborationUse.getName());

-		}

-

-		if((style & ICustomAppearence.DISP_TYPE) != 0) {

-			// type

-			if(collaborationUse.getType() != null) {

-				buffer.append(": " + collaborationUse.getType().getName());

-			} else {

-				buffer.append(": " + UNDEFINED_TYPE_NAME);

-			}

-		}

-

-		return buffer.toString();

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java
deleted file mode 100644
index a8d326ed3cd..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EClass;
-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.uml2.uml.Element;
-import org.eclipse.uml2.uml.Image;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.resource.UMLResource;
-
-public class ElementUtil {
-
-
-	/**
-	 * Return the stereotype application by passing an element of the static profile
-	 * 
-	 * @param element
-	 *        an UML model element
-	 * @param clazz
-	 *        the class of an element of a static profile. Compatible sub-types will be returned as well
-	 * @return the stereotype application or null
-	 */
-	@SuppressWarnings("unchecked")
-	public static <T extends EObject> T getStereotypeApplication(Element element, Class<T> clazz) {
-		for(EObject stereoApplication : element.getStereotypeApplications()) {
-			// check whether the stereotype is an instance of the passed parameter clazz
-			if(clazz.isInstance(stereoApplication)) {
-				return (T)stereoApplication;
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * Check if the StereotypedElement has the given stereotype.
-	 * 
-	 * @param stereotypeName
-	 *        The name of the stereotype to find.
-	 * @return the Stereotype application EObject.
-	 */
-	// @unused
-	public static EObject hasStereotype(Element elt, EClass stereotypeClass) {
-		EObject stereotypeApplication = null;
-
-		// Stereotype parsing
-		Iterator<EObject> stAppIt = elt.getStereotypeApplications().iterator();
-		while(stAppIt.hasNext() && (stereotypeApplication == null)) {
-			EObject stApp = stAppIt.next();
-			if(stApp.eClass().getEAllSuperTypes().contains(stereotypeClass) || (stApp.eClass().equals(stereotypeClass))) {
-				stereotypeApplication = stApp;
-			}
-		}
-
-		return stereotypeApplication;
-	}
-
-	/**
-	 * Getter to select an image for a stereotyped element (based on 1st applied stereotype)
-	 * 
-	 * @param element
-	 *        the element for which we are looking the icon
-	 * @param stereotype
-	 *        the stereotype that should have the icon
-	 * @param kind
-	 *        kind of display, should be <code>"icon"</code> or <code>"shape"</code>
-	 * @return the image corresponding to the stereotype or <code>null</code> if no image can be
-	 *         found
-	 */
-	public static Image getStereotypeImage(Element element, Stereotype stereotype, String kind) {
-		if(stereotype == null || element.getAppliedStereotypes() == null) {
-			return null;
-		}
-
-		Image image = null;
-
-		// Try to retrieve image based on getter implemented in static profile
-		image = ElementUtil.getStereotypeImageFromGetter(element, stereotype, kind);
-
-		if(image == null) {
-			// No image found by getters
-			// Search for the image verifying expressions
-			EList<Image> availableImages = new BasicEList<Image>();
-			if("icon".equals(kind)) {
-				availableImages = StereotypeUtil.getIcons(stereotype);
-			} else if("shape".equals(kind)) {
-				availableImages = StereotypeUtil.getShapes(stereotype);
-			}
-
-			if(!(availableImages).isEmpty()) {
-				// Retrieve first image verifying expression or
-				// first image if no expression is verified
-				image = ImageUtil.findImageVerifyingExpression(element, availableImages);
-
-				if(image == null) {
-					image = availableImages.get(0);
-				}
-			}
-		}
-
-		return image;
-	}
-
-	/**
-	 * Getter to select an image for a stereotyped element (based on 1st applied stereotype)
-	 * 
-	 * @param element
-	 *        to check
-	 * @param kind
-	 *        of image ("icon" | "shape")
-	 * @return {@link Image} or null
-	 */
-	public static Image getStereotypeImage(Element element, String kind) {
-		// Get first stereotype
-		if(element.getAppliedStereotypes() == null || element.getAppliedStereotypes().isEmpty()) {
-			return null; // null
-		}
-
-		// The image is one of the 1st stereotype
-		Stereotype stereotype = element.getAppliedStereotypes().get(0);
-
-		return getStereotypeImage(element, stereotype, kind);
-	}
-
-	/**
-	 * Find the image using a getter implemented in a static profile
-	 * 
-	 * @param element
-	 *        the stereotyped element
-	 * @param stereotype
-	 *        the applied stereotype
-	 * @param kind
-	 *        the kind of searched image ("icon" | "shape")
-	 * @return {@link Image} or null
-	 */
-	public static Image getStereotypeImageFromGetter(Element element, Stereotype stereotype, String kind) {
-
-		// Prepare getter method name
-		String getterName = "";
-		if("icon".equals(kind)) {
-			getterName += "getIcon";
-
-		} else if("shape".equals(kind)) {
-			getterName += "getShape";
-
-		} else {
-			// Unknown kind : abort and return null (no image)
-			return null;
-		}
-
-		// If the getter is implemented, it is implemented by the
-		// StereotypeApplication class
-		EObject stApp = element.getStereotypeApplication(stereotype);
-		Method getter = null;
-		try {
-			getter = stApp.getClass().getDeclaredMethod(getterName);
-		} catch (Exception e) {
-			// Implementation not found
-		}
-
-		// If the getter exists, invoke
-		if(getter != null) {
-			try {
-
-				// Retrieve image via getter in static profile
-				Image image = (Image)getter.invoke(stApp);
-
-				return image;
-
-			} catch (Exception e) {
-				// Invoke getter has failed
-				return null;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Test if the element has stereotype icons to display
-	 * 
-	 * @param element
-	 *        the element for which icon are searched
-	 * @return <code>true</code> if icons were found
-	 */
-	public static boolean hasIcons(Element element) {
-		if(!element.getAppliedStereotypes().isEmpty()) {
-			return hasIcons(element, element.getAppliedStereotypes().get(0));
-		}
-		return false;
-	}
-
-	/**
-	 * Test if the element has icons for the given stereotype
-	 * 
-	 * @param stereotype
-	 *        the stereotype we check to see if it has icon or not
-	 * @param element
-	 *        the stereotyped element
-	 * @return <code>true</code> if icons were found
-	 */
-	public static boolean hasIcons(Element element, Stereotype stereotype) {
-		return stereotype != null && !StereotypeUtil.getIcons(stereotype).isEmpty();
-	}
-
-	/**
-	 * Test if the element has stereotype shape to display
-	 * 
-	 * @param element
-	 *        the element for which shape are searched
-	 * @return <code>true</code> if shape were found
-	 */
-	// @unused
-	public static boolean hasShapes(Element element) {
-		if(!element.getAppliedStereotypes().isEmpty()) {
-			return hasShapes(element, element.getAppliedStereotypes().get(0));
-		}
-		return false;
-	}
-
-	/**
-	 * Test if the stereotype has shapes
-	 * 
-	 * @param stereotype
-	 * @return true if shapes were found
-	 */
-	public static boolean hasShapes(Element element, Stereotype stereotype) {
-		return stereotype != null && !StereotypeUtil.getShapes(stereotype).isEmpty();
-	}
-	
-	/**
-	 * look for all metaclasses of the meta model UML2 for a profile.
-	 * 
-	 * @param element
-	 *        the profile which needs the metaclasses list
-	 * @return the possible metaclasses
-	 */
-	// @unused
-	public static List<org.eclipse.uml2.uml.Class> getPossibleMetaclasses(Element element) {
-		List<org.eclipse.uml2.uml.Class> metaList = new ArrayList<org.eclipse.uml2.uml.Class>();
-		List<Type> metaclasses = getMetaclasses(element); // get all type of the
-		// metaclass
-
-		for(int i = 0; i < metaclasses.size(); i++) {
-			if(metaclasses.get(i) instanceof org.eclipse.uml2.uml.Class) {
-				metaList.add((org.eclipse.uml2.uml.Class)metaclasses.get(i));
-			}
-		}
-
-		return metaList;
-	}
-	
-	/**
-	 * return all type contained in the metamodel UML2. Elements in the list are the UML2
-	 * representation of the concepts of the metamodel. each element of the list must be casted with
-	 * org.eclipse.uml2.Classifier
-	 * 
-	 * @return list of metaclasses of the metamodel UML2
-	 */
-	public static List<Type> getMetaclasses(Element element) {
-		if(element == null) {
-			System.err.println("element should not be null to retrieve metaclasses");
-		}
-		org.eclipse.uml2.uml.Package uml2Metamodel = contentload(URI.createURI(UMLResource.UML_METAMODEL_URI), element);
-
-		return uml2Metamodel.getOwnedTypes();
-	}
-	
-	/**
-	 * Loads content for the given URI, and returns the top package of this content.
-	 * 
-	 * @param uri
-	 *        the uri of the content to load
-	 * @param element
-	 *        the Element used to retrieve ResourceSet
-	 * @return the top package of the loaded content
-	 */
-	public static org.eclipse.uml2.uml.Package contentload(URI uri, Element element) {
-		ResourceSet resourceSet = element.eResource().getResourceSet();
-		org.eclipse.uml2.uml.Package package_ = null;
-		try {
-			Resource resource = resourceSet.getResource(uri, true);
-
-			package_ = (org.eclipse.uml2.uml.Package)EcoreUtil.getObjectByType(resource.getContents(),
-					UMLPackage.eINSTANCE.getPackage());
-		} catch (WrappedException we) {
-			Activator.logError("impossible to load content for URI: " + uri);
-		}
-
-		return package_;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ExecutionSpecificationUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ExecutionSpecificationUtil.java
deleted file mode 100644
index 912376d6bdd..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ExecutionSpecificationUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- * 		Atos Origin - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

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

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Executionspecification</code><BR>

- */

-public class ExecutionSpecificationUtil {

-

-	/**

-	 * Retrieve the Lifeline associated with an ExecutionSpecification.

-	 * According to the UML Specification, an ExecutionSpecification must have a start and a finish.

-	 * 

-	 * In Papyrus, an ExecutionSpecification may not have a start and finish.

-	 * To handle this specific case, we return the first Lifeline that the ES covered.

-	 * 

-	 * @param es

-	 *        the targeted execution specification

-	 * @return the associated Lifeline, or null if the ES has no start, no finish, no covered Lifeline.

-	 */

-	public static Lifeline getExecutionSpecificationLifeline(ExecutionSpecification es) {

-		Lifeline lifeline = null;

-		if(es.getStart() != null) {

-			lifeline = es.getStart().getCovereds().get(0);

-		} else if(es.getFinish() != null) {

-			lifeline = es.getFinish().getCovereds().get(0);

-		}

-

-		if(lifeline == null) {

-			if(!es.getCovereds().isEmpty()) {

-				lifeline = es.getCovereds().get(0);

-			}

-		}

-		return lifeline;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ExtensionPointUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ExtensionPointUtil.java
deleted file mode 100644
index c63a0829680..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ExtensionPointUtil.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

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

-

-package org.eclipse.papyrus.uml.tools.utils;

-

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

-

-/**

- * Utility class for {@link ExtensionPoint}

- */

-// @unused

-public class ExtensionPointUtil {

-

-	/**

-	 * Returns the explanation for the extension point element

-	 * 

-	 * @return the string defining explanation for the extension point element

-	 */

-	// @unused

-	public static String getExplanation(ExtensionPoint extensionPoint) {

-		String explanation = "";

-		final String name = ((extensionPoint.getName() != null) ? extensionPoint.getName() : "");

-		int startIndexOfExplanation = name.lastIndexOf(":");

-		if((startIndexOfExplanation > 0) && (startIndexOfExplanation != name.length())) {

-			explanation = name.substring(startIndexOfExplanation + 1).trim();

-		}

-		return explanation;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearence.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearence.java
deleted file mode 100644
index 3f1c55fea67..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearence.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-/**

- * Interface that manages display constants for custom labels (ex: operations label in a class

- * diagram).

- */

-public interface ICustomAppearence {

-

-	/**

-	 * key for the appearance property of graph nodes.

-	 */

-	// @unused

-	public final static String CUSTOM_APPEARENCE_KEY = "custom_disp";

-

-	// /////////////////////////////////////////////////////////////////////////

-	// Style constants

-	// /////////////////////////////////////////////////////////////////////////

-	/**

-	 * Style constant for visibility display in labels.

-	 */

-	public final static int DISP_VISIBILITY = 1 << 1;

-

-	/**

-	 * Style constant for isDerive display in labels.

-	 */

-	public final static int DISP_DERIVE = 1 << 2;

-

-	/**

-	 * Style constant for name display in labels.

-	 */

-	public final static int DISP_NAME = 1 << 3;

-

-	/**

-	 * Style constant for type display in labels.

-	 */

-	public final static int DISP_TYPE = 1 << 4;

-

-	/**

-	 * Style constant for multiplicity display in labels.

-	 */

-	public final static int DISP_MULTIPLICITY = 1 << 5;

-

-	/**

-	 * Style constant for default value display in labels.

-	 */

-	public final static int DISP_DFLT_VALUE = 1 << 6;

-

-	/**

-	 * Style constant for modifiers display in labels.

-	 */

-	public final static int DISP_MOFIFIERS = 1 << 7;

-

-	/**

-	 * Style constant for parameters display in labels.

-	 * 

-	 * @deprecated

-	 * @see #DISP_PARAMETER_TYPE

-	 */

-	@Deprecated

-	// @unused

-	public final static int DISP_PARAMETERS = 1 << 8;

-

-	/**

-	 * Style constant for return parameters display in labels.

-	 * 

-	 * @deprecated

-	 * @see #DISP_RT_TYPE

-	 */

-	@Deprecated

-	// @unused

-	public final static int DISP_RETURN_PARAMETERS = 1 << 9;

-

-	/** Style constant for carriage return in labels */

-	public final static int DISP_MULTI_LINE = 1 << 10;

-

-	/**

-	 * Style constant for opaque action body display in labels.

-	 */

-	// @unused

-	public final static int DISP_BODY = 1 << 11;

-

-	/** Style constant for parameter direction display in labels */

-	public final int DISP_PARAMETER_DIRECTION = 1 << 11;

-

-	/** Style constant for parameter name display in labels */

-	public final int DISP_PARAMETER_NAME = 1 << 12;

-

-	/** Style constant for parameter type display in labels */

-	public final int DISP_PARAMETER_TYPE = 1 << 8;

-

-	/** Style constant for parameter multiplicity display in labels */

-	public final int DISP_PARAMETER_MULTIPLICITY = 1 << 14;

-

-	/** Style constant for parameter default value display in labels */

-	public final int DISP_PARAMETER_DEFAULT = 1 << 15;

-

-	/** Style constant for parameter modifiers display in labels */

-	public final int DISP_PARAMETER_MODIFIERS = 1 << 16;

-

-	/** Style constant for return parameter type display in labels */

-	public final int DISP_RT_TYPE = 1 << 9;

-

-	/** Style constant for return parameter multiplicity display in labels */

-	public final int DISP_RT_MULTIPLICITY = 1 << 18;

-

-	// /////////////////////////////////////////////////////////////////////////

-	// UML DEFAULT DISPLAY

-	// /////////////////////////////////////////////////////////////////////////

-	/**

-	 * default uml property display in classes edit part.

-	 */

-	public final static int DEFAULT_UML_PROPERTY = DISP_VISIBILITY | DISP_DERIVE | DISP_NAME | DISP_TYPE | DISP_MULTIPLICITY;

-	

-	/**

-	 * default uml property display in classes edit part.

-	 */

-	public final static int DEFAULT_UML_ROLE = DISP_VISIBILITY | DISP_DERIVE | DISP_NAME | DISP_TYPE;

-

-	/**

-	 * default uml operation display.

-	 */

-	public final static int DEFAULT_UML_OPERATION = DISP_VISIBILITY | DISP_NAME | DISP_PARAMETER_DIRECTION | DISP_PARAMETER_TYPE | DISP_RT_TYPE | DISP_MOFIFIERS;

-

-	/**

-	 * default uml Property in composite diagrams.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_COMPO_PROPERTY = DISP_NAME | DISP_TYPE;

-

-	/**

-	 * default uml Property in class diagrams as association ends.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_RELATIONEND_PROPERTY = DISP_VISIBILITY | DISP_DERIVE | DISP_NAME | DISP_MOFIFIERS | DISP_MULTI_LINE;

-

-	/**

-	 * default uml Port ins composite diagrams.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_PORT = DISP_NAME | DISP_TYPE;

-

-	/**

-	 * default uml OpaqueAction in activity diagrams.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_OPAQUE_ACTION = DISP_NAME;

-

-	/**

-	 * default uml Parameter in composite diagrams.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_PARAMETER = DISP_PARAMETER_DIRECTION | DISP_PARAMETER_NAME | DISP_PARAMETER_TYPE;

-	/**

-	 * default uml instancespecification .

-	 */

-	public final static int DEFAULT_UML_INSTANCESPECIFICATION = DISP_NAME | DISP_TYPE;

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java
deleted file mode 100644
index 77fec982b72..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Added support for Image's name

- *

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

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.io.ByteArrayInputStream;

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.util.Iterator;

-import java.util.StringTokenizer;

-

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

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

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

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

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

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

-import org.eclipse.jface.resource.ImageDescriptor;

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

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

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

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

-

-// TODO: Auto-generated Javadoc

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Image</code><BR>

- */

-public class ImageUtil {

-

-	/**

-	 * ID of the EAnnotation where "expression" (used to select stereotype icon) is stored on image.

-	 */

-	public static String IMAGE_PAPYRUS_EA = "image_papyrus";

-

-	/**

-	 * KEY of the EAnnotation where "expression" (used to select stereotype icon) is stored on

-	 * image.

-	 */

-	public static String IMAGE_EXPR_KEY = "image_expr_key";

-

-	/**

-	 * KEY of the EAnnotation where "kind" (kind = icon/shape) is stored on image.

-	 */

-	public static String IMAGE_KIND_KEY = "image_kind_key";

-

-	/**

-	 * KEY of the EAnnotation where the image's name is stored

-	 * 

-	 * @see {@link #getName(Image)}

-	 * @see {@link #setName(Image, String)}

-	 */

-	public static String IMAGE_NAME_KEY = "image_name_key";

-

-	/**

-	 * Set the content of an {@link Image} with a file (containing an image).

-	 * 

-	 * @param image

-	 *        the UML {@link Image} to set

-	 * @param imageFile

-	 *        the icon

-	 */

-	// @unused

-	public static void setContent(Image image, File imageFile) {

-

-		try {

-			String rawImageData = "";

-			if(imageFile != null) {

-				byte[] byteFlow = getBytesFromFile(imageFile);

-

-				rawImageData = "";

-

-				// file reading

-				for(byte element : byteFlow) {

-					rawImageData = rawImageData + element + "%";

-				}

-			} else {

-				rawImageData = null;

-			}

-

-			image.setContent(rawImageData);

-

-		} catch (Exception ex) {

-			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getLocalizedMessage(), ex));

-		}

-	}

-

-	/**

-	 * Get the content of an {@link Image} as {@link org.eclipse.swt.graphics.Image}

-	 * 

-	 * @param image

-	 *        the UML {@link Image} to set

-	 * 

-	 * @return {@link org.eclipse.swt.graphics.Image} content

-	 */

-	public static org.eclipse.swt.graphics.Image getContent(Image image) throws Exception {

-

-		if(image == null) {

-			// null parameter

-			return null;

-		}

-

-		if(image.getContent() == null) {

-			// null image

-			return null;

-		}

-

-		// else

-		String rawData = image.getContent();

-		StringTokenizer strToken = new StringTokenizer(rawData, "%");

-		byte[] target = new byte[strToken.countTokens()];

-

-		// decoding image

-		int j = 0;

-		while(strToken.hasMoreTokens()) {

-			target[j] = (new Byte(strToken.nextToken()).byteValue());

-			j++;

-		}

-

-		org.eclipse.swt.graphics.Image decodedImage = new org.eclipse.swt.graphics.Image(null, new ByteArrayInputStream(target));

-

-		return decodedImage;

-	}

-

-	/**

-	 * Get the image specified by the location property of an {@link Image} as {@link org.eclipse.swt.graphics.Image}

-	 * 

-	 * @param image

-	 *        the UML {@link Image} to set

-	 * 

-	 * @return {@link org.eclipse.swt.graphics.Image} image

-	 */

-	public static org.eclipse.swt.graphics.Image getImageFromLocation(Image image) {

-

-		org.eclipse.swt.graphics.Image swtImage = null;

-

-		// Try to instantiate an SWT image from the path stored

-		// in UML Image location property

-		String location = image.getLocation();

-		if((location != null) && !("".equals(location))) {

-

-			URI iconURI = URI.createURI(location);

-			if(iconURI.isRelative()) {

-				String err_msg = "Incorrect implementation of relative location." + location;

-				Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, err_msg, new Exception(err_msg)));

-				URI pluginURI = URI.createPlatformPluginURI(location, true); // <- TODO : fix this to retrieve the related plug-in URI

-				iconURI = iconURI.resolve(pluginURI);

-			}

-

-			try {

-				ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(new URL(iconURI.toString()));

-				swtImage = imageDescriptor.createImage();

-

-			} catch (Exception e) {

-				Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Could not create image from location : " + location, e));

-			}

-		}

-

-		return swtImage;

-	}

-

-	/**

-	 * Read an image file content.

-	 * 

-	 * @param file

-	 *        the file

-	 * 

-	 * @return a table of bytes of the file content

-	 * 

-	 * @throws IOException

-	 *         Signals that an I/O exception has occurred.

-	 */

-	public static byte[] getBytesFromFile(File file) throws IOException {

-

-		InputStream is = new FileInputStream(file);

-

-		// Get the size of the file

-		long length = file.length();

-

-		// You cannot create an array using a long type.

-		// It needs to be an int type.

-		// Before converting to an int type, check

-		// to ensure that file is not larger than Integer.MAX_VALUE.

-		if(length > Integer.MAX_VALUE) {

-			throw new IOException("Image too big to encode");

-		}

-

-		// Create the byte array to hold the data

-		byte[] bytes = new byte[(int)length];

-

-		// Read in the bytes

-		int offset = 0;

-		int numRead = 0;

-		while((offset < bytes.length) && ((numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)) {

-			offset += numRead;

-		}

-

-		// Ensure all the bytes have been read in

-		if(offset < bytes.length) {

-			throw new IOException("Could not completely read file " + file.getName());

-		}

-

-		// Close the input stream and return bytes

-		is.close();

-

-		return bytes;

-	}

-

-	/**

-	 * Associates an expression to an image.

-	 * 

-	 * @param image

-	 *        the image

-	 * @param expression

-	 *        the expression

-	 */

-	public static void setExpression(Image image, String expression) {

-

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		// Create annotation for icon selection if it does not exist

-		if(ea_Image == null) {

-			ea_Image = image.createEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		}

-

-		// If expression == "" remove the EAnnotation

-		if("".equals(expression)) {

-			ea_Image.getDetails().removeKey(IMAGE_EXPR_KEY);

-		} else {

-			ea_Image.getDetails().put(ImageUtil.IMAGE_EXPR_KEY, expression);

-		}

-

-		cleanImageAnnotation(ea_Image);

-	}

-

-	/**

-	 * Returns the expression associated to the image.

-	 * 

-	 * @param image

-	 *        the image

-	 * 

-	 * @return the expression associated to the image

-	 */

-	public static String getExpression(org.eclipse.uml2.uml.Image image) {

-		EAnnotation ea_ImageExpr = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-

-		String expr = null;

-		if((ea_ImageExpr != null) && (ea_ImageExpr.getDetails().containsKey(ImageUtil.IMAGE_EXPR_KEY))) {

-			expr = ea_ImageExpr.getDetails().get(ImageUtil.IMAGE_EXPR_KEY);

-		}

-		return expr;

-	}

-

-	/**

-	 * Associates a name to an Image.

-	 * 

-	 * The UML Image is not a NamedElement : the name is stored as an

-	 * EAnnotation, and is not mandatory. The name should only be used for

-	 * displaying the image's label : this is *not* an identifier.

-	 * 

-	 * @param image

-	 *        The image

-	 * @param name

-	 *        The name

-	 */

-	public static void setName(Image image, String name) {

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		// Create annotation for icon selection if it does not exist

-		if(ea_Image == null) {

-			ea_Image = image.createEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		}

-

-		// If expression == "" remove the EAnnotation

-		if("".equals(name)) {

-			ea_Image.getDetails().removeKey(IMAGE_NAME_KEY);

-		} else {

-			ea_Image.getDetails().put(ImageUtil.IMAGE_NAME_KEY, name);

-		}

-

-		cleanImageAnnotation(ea_Image);

-	}

-

-	/**

-	 * Returns the name associated to the image

-	 * 

-	 * The UML Image is not a NamedElement : the name is stored as an

-	 * EAnnotation, and is not mandatory. The name should only be used for

-	 * displaying the image's label : this is *not* an identifier.

-	 * 

-	 * @param image

-	 *        the image

-	 * @return

-	 *         the name associated to the image

-	 */

-	public static String getName(Image image) {

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-

-		String name = null;

-		if((ea_Image != null) && (ea_Image.getDetails().containsKey(IMAGE_NAME_KEY))) {

-			name = ea_Image.getDetails().get(IMAGE_NAME_KEY);

-		}

-		return name;

-	}

-

-	/**

-	 * Removes the EAnnotation from the Image if the annotation doesn't contain any valid key

-	 * 

-	 * @param annotation

-	 */

-	private static void cleanImageAnnotation(EAnnotation annotation) {

-		EMap<String, String> details = annotation.getDetails();

-		if(details.isEmpty()) {

-			//if(!(details.containsKey(IMAGE_NAME_KEY)) && !(details.containsKey(IMAGE_KIND_KEY) && !(details.containsKey(IMAGE_NAME_KEY)))) {

-			annotation.setEModelElement(null);

-		}

-

-	}

-

-	/**

-	 * Associates kind to an image.

-	 * 

-	 * @param image

-	 *        the image

-	 * @param kind

-	 *        of image (icon / shape)

-	 */

-	// @unused

-	public static void setKind(org.eclipse.uml2.uml.Image image, String kind) {

-

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		// Create annotation for icon selection if it does not exist

-		if(ea_Image == null) {

-			ea_Image = image.createEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		}

-

-		// If expression == "" remove the EAnnotation

-		if("".equals(kind)) {

-			ea_Image.getDetails().removeKey(IMAGE_KIND_KEY);

-		} else {

-			ea_Image.getDetails().put(ImageUtil.IMAGE_KIND_KEY, kind);

-		}

-

-		cleanImageAnnotation(ea_Image);

-	}

-

-	/**

-	 * Returns the kind of the image (icon or shape for Papyrus).

-	 * 

-	 * @param image

-	 *        the image

-	 * 

-	 * @return kind of image

-	 */

-	public static String getKind(org.eclipse.uml2.uml.Image image) {

-		EAnnotation ea_ImageExpr = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-

-		String kind = null;

-		if((ea_ImageExpr != null) && (ea_ImageExpr.getDetails().containsKey(ImageUtil.IMAGE_KIND_KEY))) {

-			kind = ea_ImageExpr.getDetails().get(ImageUtil.IMAGE_KIND_KEY);

-		}

-		return kind;

-	}

-

-	/**

-	 * Evaluates the "Expression" EAnnotation associated to the image.

-	 * 

-	 * @param element

-	 *        on which the stereotype (owning current image) is applied

-	 * @param image

-	 *        the image

-	 * 

-	 * @return true if the expression is correct

-	 */

-	public static boolean evalExpression(Image image, Element element) {

-		/*

-		 * Expression has the form : propName = Literal

-		 */

-

-		/* Firstly we extract the propertyName and the literal */

-

-		String propName = null;

-		String literal = null;

-		Stereotype st = (Stereotype)image.getOwner();

-

-		// Retrieve Expression

-		String expression = ImageUtil.getExpression(image);

-		if(expression == null) {

-			// No expression to check

-			return false;

-		}

-

-		// Parse and test expression

-		StringTokenizer sToken = new StringTokenizer(expression.replace(" ", ""), "=");

-		if(sToken.countTokens() == 2) {

-			propName = sToken.nextToken();

-			literal = sToken.nextToken();

-

-		} else {

-			// Bad formed expression --> ignore

-			return false;

-		}

-

-		if(element.getValue(st, propName) != null) {

-			/* extract property value from applied stereotype */

-			Object val = element.getValue(st, propName);

-

-			if(val instanceof EnumerationLiteral) {

-				if(((EnumerationLiteral)val).getLabel().equals(literal)) {

-					return true;

-				}

-			}

-		}

-		// In any other case (bad expression, not property found...)

-		return false;

-	}

-

-	/**

-	 * Test expression on every image, stop on first verified expression.

-	 * 

-	 * @param element

-	 *        the element to check

-	 * @param images

-	 *        the list of images to check

-	 * 

-	 * @return first image verifying its expression

-	 */

-	public static Image findImageVerifyingExpression(Element element, EList<Image> images) {

-

-		Image image = null;

-		Iterator<Image> it = images.iterator();

-		while((image == null) && it.hasNext()) {

-			Image current = it.next();

-			if(ImageUtil.evalExpression(current, element)) {

-				image = current;

-			}

-		}

-

-		return image;

-	}

-

-	/**

-	 * Create an Id to store and retrieve image (SWT) In registry.

-	 * 

-	 * @param image

-	 *        the image

-	 * 

-	 * @return the image id

-	 */

-	public static String getImageId(Image image) {

-		String id = "";

-

-		Stereotype owner = (Stereotype)image.getOwner();

-		id += owner.getQualifiedName() + "_img_" + owner.getIcons().indexOf(image);

-

-		return id;

-

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/InstanceSpecificationUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/InstanceSpecificationUtil.java
deleted file mode 100644
index 44b48829ed4..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/InstanceSpecificationUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

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

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

-

-/**

- *  util class to display name of instancespecification 

- *

- */

-public class InstanceSpecificationUtil {

-	/**

-	 * return the custom label of the operation, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the operation

-	 */

-	public static String getCustomLabel(InstanceSpecification instance, int style) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(" "); // adds " " first for correct display considerations

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(NamedElementUtil.getName(instance));

-		}

-

-		// classifier

-		if((style & ICustomAppearence.DISP_TYPE) != 0) {

-			if( !getTypesAsString(instance, style).equals("")){

-				buffer.append(": ");

-				buffer.append(getTypesAsString(instance, style));}

-		}

-

-

-		return buffer.toString();

-	}

-	/**

-	 * Returns the list of classifier for an instance specification as a string

-	 * 

-	 * @return a string containing all classifier separated by commas

-	 */

-	private static String getTypesAsString(InstanceSpecification instance, int style) {

-		StringBuffer typeString = new StringBuffer();

-		Iterator<Classifier> classifierIterator = instance.getClassifiers().iterator();

-		boolean firstParameter = true;

-		while(classifierIterator.hasNext()) {

-			Classifier classifier = classifierIterator.next();

-

-			// get the label for this Classifier

-			String classifierName = NamedElementUtil.getName(classifier);

-			if (!classifierName.trim().equals("")) {

-				if (!firstParameter) {

-					typeString.append(", ");

-				}

-				typeString.append(classifierName);

-				firstParameter = false;

-			}

-		}

-		return typeString.toString();

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java
deleted file mode 100644
index 5d6ff10666f..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import org.eclipse.uml2.uml.MultiplicityElement;
-
-/**
- * Utility class for <code>org.eclipse.uml2.uml.MultiplicityElement</code><BR>
- */
-public class MultiplicityElementUtil {
-
-	/**
-	 * Return the multiplicity of the element "[x..y]"
-	 * 
-	 * @return the string representing the multiplicity
-	 */
-	public static String getMultiplicityAsString(MultiplicityElement element) {
-		StringBuffer buffer = new StringBuffer();
-		String multiplicityStr = getMultiplicityAsStringWithoutSquareBrackets(element);
-		if (multiplicityStr != null && !"".equals(multiplicityStr)) {
-			buffer.append(" [");
-			buffer.append(multiplicityStr);
-			buffer.append("]");
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 * Returns the String corresponding to the multiplicity without square brackets
-	 * 
-	 * @return the string representing the multiplicity, without square brackets
-	 */
-	public static String getMultiplicityAsStringWithoutSquareBrackets(MultiplicityElement element) {
-		StringBuffer buffer = new StringBuffer();
-		// special case for [1] and [*]
-		int lower = element.getLower();
-		int upper = element.getUpper();
-
-		if(lower == upper) {
-			if (lower != 1) {
-				buffer.append(lower);
-			}
-		} else if((lower == 0) && (upper == -1)) {
-			buffer.append("*");
-		} else if(upper == -1) {
-			buffer.append(lower);
-			buffer.append("..*");
-		} else {
-			buffer.append(lower);
-			buffer.append("..");
-			buffer.append(upper);
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 * Parses the given String and returns the value of the multiplicity.
-	 * <P>
-	 * a lower bound with value infinite (<code>*</code>) will be set at <code>-1</code>.
-	 * </P>
-	 * 
-	 * @param value
-	 *        the string representing the multiplicity. it can be <code>1</code>, <code>1..2</code> or <code>1..*</code>
-	 * @return a 2-size integer table, with the first element corresponding to the lower bound, the second corresponds to the upper bound
-	 */
-	public static int[] parseMultiplicity(String value) throws NumberFormatException {
-		int lower = 0;
-		int upper = 0;
-		int firstIndex = value.indexOf("..");
-
-		// ".." was not found => this should be an integer, for example a multiplicity ~ [1]
-		if(firstIndex == -1) {
-			// this should be directly an integer or a star
-			if("*".equals(value)) {
-				lower = 0;
-				upper = -1;
-			} else {
-				lower = Integer.parseInt(value);
-				upper = lower;
-			}
-		} else {
-			String lowerValue = value.substring(0, firstIndex);
-			String upperValue = value.substring(firstIndex + "..".length());
-
-			lower = Integer.parseInt(lowerValue);
-			upper = -2;
-			if("*".equals(upperValue)) {
-				upper = -1;
-			} else {
-				upper = Integer.parseInt(upperValue);
-			}
-		}
-		return new int[]{ lower, upper };
-	}
-
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
deleted file mode 100644
index e5b09521c32..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-

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

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

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.NamedElement</code><BR>

- */

-public class NamedElementUtil {

-

-	public static final String QUALIFIED_NAME_SEPARATOR = "::";

-

-	private final static String PUBLIC_STRING = "+";

-

-	private final static String PROTECTED_STRING = "#";

-

-	private final static String PRIVATE_STRING = "-";

-

-	private final static String PACKAGE_STRING = "~";

-

-	/**

-	 * A helper method to calculate the max depth of an element

-	 * 

-	 * @param the

-	 *        named element

-	 * @return the maximum depth found in qualified name

-	 */

-	public static int getQualifiedNameMaxDepth(NamedElement namedElement) {

-		int d = 0;

-		String s = namedElement.getQualifiedName();

-		if(s == null) {

-			return 0;

-		}

-		int n = 0;

-		while((n = s.indexOf(QUALIFIED_NAME_SEPARATOR, n)) != -1) {

-			n += 2;

-			d++;

-		}

-		return d;

-	}

-

-	/**

-	 * generate a default name for the eobject in parameter the format is :

-	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1

-	 * 

-	 * @param newElement

-	 * @return

-	 */

-	public static String getDefaultNameWithIncrement(EObject newElement) {

-		if(newElement.eContainer() != null) {

-			return getDefaultNameWithIncrement(newElement, newElement.eContainer().eContents());

-		}

-		return null;

-	}

-

-	/**

-	 * generate a default name for the eobject in parameter the format is :

-	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1 the method checks already

-	 * existing element in contents parameter

-	 * 

-	 * @param newElement

-	 */

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrement(EObject newElement, Collection contents) {

-		return getDefaultNameWithIncrement("", newElement, contents);

-	}

-

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrement(String prefix, EObject newElement, Collection contents) {

-		if (prefix == null) {

-			prefix = "";

-		}

-

-		return getDefaultNameWithIncrementFromBase(prefix + newElement.eClass().getName(), contents);

-	}

-	

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrementFromBase(String base, Collection contents) {

-		int nextNumber = 1;

-

-		for(Object o : contents) {

-			if(o instanceof EObject) {

-				String name = EMFCoreUtil.getName((EObject)o);

-				if(name != null && name.startsWith(base)) {

-					String end = name.substring(base.length());

-					int nextNumberTmp = 1;

-

-					try {

-						nextNumberTmp = Integer.parseInt(end) + 1;

-					} catch (NumberFormatException ex) {

-					}

-

-					if(nextNumberTmp > nextNumber) {

-						nextNumber = nextNumberTmp;

-					}

-				}

-			}

-		}

-

-		return base + nextNumber;

-	}

-

-	/**

-	 * Give the visibility of the {@link NamedElement} as a string, as defined in the UML2 standard.

-	 * 

-	 * @return A String representing the visibility of the {@link NamedElement}. Possible values:

-	 *         <ul>

-	 *         <li>public: <code>"+"</code>

-	 *         <li>private: <code>"-"</code>

-	 *         <li>protected: <code>"#"</code>

-	 *         <li>package: <code>"~"</code>

-	 *         </ul>

-	 */

-	public static String getVisibilityAsSign(NamedElement element) {

-		String vKindValue = "";

-

-		switch(element.getVisibility().getValue()) {

-		case org.eclipse.uml2.uml.VisibilityKind.PUBLIC:

-			vKindValue = PUBLIC_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PRIVATE:

-			vKindValue = PRIVATE_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PACKAGE:

-			vKindValue = PACKAGE_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PROTECTED:

-			vKindValue = PROTECTED_STRING;

-			break;

-		}

-		return vKindValue;

-	}

-

-	/**

-	 * Returns the name of an element, given its qualified name

-	 * 

-	 * @param qualifiedName

-	 *        the qualified name of the element

-	 * @return the name of the element. It shall never be <code>null</code>.

-	 */

-	public static String getNameFromQualifiedName(String qualifiedName) {

-		String name = qualifiedName.substring(qualifiedName.lastIndexOf(NamedElement.SEPARATOR) + NamedElement.SEPARATOR.length());

-		return (name != null) ? name : "";

-	}

-

-

-	public static String getName(NamedElement element) {

-		if(element.getName() != null) {

-			return element.getName();

-		} else {

-			return (NamedElementUtil.getDefaultNameWithIncrement(element));

-		}

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OpaqueBehaviorUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OpaqueBehaviorUtil.java
deleted file mode 100644
index 802d4dae0ce..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OpaqueBehaviorUtil.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

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

-

-/**

- * This class encapsulates an <code>org.eclipse.uml2.uml.OpaqueBehavior</code><BR>

- */

-public class OpaqueBehaviorUtil {

-

-	/**

-	 * Gets the value of the 'Body' attribute for the <code>OpaqueBehavior</code> at the given

-	 * index.

-	 * 

-	 * @param index

-	 * 

-	 * @return the value of 'Body'at the index i

-	 */

-	// @unused

-	public static String getBody(OpaqueBehavior behavior, int index) {

-		return behavior.getBodies().get(index);

-	}

-

-	/**

-	 * Gets the value of the 'Body' attribute for the <code>OpaqueBehavior</code> for a given

-	 * language.

-	 * 

-	 * @param language

-	 *        the language in which the body is written

-	 * @return the value of 'Body' at the index i

-	 */

-	// @unused

-	public static String getBody(OpaqueBehavior behavior, String language) {

-		int index = 0;

-		String tmp = "";

-

-		index = getBodyIndex(behavior, language);

-		if((index > -1) && (index < behavior.getBodies().size())) {

-			tmp = behavior.getBodies().get(index);

-		}

-

-		return tmp;

-	}

-

-	/**

-	 * Returns the index of the body for a given langauge.

-	 * 

-	 * @param language

-	 *        the language of the body to find

-	 * @return the index of the body in the list or -1 if not found

-	 */

-	public static int getBodyIndex(OpaqueBehavior behavior, String language) {

-		int index = 0;

-		boolean isFound = false;

-

-		// test if the language exists

-		Iterator<String> it = behavior.getLanguages().iterator();

-		while(it.hasNext() && !isFound) {

-			String lang = it.next();

-			if(lang.equalsIgnoreCase(language)) {

-				isFound = true;

-			} else {

-				index++;

-			}

-		}

-		// returns -1 if not found

-		if(!isFound) {

-			index = -1;

-		}

-		return index;

-	}

-

-	/**

-	 * Sets the value of the 'Body' attribute for a given language.

-	 * 

-	 * @param value

-	 *        the new value of the 'Body'

-	 * @param language

-	 *        the langauge of the body to set

-	 */

-	// @unused

-	public static void setBody(OpaqueBehavior behavior, String value, String language) {

-		// get the index of the given language

-		int index = getBodyIndex(behavior, language);

-		if(index == -1) {

-			// this language does not exists, adds it to the end of the list

-			behavior.getLanguages().add(language);

-			behavior.getBodies().add(value);

-		} else {

-			// the language was found, change the value of the language

-			behavior.getBodies().set(index, value);

-		}

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OpaqueExpressionUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OpaqueExpressionUtil.java
deleted file mode 100644
index 45a936321a3..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OpaqueExpressionUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

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

-

-package org.eclipse.papyrus.uml.tools.utils;

-

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

-

-/**

- * Util class for {@link OpaqueExpression}

- */

-public class OpaqueExpressionUtil {

-

-	/**

-	 * Returns the body for an OpaqueExpression for the given language

-	 * 

-	 * @param opaqueExpression

-	 *        the opaque expression to edit.

-	 * @param language

-	 *        the language in which the body is written

-	 * @return the body for the given language or the empty string if the language was not found

-	 */

-	public static String getBodyForLanguage(org.eclipse.uml2.uml.OpaqueExpression opaqueExpression, String language) {

-		String body = "";

-		// retrieve the index of the given language in the opaque Expression

-		if(opaqueExpression.getLanguages() != null) {

-			int index = opaqueExpression.getLanguages().indexOf(language);

-			if(index != -1) {

-				// language found. return the corresponding body in the bodies list.

-				// List should be synchronized, ie having the same size, but be sure...

-				if(index < opaqueExpression.getBodies().size()) {

-					body = opaqueExpression.getBodies().get(index);

-				}

-			}

-		}

-		return body;

-	}

-

-	/**

-	 * sets the body for an OpaqueExpression for the given language.

-	 * <p>

-	 * If the language was already defined, it replaces the corresponding body. If the language was not already defined, it adds it to the list of

-	 * languages and adds the corresponding body.

-	 * <p>

-	 * A utility method, {@link OpaqueExpression#checkAndCorrectLists(org.eclipse.uml2.uml.OpaqueExpression)} is used to correct the language and body

-	 * lists.

-	 * 

-	 * @param opaqueExpression

-	 *        the opaque expression to edit.

-	 * @param language

-	 *        the language in which the body is written

-	 * @param body

-	 *        the body to save

-	 */

-	public static void setBodyForLanguage(org.eclipse.uml2.uml.OpaqueExpression opaqueExpression, String language,

-			String body) {

-		// checks both lists by size

-		checkAndCorrectLists(opaqueExpression);

-

-		// checks if language exists, if not, creates one

-		if(!opaqueExpression.getLanguages().contains(language)) {

-			opaqueExpression.getLanguages().add(language);

-			opaqueExpression.getBodies().add(body);

-		} else {

-			// retrieve the index of the given language in the opaque Expression

-			int index = opaqueExpression.getLanguages().indexOf(language);

-			// sets the body at the given index in the list of bodies.

-			opaqueExpression.getBodies().set(index, body);

-		}

-	}

-

-	/**

-	 * Checks body and languages list of an opaque expression.

-	 * <p>

-	 * It returns <code>true</code> if both lists have the same size. It returns <code>false</code> if one of the list was bigger than the other one.

-	 * In this latter case, one of the list was corrected, ie enough elements where added in the list

-	 * 

-	 * @param opaqueExpression

-	 *        the opaque expression to check

-	 * @return <code>true</code> if both lists already had the same size, <code>false</code> in

-	 *         other cases.

-	 */

-	public static boolean checkAndCorrectLists(org.eclipse.uml2.uml.OpaqueExpression opaqueExpression) {

-		// both lists, languages and bodies, should have the same size

-		final int bodySize = opaqueExpression.getBodies().size();

-		final int languageSize = opaqueExpression.getLanguages().size();

-

-		// check both size

-		// if equals, lists are supposed synchronized, it is ok

-		// if less body than languages, add bodies

-		// if more body, add enough languages

-		if(bodySize == languageSize) {

-			return true;

-		} else {

-			final int difference = languageSize - bodySize;

-			if(difference > 0) {

-				// more languages strings than body strings, add enough bodies

-				for(int i = 0; i < difference; i++) {

-					opaqueExpression.getBodies().add("");

-				}

-			} else {

-				// more body strings than language strings, add enough languages

-				for(int i = 0; i < (-difference); i++) {

-					opaqueExpression.getLanguages().add("");

-				}

-			}

-			// lists had to be modified, return false...

-			return false;

-		}

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OperationUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OperationUtil.java
deleted file mode 100644
index 7b4adf2b05d..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/OperationUtil.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

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

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

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

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Operation</code><BR>

- */

-public class OperationUtil {

-

-	/**

-	 * return the custom label of the operation, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the operation

-	 */

-	public static String getCustomLabel(Operation operation, int style) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(" "); // adds " " first for correct display considerations

-

-		// visibility

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(operation));

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(operation.getName());

-		}

-

-		// 

-		// parameters : '(' parameter-list ')'

-		buffer.append("(");

-		buffer.append(OperationUtil.getParametersAsString(operation, style));

-		buffer.append(")");

-

-		// return type

-		if((style & ICustomAppearence.DISP_RT_TYPE) != 0) {

-			buffer.append(OperationUtil.getReturnTypeAsString(operation, style));

-		}

-

-		// modifiers

-		if((style & ICustomAppearence.DISP_MOFIFIERS) != 0) {

-			String modifiers = OperationUtil.getModifiersAsString(operation);

-			if(!modifiers.equals("")) {

-				buffer.append("{");

-				buffer.append(modifiers);

-				buffer.append("}");

-			}

-		}

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns return parameter label as a string, string parametrized with a style mask.

-	 * 

-	 * @param style

-	 *        the mask that indicates which element to display

-	 * @return a string containing the return parameter type

-	 */

-	private static String getReturnTypeAsString(Operation operation, int style) {

-		boolean displayType = ((style & ICustomAppearence.DISP_RT_TYPE) != 0);

-		boolean displayMultiplicity = ((style & ICustomAppearence.DISP_RT_MULTIPLICITY) != 0);

-		StringBuffer label = new StringBuffer("");

-

-		// Retrieve the return parameter (assume to be unique if defined)

-		Parameter returnParameter = OperationUtil.getReturnParameter(operation);

-		// Create the string for the return type

-		if(returnParameter == null) {

-			// no-operation: label = ""

-

-		} else if(!displayType && !displayMultiplicity) {

-			// no-operation: label = ""

-

-		} else {

-			label.append(": ");

-			if(displayType) {

-				label.append(TypedElementUtil.getTypeAsString(returnParameter));

-			}

-

-			if(displayMultiplicity) {

-				label.append(MultiplicityElementUtil.getMultiplicityAsString(returnParameter));

-			}

-		}

-		return label.toString();

-	}

-

-	/**

-	 * Returns operation parameters as a string, the label is customized using a bit mask

-	 * 

-	 * @return a string containing all parameters separated by commas

-	 */

-	private static String getParametersAsString(Operation operation, int style) {

-		StringBuffer paramString = new StringBuffer();

-		Iterator<Parameter> paramIterator = operation.getOwnedParameters().iterator();

-		boolean firstParameter = true;

-		while(paramIterator.hasNext()) {

-			Parameter parameter = paramIterator.next();

-			// Do not include return parameters

-			if(!parameter.getDirection().equals(ParameterDirectionKind.RETURN_LITERAL)) {

-

-

-

-				// get the label for this parameter

-				String parameterString = ParameterUtil.getCustomLabel(parameter, style);

-				if (!parameterString.trim().equals("")) {

-					if (!firstParameter) {

-						paramString.append(", ");

-					}

-					paramString.append(parameterString);

-					firstParameter = false;

-				}

-			}

-		}

-		return paramString.toString();

-	}

-

-	/**

-	 * Returns operation modifiers as string, separated with comma.

-	 * 

-	 * @return a string containing the modifiers

-	 */

-	private static String getModifiersAsString(Operation operation) {

-		StringBuffer buffer = new StringBuffer();

-		boolean needsComma = false;

-

-		// Return parameter modifiers

-		Parameter returnParameter = OperationUtil.getReturnParameter(operation);

-		if(returnParameter != null) {

-			// non unique parameter

-			if(!returnParameter.isUnique()) {

-				buffer.append("nonunique");

-				needsComma = true;

-			}

-

-			// return parameter has ordered values

-			if(returnParameter.isOrdered()) {

-				if(needsComma) {

-					buffer.append(", ");

-				}

-				buffer.append("ordered");

-				needsComma = true;

-			}

-		}

-

-		// is the operation a query ?

-		if(operation.isQuery()) {

-			if(needsComma) {

-				buffer.append(", ");

-			}

-			buffer.append("query");

-			needsComma = true;

-		}

-

-		// is the operation redefining another operation ?

-		Iterator<Operation> it = operation.getRedefinedOperations().iterator();

-		while(it.hasNext()) {

-			Operation currentOperation = it.next();

-			if(needsComma) {

-				buffer.append(", ");

-			}

-			buffer.append("redefines ");

-			buffer.append(currentOperation.getName());

-			needsComma = true;

-		}

-

-		// has the operation a constraint ?

-		Iterator<Constraint> it2 = operation.getOwnedRules().iterator();

-		while(it2.hasNext()) {

-			Constraint constraint = it2.next();

-			if(needsComma) {

-				buffer.append(", ");

-			}

-			if(constraint.getSpecification() != null) {

-				buffer.append(constraint.getSpecification().stringValue());

-			}

-			needsComma = true;

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Gives the return parameter for this operation, or <code>null</code> if none exists.

-	 * 

-	 * @return the return parameter of the operation or <code>null</code>

-	 */

-	private static Parameter getReturnParameter(Operation operation) {

-		// Retrieve the return parameter (assume to be unique if defined)

-		Parameter returnParameter = null;

-

-		Iterator<Parameter> it = operation.getOwnedParameters().iterator();

-		while((returnParameter == null) && (it.hasNext())) {

-			Parameter parameter = it.next();

-			if(parameter.getDirection().equals(ParameterDirectionKind.RETURN_LITERAL)) {

-				returnParameter = parameter;

-			}

-		}

-		return returnParameter;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java
deleted file mode 100644
index d740e150704..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008, 2009 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation
- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageImport;
-import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.ProfileApplication;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Utility class for <code>org.eclipse.uml2.uml.Package</code><BR>
- */
-public class PackageUtil {
-
-	/**
-	 * Apply a profile and every subprofiles to a package. Also import types defined in profile
-	 * 
-	 * @param profileToApply
-	 *        profile to apply on package
-	 * @param package_
-	 *        on which profiles are applied
-	 * @param withSubProfiles
-	 *        true if subprofiles must be automatically imported
-	 */
-	public static boolean applyProfile(org.eclipse.uml2.uml.Package package_, org.eclipse.uml2.uml.Profile profileToApply, boolean withSubProfiles) {
-
-		// Returns true if the model was modified
-		boolean isChanged = false;
-
-		// if profile is not defined abort treatment
-		if(!profileToApply.isDefined()) {
-			return isChanged;
-		}
-
-		// if same version of profile is applied do not re-apply it
-		ProfileApplication profileApplication = package_.getProfileApplication(profileToApply);
-		if(profileApplication != null) {
-
-			EPackage previous_definition = profileApplication.getAppliedDefinition();
-			EPackage new_definition = profileToApply.getDefinition();
-			if(previous_definition == new_definition) {
-				return isChanged;
-			}
-		}
-
-		// Apply main profile and import contained types
-		package_.applyProfile(profileToApply);
-		importTypes(package_, profileToApply);
-		isChanged = true;
-
-		if(withSubProfiles) {
-			// Manage sub profiles
-			ArrayList<Profile> subProfiles = new ArrayList<Profile>();
-			subProfiles = getSubProfiles(profileToApply);
-
-			Iterator<Profile> iter = subProfiles.iterator();
-			while(iter.hasNext()) {
-				Profile subProfile = iter.next();
-				package_.applyProfile(subProfile);
-				importTypes(package_, subProfile);
-			}
-		}
-
-		return isChanged;
-	}
-
-	/**
-	 * Retrieve recursively the subprofiles of package.
-	 * 
-	 * @param profile
-	 * 
-	 * @return an arrayList containing the subprofiles
-	 */
-	public static ArrayList<Profile> getSubProfiles(org.eclipse.uml2.uml.Package package_) {
-		ArrayList<Profile> subProfiles = new ArrayList<Profile>();
-
-		Iterator<org.eclipse.uml2.uml.NamedElement> iter = package_.getMembers().iterator();
-		while(iter.hasNext()) {
-
-			Object element = iter.next();
-			if(element instanceof Profile) {
-				Profile currentSubProfile = (Profile)element;
-				subProfiles.add(currentSubProfile);
-				subProfiles.addAll(getSubProfiles(currentSubProfile));
-			} else if(element instanceof org.eclipse.uml2.uml.Package) {
-				org.eclipse.uml2.uml.Package currentSubPackage = (org.eclipse.uml2.uml.Package)element;
-				subProfiles.addAll(getSubProfiles(currentSubPackage));
-			}
-		}
-		return subProfiles;
-	}
-
-	/**
-	 * Returns the top package of the specified element, i.e. the model or profile that is the root element
-	 * 
-	 * @return the top {@link Package} for the specified element
-	 */
-	public static Package getRootPackage(Element element) {
-		return getRootPackage(element.getNearestPackage());
-	}
-
-	/**
-	 * Returns the top package of the specified package, i.e. the model or profile that is the root element
-	 * 
-	 * @return the top {@link Package} for the specified element
-	 */
-	public static Package getRootPackage(Package package_) {
-		if(package_.getOwner() == null) {
-			return package_;
-		}
-		return getRootPackage((Package)package_.getOwner());
-	}
-
-	/**
-	 * Import public type contained in the profileToApply into pkg.
-	 * 
-	 * @param profileToApply
-	 *        profile that contains type to import
-	 * @param pkg
-	 *        receive the types from profile
-	 */
-	private static void importTypes(Package pkg, Package profileToApply) {
-
-		/** import public types of the profile */
-
-		// get visible members of the profile
-		EList<PackageableElement> visibleMemb = profileToApply.visibleMembers();
-		Iterator<PackageableElement> iterator = visibleMemb.iterator();
-
-		while(iterator.hasNext()) {
-			Element elemt = iterator.next();
-
-			if(elemt instanceof Package) {
-
-				// if the package is a model library the import it
-				// in the package on which the profile is applied
-				if(((Package)elemt).isModelLibrary()) {
-					PackageImport pi = UMLFactory.eINSTANCE.createPackageImport();
-					pi.setImportedPackage((Package)elemt);
-					pkg.getPackageImports().add(pi);
-				}
-			}
-		}
-	}
-
-	/**
-	 * returns the list of the names of imported packages
-	 * 
-	 * @param pkg
-	 *        the package that has element imports
-	 * @return the list of the name of imported packages
-	 */
-	public static List<String> getImportedPackagesNames(Package pkg) {
-		List<String> packageNames = new ArrayList<String>();
-		// iterate through package imports of the given package
-		Iterator<PackageImport> importedIt = pkg.getPackageImports().iterator();
-		while(importedIt.hasNext()) {
-			PackageImport currentImport = importedIt.next();
-			// get name of the imported package and adds it to the result list
-			String currentName = currentImport.getImportedPackage().getName();
-			packageNames.add(currentName);
-		}
-		return packageNames;
-	}
-
-	/**
-	 * Removes the last definition of a profile, and in its nested profiles
-	 * 
-	 * @param thepackage
-	 *        profile to clean
-	 */
-	// @unused
-	public static void removeLastDefinition(Package thepackage) {
-		removeLastDefinition(thepackage, true);
-	}
-
-	/**
-	 * Removes the last definition of a profile
-	 * 
-	 * @param thepackage
-	 *        profile to clean
-	 * @param recursive
-	 *        boolean <code>true</code> if the clean is recursive, i.e. nested profiles must be
-	 *        clean
-	 */
-	public static void removeLastDefinition(Package thepackage, boolean recursive) {
-		// he wants to define
-		if(thepackage instanceof Profile) {
-			EPackage pak = ((Profile)thepackage).getDefinition();
-			((EAnnotation)pak.eContainer()).getContents().remove(pak);
-		}
-		if(recursive) {
-			Iterator<Package> it = thepackage.getNestedPackages().iterator();
-			while(it.hasNext()) {
-				Package p = it.next();
-				removeLastDefinition(p, recursive);
-			}
-		}
-	}
-
-	/**
-	 * Define this package if it is a profile and its sub-profiles
-	 * 
-	 * @param thePackage
-	 *        the package to define (if it is a profile)
-	 */
-	public static void defineProfiles(Package thePackage) {
-		// he wants to define
-		if(thePackage instanceof Profile) {
-			((Profile)thePackage).define();
-		}
-		Iterator<Package> it = thePackage.getNestedPackages().iterator();
-		while(it.hasNext()) {
-			Package p = it.next();
-			defineProfiles(p);
-		}
-	}
-
-	/**
-	 * Retrieve a type accessible in this Package, given its name.
-	 * 
-	 * @param name
-	 *        the name of the type to find, which must not be <code>null</code>
-	 * 
-	 * @return the type found or <code>null</code> if not found.
-	 */
-	public static Type findTypeByName(Package pack, String name) {
-		assert name != null : "Type Name should not be null";
-
-		// update method to find a type by its name
-		// 1. find the direct accessible types (in the package and the imported
-		// elements)
-		// 2. find in the subpackages and their import
-		// 3. find in all resources
-
-		Iterator<Type> it = getAccessibleTypes(pack).iterator();
-		while(it.hasNext()) {
-			Type t = it.next();
-			if(name.equals(t.getName())) {
-				return t;
-			}
-		}
-
-		Resource resource = pack.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			return findTypeByName(resourceSet, name);
-		}
-		return null;
-	}
-
-	/**
-	 * Retrieve a collaboration accessible in this Package, given its name.
-	 * 
-	 * @param name
-	 *        the name of the collaboration to find, which must not be <code>null</code>
-	 * 
-	 * @return the collaboration found or <code>null</code> if not found.
-	 */
-	public static Collaboration findCollaborationByName(Package pack, String name) {
-		assert name != null : "Collaboration Name should not be null";
-
-		// update method to find a type by its name
-		// 1. find the direct accessible types (in the package and the imported
-		// elements)
-		// 2. find in the subpackages and their import
-		// 3. find in all resources
-
-		Iterator<Collaboration> it = getAccessibleCollaborations(pack).iterator();
-		while(it.hasNext()) {
-			Collaboration t = it.next();
-			if(name.equals(t.getName())) {
-				return t;
-			}
-		}
-
-		Resource resource = pack.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			return findCollaborationByName(resourceSet, name);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a type given its name from a resource set.
-	 * 
-	 * @param resourceSet
-	 *        the resource Set
-	 * @param name
-	 *        the name of the type to find. It must not be <code>null</code>
-	 * @return the found type or <code>null</code> if the type was not found
-	 */
-	private static Type findTypeByName(ResourceSet resourceSet, String name) {
-		TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-		while(iterator.hasNext()) {
-			Notifier notifier = iterator.next();
-			if(notifier instanceof Type) {
-				Type type = ((Type)notifier);
-				if(name.equals(type.getName())) {
-					return type;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a collaboration given its name from a resource set.
-	 * 
-	 * @param resourceSet
-	 *        the resource Set
-	 * @param name
-	 *        the name of the collaboration to find. It must not be <code>null</code>
-	 * @return the found type or <code>null</code> if the collaboration was not found
-	 */
-	private static Collaboration findCollaborationByName(ResourceSet resourceSet, String name) {
-		TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-		while(iterator.hasNext()) {
-			Notifier notifier = iterator.next();
-			if(notifier instanceof Collaboration) {
-				Collaboration type = ((Collaboration)notifier);
-				if(name.equals(type.getName())) {
-					return type;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns all accessible types in the model
-	 * 
-	 * @param element
-	 *        the element from which all resources can be accessed
-	 * @return the list of Types accessible in the model
-	 */
-	public static Set<Type> getAllTypes(Element element) {
-		SortedSet<Type> set = new TreeSet<Type>(new TypeNameComparator());
-
-		Resource resource = element.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-			while(iterator.hasNext()) {
-				Notifier notifier = iterator.next();
-				if(notifier instanceof Type && ((Type)notifier).getName() != null) {
-					set.add(((Type)notifier));
-				}
-			}
-		}
-		return set;
-	}
-
-	/**
-	 * Returns all accessible Collaboration in the model
-	 * 
-	 * @param element
-	 *        the element from which all resources can be accessed
-	 * @return the list of Collaboration accessible in the model
-	 */
-	public static Set<Collaboration> getAllCollaborations(Element element) {
-		SortedSet<Collaboration> set = new TreeSet<Collaboration>(new TypeNameComparator());
-
-		Resource resource = element.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-			while(iterator.hasNext()) {
-				Notifier notifier = iterator.next();
-				if(notifier instanceof Collaboration && ((Collaboration)notifier).getName() != null) {
-					set.add(((Collaboration)notifier));
-				}
-			}
-		}
-		return set;
-	}
-
-	/**
-	 * Get all possible types for an element owned by this package.
-	 * 
-	 * @return a set of all available Types
-	 */
-	public static TreeSet<Type> getAccessibleTypes(Package pack) {
-		TreeSet<Type> set = new TreeSet<Type>(new TypeNameComparator());
-		// umlTypeList is used to detect type listed twice in the proposed list
-		// this may occurs for example with indirect import of UMLPrimitiveTypes
-		// Set<String> umlTypeQNames = new HashSet<String>();
-
-		Iterator<NamedElement> it = pack.getMembers().iterator();
-		// get direct members
-		while(it.hasNext()) {
-			NamedElement element = it.next();
-			if((element instanceof Type) /*
-										 * && (!(element instanceof Relationship))
-										 */) {
-				// Check for redundant type
-				// if (!umlTypeQNames.contains(element.getQualifiedName())) {
-				// /umlTypeQNames.add(element.getQualifiedName());
-				// set.add((Type) element);
-				// }
-				set.add((Type)element);
-			}
-		}
-
-		// Recursive call on parents
-		if((pack.getOwner() != null) && (pack.getOwner() instanceof Package)) {
-
-			Iterator<Type> itParent = PackageUtil.getAccessibleTypes(pack.getNestingPackage()).iterator();
-
-			while(itParent.hasNext()) {
-				set.add(itParent.next());
-				// Type currentType = itParent.next();
-
-				// if (!umlTypeQNames.contains(currentType.getQualifiedName()))
-				// {
-				// umlTypeQNames.add(currentType.getQualifiedName());
-				// set.add(currentType);
-				// }
-			}
-		}
-
-		return set;
-	}
-
-	/**
-	 * Get all possible Collaboration owned by this package.
-	 * 
-	 * @return a set of all available Collaborations
-	 */
-	public static TreeSet<Collaboration> getAccessibleCollaborations(Package pack) {
-		TreeSet<Collaboration> set = new TreeSet<Collaboration>(new TypeNameComparator());
-
-		Iterator<NamedElement> it = pack.getMembers().iterator();
-		// Get direct members
-		while(it.hasNext()) {
-			NamedElement element = it.next();
-			if(element instanceof Collaboration) {
-
-				set.add((Collaboration)element);
-			}
-		}
-
-		// Recursive call on parents
-		if((pack.getOwner() != null) && (pack.getOwner() instanceof Package)) {
-
-			Iterator<Collaboration> itParent = PackageUtil.getAccessibleCollaborations(pack.getNestingPackage()).iterator();
-
-			while(itParent.hasNext()) {
-				set.add(itParent.next());
-			}
-		}
-
-		return set;
-	}
-
-	/**
-	 * 
-	 * 
-	 * @return returns all nested elements of a package (classes, packages, interfaces, data types,
-	 *         properties, operations) Returned elements are of type org.eclipse.uml2.uml.Element
-	 */
-	public static Set<Element> getAllNestedElements(Package thePackage) {
-		Set<org.eclipse.uml2.uml.Element> nestedElements = new HashSet<Element>();
-		Iterator<org.eclipse.uml2.uml.NamedElement> i = thePackage.getOwnedMembers().iterator();
-		org.eclipse.uml2.uml.Element currentElement;
-		while(i.hasNext()) {
-			currentElement = i.next();
-			nestedElements.add(currentElement);
-			// Package
-			if(currentElement instanceof org.eclipse.uml2.uml.Package) {
-				nestedElements.addAll((PackageUtil.getAllNestedElements((Package)currentElement)));
-			}
-			// Class
-			else if(currentElement instanceof org.eclipse.uml2.uml.Class) {
-				nestedElements.addAll(((org.eclipse.uml2.uml.Class)currentElement).getMembers());
-			}
-		}
-		return nestedElements;
-	}
-
-	/**
-	 * Load Package from a specified URI
-	 * 
-	 * @param uri
-	 *        URI of the file to load
-	 * @param set
-	 *        ResourceSet
-	 * @return the root Package
-	 */
-	public static org.eclipse.uml2.uml.Package loadPackage(URI uri, ResourceSet set) {
-
-		org.eclipse.uml2.uml.Package package_ = null;
-		Resource resource = set.getResource(uri, true);
-
-		if(resource != null) {
-			package_ = (org.eclipse.uml2.uml.Package)EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.PACKAGE);
-		} else {
-			Activator.logException(new FileNotFoundException("Could not retrieve resource from URI : " + uri + "."));
-		}
-
-		return package_;
-
-	}
-
-	/**
-	 * Comparator using type names
-	 */
-	static class TypeNameComparator implements Comparator<Type> {
-
-		/**
-		 * {@inheritDoc}
-		 */
-		public int compare(Type o1, Type o2) {
-			final String o1Name = ((o1.getName() != null) ? o1.getName() : "");
-			final String o2Name = ((o2.getName() != null) ? o2.getName() : "");
-			return o1Name.compareTo(o2Name);
-		}
-
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ParameterUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ParameterUtil.java
deleted file mode 100644
index ce38cf5ad51..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ParameterUtil.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Parameter</code><BR>

- */

-public class ParameterUtil {

-

-	/**

-	 * Returns the modifier of the property, separated by a comma, as as single line if <code>multiline</code> is <code>false</code> or as a multiline

-	 * string if <code>multiline</code> is <code>false</code>.

-	 * 

-	 * @param multiLine

-	 *        boolean that indicates if the string should have several lines when set to <code>true</code> or only one line when set to

-	 *        <code>false</code>.

-	 * 

-	 * @return a string giving all modifiers for the property

-	 */

-	public static String getModifiersAsString(Parameter parameter, boolean multiLine) {

-		StringBuffer buffer = new StringBuffer();

-		boolean needsComma = false;

-		String NL = (multiLine) ? "\n" : " ";

-

-		// Return parameter modifiers

-		if(parameter.isOrdered()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "ordered");;

-		}

-		if(parameter.isUnique()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "unique");

-		}

-		if(parameter.isException()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "exception");

-		}

-		if(parameter.isStream()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "stream");

-		}

-

-		if(!buffer.toString().equals("")) {

-			buffer.insert(0, "{");

-			buffer.append("}");

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Update the modifiers string

-	 * 

-	 * @param buffer

-	 *        the existing bufferString to append

-	 * @param needsComma

-	 *        if it needs coma

-	 * @param NL

-	 *        if it is multiline

-	 * @param message

-	 *        the message top

-	 * @return true because the modifier string is no more empty

-	 */

-	private static boolean updateModifiersString(StringBuffer buffer, boolean needsComma, String NL, String message) {

-		if(needsComma) {

-			buffer.append(",");

-			buffer.append(NL);

-		}

-		buffer.append(message);

-		return true;

-	}

-

-	/**

-	 * return the full label of the Parameter.

-	 * 

-	 * @return the string corresponding to the label of the parameter

-	 */

-	public static String getLabel(Parameter parameter) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		buffer.append(NamedElementUtil.getVisibilityAsSign(parameter));

-

-		// direction

-		buffer.append(" ");

-		buffer.append(parameter.getDirection().getLiteral());

-

-		// name

-		buffer.append(" ");

-		if(parameter.getName() != null) {

-			buffer.append(parameter.getName());

-		}

-

-		// type

-		if(parameter.getType() != null) {

-			buffer.append(": " + parameter.getType().getName());

-		} else {

-			buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);

-		}

-

-		// multiplicity -> do not display [1]

-		String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(parameter);

-		if(!multiplicity.trim().equals("[1]")) {

-			buffer.append(multiplicity);

-		}

-

-		// default value

-		if(parameter.getDefault() != null) {

-			buffer.append(" = ");

-			buffer.append(parameter.getDefault());

-		}

-

-		// property modifiers

-		buffer.append(ParameterUtil.getModifiersAsString(parameter, false));

-

-		return buffer.toString();

-	}

-

-	/**

-	 * return the custom label of the property, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the property

-	 */

-	public static String getCustomLabel(Parameter parameter, int style) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(parameter));

-		}

-

-		// direction property

-		if((style & ICustomAppearence.DISP_PARAMETER_DIRECTION) != 0) {

-			buffer.append(" ");

-			buffer.append(parameter.getDirection().getLiteral());

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_PARAMETER_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(parameter.getName());

-		}

-

-		if((style & ICustomAppearence.DISP_PARAMETER_TYPE) != 0) {

-			// type

-			if(parameter.getType() != null) {

-				buffer.append(": " + parameter.getType().getName());

-			} else {

-				buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_PARAMETER_MULTIPLICITY) != 0) {

-			// multiplicity -> do not display [1]

-			String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(parameter);

-			buffer.append(multiplicity);

-		}

-

-		if((style & ICustomAppearence.DISP_PARAMETER_DEFAULT) != 0) {

-			// default value

-			if(parameter.getDefault() != null) {

-				buffer.append(" = ");

-				buffer.append(parameter.getDefault());

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MOFIFIERS) != 0) {

-			boolean multiLine = ((style & ICustomAppearence.DISP_MULTI_LINE) != 0);

-			// property modifiers

-			String modifiers = ParameterUtil.getModifiersAsString(parameter, multiLine);

-			if(!modifiers.equals("")) {

-				if(multiLine) {

-					buffer.append("\n");

-				}

-				buffer.append(modifiers);

-			}

-		}

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns the default value as a String

-	 * 

-	 * @param equalSign

-	 *        boolean set to <code>true</code> if the label must have the <code>=</code> sign

-	 *        before the default value

-	 * @return the default value as a String

-	 */

-	private static String getDefaultAsString(Parameter parameter, boolean equalSign) {

-		String defaultString = "";

-		// default value

-		if((parameter.getDefault() != null) && !parameter.getDefault().equals("")) {

-			if(equalSign) {

-				defaultString += "= ";

-			}

-			defaultString += parameter.getDefault();

-		}

-		return "";

-	}

-

-	/**

-	 * Returns <code>true</code> if the given style has the given mask

-	 * 

-	 * @param style

-	 *        the style to check

-	 * @param mask

-	 *        the mask to check

-	 * @return <code>true</code> if the style has the bit mask

-	 */

-	static boolean hasStyle(int style, int mask) {

-		return ((style & mask) != 0);

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java
deleted file mode 100644
index 90fbec1db61..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-/**

- * A class containing static utility method regarding UML profiles

- * 

- * @author Camille Letavernier

- * 

- */

-public class ProfileUtil {

-

-

-	/**

-	 * Checks if the profile applied has been changed since last application (definition does not match.

-	 * 

-	 * @param _package

-	 *        on which the profile is applied

-	 * @param _profile

-	 *        the applied profile

-	 * @return true if the profile has changed

-	 */

-	public static boolean isDirty(Package _package, Profile _profile) {

-		boolean isDirty = false;

-		if(_profile == null || _profile.eResource() == null) {

-			return false;

-		}

-

-		// Retrieve model resourceSet

-		ResourceSet pkge_resourceSet = _package.eResource().getResourceSet();

-

-		// Retrieve profile resource

-		URI prof_URI = _profile.eResource().getURI();

-		Resource modelResource = pkge_resourceSet.getResource(prof_URI, true);

-

-		if(modelResource.getContents().get(0) instanceof Profile) {

-

-			// ckeck applied profile application definition vs profile definition referenced in file

-			Profile profileInFile = (Profile)(modelResource.getContents().get(0));

-

-			if(_package.getProfileApplication(_profile) != null) {

-				EPackage appliedProfileDefinition = _package.getProfileApplication(_profile).getAppliedDefinition();

-				EPackage fileProfileDefinition = null;

-

-				// Check profiles qualified names to ensure the correct profiles are compared

-				String appliedProfileName = _profile.getQualifiedName();

-				String fileProfileName = profileInFile.getQualifiedName();

-				if(!appliedProfileName.equals(fileProfileName)) {

-

-					// The profile must be a subprofile

-					Iterator<Profile> it = PackageUtil.getSubProfiles(profileInFile).iterator();

-					while(it.hasNext()) {

-						Profile current = it.next();

-						fileProfileName = current.getQualifiedName();

-						if(fileProfileName.equals(appliedProfileName)) {

-							profileInFile = current;

-						}

-					}

-				}

-

-				fileProfileDefinition = profileInFile.getDefinition();

-

-				if(appliedProfileDefinition != fileProfileDefinition) {

-					isDirty = true;

-				}

-			}

-

-		}

-

-		return isDirty;

-	}

-

-	public static List<Stereotype> findAllSubStereotypes(Stereotype parentStereotype, Package umlPackage, boolean concreteOnly) {

-		Collection<Stereotype> result = new LinkedHashSet<Stereotype>();

-

-		for(Profile profile : umlPackage.getAllAppliedProfiles()) {

-			List<Stereotype> allStereotypes = new LinkedList<Stereotype>();

-			findAllStereotypes(profile, allStereotypes);

-			for(Stereotype stereotype : allStereotypes) {

-				if(concreteOnly && stereotype.isAbstract()) {

-					continue; //Skip abstract stereotypes

-				}

-

-				if(isSubStereotype(parentStereotype, stereotype)) {

-					result.add(stereotype);

-				}

-			}

-

-		}

-

-		return new LinkedList<Stereotype>(result);

-	}

-

-	public static boolean isSubStereotype(Stereotype parentStereotype, Stereotype childStereotype) {

-		if(parentStereotype == childStereotype) {

-			return true;

-		}

-		return childStereotype.getGenerals().contains(parentStereotype); //TODO : This is probably not recursive...

-	}

-

-	/**

-	 * Finds recursively all stereotypes contained in this profile

-	 * 

-	 * @param profile

-	 * 

-	 * @param result

-	 */

-	public static void findAllStereotypes(Profile profile, List<Stereotype> result) {

-		for(Stereotype stereotype : profile.getOwnedStereotypes()) {

-			result.add(stereotype);

-		}

-		for(Package subPackage : profile.getNestedPackages()) {

-			if(subPackage instanceof Profile) {

-				Profile subProfile = (Profile)subPackage;

-				findAllStereotypes(subProfile, result);

-			}

-		}

-	}

-

-	private static EPackage umlMetamodel = UMLPackage.eINSTANCE;

-

-	public static List<EClass> getAllExtendedMetaclasses(Stereotype stereotype, boolean concreteClassesOnly) {

-		List<Class> extendedMetaclasses = stereotype.getAllExtendedMetaclasses();

-		Set<EClass> allMetaclasses = new LinkedHashSet<EClass>();

-		for(Class extendedMetaclass : extendedMetaclasses) {

-			EClass UMLEClass = findEClass(extendedMetaclass);

-			allMetaclasses.addAll(EMFHelper.getSubclassesOf(UMLEClass, concreteClassesOnly));

-		}

-

-		return new LinkedList<EClass>(allMetaclasses);

-	}

-

-	private static EClass findEClass(Class metaclass) {

-		for(EClassifier classifier : umlMetamodel.getEClassifiers()) {

-			if(classifier instanceof EClass) {

-				if(classifier.getName().equals(metaclass.getName())) {

-					return (EClass)classifier;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Searchs the association containing a member end matching the given name

-	 * in the given stereotype, and returns it if it is typed by a stereotype

-	 * 

-	 * TODO : This method can probably be used in a single specific case and should probably not be here

-	 * 

-	 * @param stereotype

-	 * @param associationName

-	 * @return

-	 */

-	public static Property findStereotypedProperty(Stereotype stereotype, String associationName) {

-		//associations loop

-		associations: for(Association association : stereotype.getAssociations()) {

-			//memberEnds loop

-			for(Property memberEnd : association.getMemberEnds()) {

-				if(memberEnd.getType() == stereotype) {

-					//oppositeEnds loop

-					for(Property oppositeEnd : association.getMemberEnds()) {

-						if(oppositeEnd != memberEnd && oppositeEnd.getName().equals(associationName) && !association.getOwnedEnds().contains(oppositeEnd)) {

-							if(oppositeEnd.getType() instanceof Stereotype) {

-								return oppositeEnd;

-							}

-							break associations;

-						}

-					}

-				}

-			}

-		}

-

-		//FIXME : Do we really need to browse associations first ?

-

-		//Search for properties which are not associations

-		for(Property property : stereotype.getAllAttributes()) {

-			if(property.getName().equals(associationName)) {

-				if(property.getType() instanceof Stereotype) {

-					return property;

-				}

-			}

-		}

-

-		return null;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/PropertyUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/PropertyUtil.java
deleted file mode 100644
index 554e42e9feb..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/PropertyUtil.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Property</code><BR>

- */

-public class PropertyUtil {

-

-	/**

-	 * Get all properties that can be subset by this {@link Property} checks the type and the

-	 * multiplicity.

-	 * 

-	 * @param property

-	 *        property for which the list of subsettable properties are made

-	 * @param noCheck

-	 *        set this parameter to <code>true</code> if multiplicity and type check should be

-	 *        made for the computation

-	 * @return all properties that can be subset

-	 */

-	public static List<Property> getSubsettablesProperties(Property property, boolean noCheck) {

-		List<Property> list = new ArrayList<Property>();

-

-		// subset properties:

-		Iterator<NamedElement> it = property.getClass_().getMembers().iterator();

-		while(it.hasNext()) {

-

-			NamedElement element = it.next();

-			if(element instanceof Property) {

-				boolean isValid = true;

-				Property subsettableProperty = (Property)element;

-

-				// check it is not itself....

-				if(subsettableProperty.equals(property)) {

-					isValid = false;

-				}

-

-				// check types conformity

-				if(!noCheck) {

-					if(property.getType() != null && subsettableProperty.getType() != null) {

-						if(!property.getType().conformsTo(subsettableProperty.getType())) {

-							isValid = false;

-						}

-					} else {

-						isValid = false;

-					}

-

-					// check multiplicity (only upper bound has an OCL rule)

-					if((subsettableProperty.getUpper() != -1) && (property.getUpper() > subsettableProperty.getUpper())) {

-						isValid = false;

-					}

-				}

-

-				if(isValid) {

-					list.add(subsettableProperty);

-				}

-			}

-		}

-		return list;

-	}

-

-	/**

-	 * Find a subsetted property given its name and a context to find it.

-	 * 

-	 * @param name

-	 *        the name of the property

-	 * @return the property found or <code>null</code> if the element was not found.

-	 */

-	// @unused

-	public static Property findSusbsettedPropertyByName(String propertyName, Property property, boolean noCheck) {

-		Iterator<Property> it = PropertyUtil.getSubsettablesProperties(property, true).iterator();

-		while(it.hasNext()) {

-			Property tmpProperty = it.next();

-			String tmpPropertyName = tmpProperty.getName();

-			if(tmpPropertyName != null && propertyName.equals(tmpPropertyName.trim())) {

-				return tmpProperty;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Get all properties that can be redefined by this {@link Property}.

-	 * 

-	 * @return all properties that can be redefined

-	 */

-	public static List<Property> getRedefinableProperties(Property property) {

-		List<Property> list = new ArrayList<Property>();

-

-		// redefine-able properties:

-		Iterator<NamedElement> it = property.getClass_().getInheritedMembers().iterator();

-		while(it.hasNext()) {

-			NamedElement element = it.next();

-			if(element instanceof Property) {

-				list.add((Property)element);

-			}

-		}

-

-		// adds also already redefined members. In fact, when properties are

-		// redefined, they

-		// disappear from the inherited members list

-		Iterator<Property> it2 = property.getRedefinedProperties().iterator();

-		while(it2.hasNext()) {

-			Property element = it2.next();

-			list.add(element);

-		}

-		return list;

-	}

-

-	/**

-	 * Find a redefined property given its name and a context to find it.

-	 * 

-	 * @param name

-	 *        the name of the property

-	 * @return the property found or <code>null</code> if the element was not found.

-	 */

-	public static Property findRedefinedPropertyByName(String propertyName, Property property) {

-		Iterator<Property> it = PropertyUtil.getRedefinableProperties(property).iterator();

-		while(it.hasNext()) {

-			Property tmpProperty = it.next();

-			String tmpPropertyName = tmpProperty.getName();

-			if(tmpPropertyName != null && propertyName.equals(tmpPropertyName.trim())) {

-				return tmpProperty;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Get the displayed string for the derived attribute of the property.

-	 * 

-	 * @param property

-	 *        the property

-	 * @return If the property is derived, return "/". Otherwise return an empty String

-	 */

-	public static String getDerived(Property property) {

-		return property.isDerived() ? "/" : "";

-	}

-

-	/**

-	 * return the full label of the property, given UML2 specification.

-	 * 

-	 * @return the string corresponding to the label of the property

-	 */

-	public static String getLabel(Property property) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		buffer.append(NamedElementUtil.getVisibilityAsSign(property));

-

-		// derived property

-		buffer.append(getDerived(property));

-

-		// name

-		buffer.append(" ");

-		buffer.append(getName(property));

-

-		// type

-		if(property.getType() != null) {

-			buffer.append(" : " + property.getType().getName());

-		} else {

-			buffer.append(" : " + TypeUtil.UNDEFINED_TYPE_NAME);

-		}

-

-		// multiplicity -> do not display [1]

-		String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(property);

-		if(!multiplicity.trim().equals("[1]")) {

-			buffer.append(multiplicity);

-		}

-

-		// default value

-		if(property.getDefault() != null) {

-			buffer.append(" = ");

-			buffer.append(property.getDefault());

-		}

-

-		// property modifiers

-		buffer.append(PropertyUtil.getModifiersAsString(property, false));

-

-		return buffer.toString();

-	}

-

-	public static String getName(Property property) {

-		if(property.getName() != null) {

-			return property.getName();

-		} else {

-			return (NamedElementUtil.getDefaultNameWithIncrement(property));

-		}

-	}

-

-	/**

-	 * return the custom label of the property, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the property

-	 */

-	public static String getCustomLabel(Property property, int style) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-

-		buffer.append(" ");

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(property));

-		}

-

-		// derived property

-		if((style & ICustomAppearence.DISP_DERIVE) != 0) {

-			if(property.isDerived()) {

-				buffer.append("/");

-			}

-		}

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(property.getName());

-		}

-

-		if((style & ICustomAppearence.DISP_TYPE) != 0) {

-			// type

-			if(property.getType() != null) {

-				buffer.append(": " + property.getType().getName());

-			} else {

-				buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MULTIPLICITY) != 0) {

-			// multiplicity -> do not display [1]

-			String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(property);

-			buffer.append(multiplicity);

-		}

-

-		if((style & ICustomAppearence.DISP_DFLT_VALUE) != 0) {

-			// default value

-			if(property.getDefault() != null) {

-				buffer.append(" = ");

-				buffer.append(property.getDefault());

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MOFIFIERS) != 0) {

-			boolean multiLine = ((style & ICustomAppearence.DISP_MULTI_LINE) != 0);

-			// property modifiers

-			String modifiers = PropertyUtil.getModifiersAsString(property, multiLine);

-			if(!modifiers.equals("")) {

-				if(multiLine) {

-					buffer.append("\n");

-				}

-				

-				if (!buffer.toString().endsWith(" ")){					

-					buffer.append(" ");

-				}

-				

-				buffer.append(modifiers);

-			}

-		}

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns the modifier of the property, separated by a comma, as as single line if <code>multiline</code> is <code>false</code> or as a multiline

-	 * string if <code>multiline</code> is <code>false</code>.

-	 * 

-	 * @param multiLine

-	 *        boolean that indicates if the string should have several lines when set to <code>true</code> or only one line when set to

-	 *        <code>false</code>.

-	 * 

-	 * @return a string giving all modifiers for the property

-	 */

-	public static String getModifiersAsString(Property property, boolean multiLine) {

-		StringBuffer buffer = new StringBuffer();

-		boolean needsComma = false;

-		String NL = (multiLine) ? "\n" : " ";

-

-		// Return property modifiers

-		if(property.isReadOnly()) {

-			buffer.append("readOnly");

-			needsComma = true;

-		}

-		if(property.isDerivedUnion()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "union");

-		}

-		if(property.isOrdered()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "ordered");;

-		}

-		if(property.isUnique()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "unique");

-		}

-

-		// is the property redefining another property ?

-		for(Property current : property.getRedefinedProperties()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "redefines ");

-			buffer.append(current.getName());

-		}

-

-		// is the property subsetting another property ?

-		for(Property current : property.getSubsettedProperties()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "subsets ");

-			buffer.append(current.getName());

-		}

-

-		if(!buffer.toString().equals("")) {

-			buffer.insert(0, "{");

-			buffer.append("}");

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Update the modifiers string

-	 * 

-	 * @param buffer

-	 *        the existing bufferString to append

-	 * @param needsComma

-	 *        if it needs coma

-	 * @param NL

-	 *        if it is multiline

-	 * @param message

-	 *        the message top

-	 * @return true because the modifier string is no more empty

-	 */

-	private static boolean updateModifiersString(StringBuffer buffer, boolean needsComma, String NL, String message) {

-		if(needsComma) {

-			buffer.append(",");

-			buffer.append(NL);

-		}

-		buffer.append(message);

-		return true;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/SignalUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/SignalUtil.java
deleted file mode 100644
index aff8f747f3d..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/SignalUtil.java
+++ /dev/null
@@ -1,77 +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:

- *  Atos Origin - Initial API and implementation

- *

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

-package org.eclipse.papyrus.uml.tools.utils;

-

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

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Signal</code><BR>

- */

-public class SignalUtil {

-

-	/**

-	 * return the custom label of the signal, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the signal

-	 */

-	public static String getCustomLabel(Signal signal, int style) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(" "); // adds " " first for correct display considerations

-

-		// visibility

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(signal));

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(signal.getName());

-		}

-

-		// 

-		// parameters : '(' parameter-list ')'

-		buffer.append("(");

-		buffer.append(getPropertiesAsString(signal, style));

-		buffer.append(")");

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns signal properties as a string, the label is customized using a bit mask

-	 * 

-	 * @return a string containing all properties separated by commas

-	 */

-	private static String getPropertiesAsString(Signal signal, int style) {

-		StringBuffer propertiesString = new StringBuffer();

-		boolean firstProperty = true;

-		for(Property property : signal.getOwnedAttributes()) {

-			// get the label for this property

-			String propertyString = PropertyUtil.getCustomLabel(property, style);

-			if(!propertyString.trim().equals("")) {

-				if(!firstProperty) {

-					propertiesString.append(", ");

-				}

-				propertiesString.append(propertyString);

-				firstProperty = false;

-			}

-		}

-		return propertiesString.toString();

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/StereotypeUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/StereotypeUtil.java
deleted file mode 100644
index 5e5b52a3900..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/StereotypeUtil.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.Image;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Utility class for Stereotypes.
- */
-public class StereotypeUtil {
-
-	protected static final String SPACE_SEPARATOR = "#";
-
-	protected static final String EQUAL_SEPARATOR = "=";
-
-	protected static final String PROPERTY_VALUE_SEPARATOR = "|";
-
-	protected static final String SETREOTYPE_WITH_VALUE_SEPARATOR = ";";
-
-	protected static final String ST_LEFT = String.valueOf("\u00AB");
-
-	protected static final String ST_RIGHT = String.valueOf("\u00BB");
-
-	/**
-	 * returns the list of all super stereotypes for the specified stereotype
-	 * 
-	 * @param stereotype
-	 *        the stereotype for which super-stereotypes are looked for.
-	 * @return the list of all stereotypes from which the specified stereotype inherits
-	 */
-	public static List<Stereotype> getAllSuperStereotypes(Stereotype stereotype) {
-		List<Stereotype> generalStereotypes = new ArrayList<Stereotype>();
-		for(Classifier generalClassifier : stereotype.getGenerals()) {
-			if(generalClassifier instanceof Stereotype) {
-				generalStereotypes.add((Stereotype)generalClassifier);
-				generalStereotypes.addAll(getAllSuperStereotypes((Stereotype)generalClassifier));
-			}
-		}
-		return generalStereotypes;
-	}
-
-	/**
-	 * Parse the stereotype image and select those that have an "icon" kind (EAnnotation).
-	 * 
-	 * @param stereotype
-	 *        to parse
-	 * 
-	 * @return a EList of {@link Image}
-	 */
-	public static EList<Image> getIcons(Stereotype stereotype) {
-
-		EList<Image> icons = new BasicEList<Image>();
-
-		Iterator<Image> it = stereotype.getIcons().iterator();
-		while(it.hasNext()) {
-			Image image = it.next();
-			if("icon".equals(ImageUtil.getKind(image))) {
-				icons.add(image);
-			}
-		}
-
-		return icons;
-	}
-
-	/**
-	 * Returns the list of names (not qualified) of properties to display.
-	 * 
-	 * @param stereotype
-	 * @param stPropList
-	 * 
-	 * @return
-	 */
-	private static List<String> getStereoPropertiesToDisplay(org.eclipse.uml2.uml.Stereotype stereotype, List<String> stPropList) {
-		ArrayList<String> result = new ArrayList<String>();
-
-		Iterator<String> propIter = stPropList.iterator();
-		while(propIter.hasNext()) {
-			String currentProp = propIter.next();
-			if(currentProp.substring(0, currentProp.lastIndexOf(".")).equals(stereotype.getQualifiedName())) {
-				result.add(currentProp.substring(currentProp.lastIndexOf(".") + 1, currentProp.length()));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * return string that contains value of properties of applied stereotype
-	 * 
-	 * @param stereotypesPropertiesToDisplay
-	 *        list of properties of stereotype to display grammar=
-	 *        {<B>stereotypequalifiedName</B>'.'<B>propertyName</B>','}*
-	 * 
-	 * @return a string withe the following grammar grammar=
-	 *         {'\u00AB'<B>StereotypeName</B>'\u00BB''#'
-	 *         {<B>propertyName</B>'='<B>propertyValue</B>'|'}*';'}*
-	 */
-	public static String getPropertiesValues(String stereotypesPropertiesToDisplay, Element umlElement) {
-		HashSet<org.eclipse.uml2.uml.Stereotype> stereoSet = new HashSet<org.eclipse.uml2.uml.Stereotype>();
-		ArrayList<String> stPropList = new ArrayList<String>();
-
-		String propValues = "";
-
-		// fill our data structure in order to generate the string
-		StringTokenizer propStringTokenizer = new StringTokenizer(stereotypesPropertiesToDisplay, ",");
-		while(propStringTokenizer.hasMoreElements()) {
-			// extract property to display
-			String propertyQN = propStringTokenizer.nextToken();
-			// stereotype
-			String stereotypeQN = propertyQN.substring(0, propertyQN.indexOf("."));
-
-			Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeQN);
-			if(stereotype != null) {
-				stereoSet.add(stereotype);
-			}
-			stPropList.add(propertyQN);
-		}
-
-		// Display each stereotype
-		Iterator<org.eclipse.uml2.uml.Stereotype> stereoIter = stereoSet.iterator();
-		while(stereoIter.hasNext()) {
-			org.eclipse.uml2.uml.Stereotype stereotype = stereoIter.next();
-			// display the stereotype
-			propValues = propValues + ST_LEFT + stereotype.getName() + ST_RIGHT + SPACE_SEPARATOR;
-			// get the set of property to display
-			Iterator<String> stPropIter = getStereoPropertiesToDisplay(stereotype, stPropList).iterator();
-
-			// display each property
-			while(stPropIter.hasNext()) {
-				String stProp = stPropIter.next();
-				// get the property
-				org.eclipse.uml2.uml.Property currentProp = getPropertyByName(stereotype, stProp);
-
-				if(currentProp == null) {
-					return "No value";
-				}
-				propValues += displayPropertyValue(stereotype, currentProp, umlElement, PROPERTY_VALUE_SEPARATOR);
-			}// display each property
-			if(propValues.endsWith(PROPERTY_VALUE_SEPARATOR)) {
-				propValues = propValues.substring(0, propValues.lastIndexOf(PROPERTY_VALUE_SEPARATOR));
-			}
-			propValues = propValues + SETREOTYPE_WITH_VALUE_SEPARATOR;
-		}// end display each property
-
-		return propValues;
-	}
-
-	/**
-	 * Computes the display of a property value.
-	 * 
-	 * @param stereotype
-	 *        the stereotype that contains the property to be displayed
-	 * @param property
-	 *        the property to be displayed
-	 * @param umlElement
-	 *        the element that is stereotyped by the specified
-	 * @param separator
-	 *        the separator between each property value, in case several properties are
-	 *        displayed for the same property
-	 * @return a string corresponding to the property value
-	 */
-	public static String displayPropertyValue(Stereotype stereotype, Property property, Element umlElement, String separator) {
-		org.eclipse.uml2.uml.Type propType = property.getType();
-
-		// property type is an enumeration
-		if(propType instanceof org.eclipse.uml2.uml.Enumeration) {
-			return getPropertyValueForEnumerationType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator);
-		}
-
-		// property type is a metaclass
-		else if((propType instanceof org.eclipse.uml2.uml.Class) && (propType.getAppliedStereotypes() != null) && (propType.getAppliedStereotypes().size() > 0) && ((org.eclipse.uml2.uml.Stereotype)propType.getAppliedStereotypes().get(0)).getName().equals("Metaclass")) {
-			return getPropertyValueForMetaclassType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator);
-		}
-		// property type is a stereotype
-		else if(propType instanceof org.eclipse.uml2.uml.Stereotype) {
-			return getPropertyValueForStereotypeType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator);
-		}
-		// property is a composite class
-		else if((propType instanceof org.eclipse.uml2.uml.Class) && !(propType instanceof org.eclipse.uml2.uml.Stereotype) && property.isComposite()) {
-			return /* FIXME stProp + */property.getName() + EQUAL_SEPARATOR + property.getName() + separator;
-		}
-		// otherwise
-		else {
-			return getPropertyValue(property, stereotype, umlElement, EQUAL_SEPARATOR, separator);
-		}
-	}
-
-	/**
-	 * Retrieves a property of the specified stereotype, given its name
-	 * 
-	 * @param stereotype
-	 *        the stereotype owner of the property
-	 * @param propertyName
-	 *        the name of the property to find
-	 */
-	public static Property getPropertyByName(Stereotype stereotype, String propertyName) {
-		Iterator<Property> iterPro = stereotype.getAllAttributes().iterator();
-		// from a string look for the property
-		while(iterPro.hasNext()) {
-			org.eclipse.uml2.uml.Property tmpProperty = iterPro.next();
-			String name = "";
-			if(tmpProperty != null) {
-				name = (tmpProperty.getName() != null) ? tmpProperty.getName() : "";
-			}
-			if(name.equals(propertyName)) {
-				return tmpProperty;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * return string that contains value of properties of applied stereotype
-	 * 
-	 * @param stereotypesPropertiesToDisplay
-	 *        list of properties of stereotype to display grammar=
-	 *        {<B>stereotypequalifiedName</B>'.'<B>propertyName</B>','}*
-	 * 
-	 * @return a string with the following grammar grammar=
-	 *         {(<B>propertyName</B>'='<B>propertyValue</B>',')*
-	 *         <B>propertyName</B>'='<B>propertyValue</B>'}
-	 */
-	public static String getPropertiesValuesInBrace(String stereotypesPropertiesToDisplay, Element umlElement) {
-		String propertyValues = "";
-
-		HashSet<org.eclipse.uml2.uml.Stereotype> stereoSet = new HashSet<org.eclipse.uml2.uml.Stereotype>();
-		ArrayList<String> stPropList = new ArrayList<String>();
-
-		// fill our data structure in order to generate the string
-		StringTokenizer propStringTokenizer = new StringTokenizer(stereotypesPropertiesToDisplay, ",");
-		while(propStringTokenizer.hasMoreElements()) {
-			// extract property to display
-			String propertyQN = propStringTokenizer.nextToken();
-			// stereotype
-			String stereotypeQN = propertyQN.substring(0, propertyQN.indexOf("."));
-
-			Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeQN);
-			if(stereotype != null) {
-				stereoSet.add(stereotype);
-			}
-
-			stPropList.add(propertyQN);
-		}
-
-		// Display each stereotype
-		Iterator<org.eclipse.uml2.uml.Stereotype> stereoIter = stereoSet.iterator();
-		while(stereoIter.hasNext()) {
-			Stereotype stereotype = stereoIter.next();
-			if(stereotype != null) {
-				propertyValues += displayPropertyValuesForStereotype(stereotype, stPropList, umlElement);
-			}
-		}
-		return propertyValues;
-	}
-
-	public static String displayPropertyValuesForStereotype(Stereotype stereotype, List<String> stPropList, Element umlElement) {
-		StringBuffer buffer = new StringBuffer();
-
-		// add stereotype name. For "In Brace", display nothing
-		buffer.append("");
-		// get the set of property to display
-		Iterator<String> stPropIter = getStereoPropertiesToDisplay(stereotype, stPropList).iterator();
-
-		// display each property
-		while(stPropIter.hasNext()) {
-			String stProp = stPropIter.next();
-			// get the property
-			org.eclipse.uml2.uml.Property currentProp = null;
-			Iterator<Property> iterPro = stereotype.getAllAttributes().iterator();
-			// from a string look for the property
-			while(iterPro.hasNext()) {
-				org.eclipse.uml2.uml.Property tmpProperty = iterPro.next();
-				if(stProp.equals(tmpProperty.getName())) {
-					currentProp = tmpProperty;
-				}
-			}
-
-			if(currentProp == null) {
-				return "No value";
-			}
-			org.eclipse.uml2.uml.Type propType = currentProp.getType();
-
-			// property type is an enumeration
-
-			if(propType instanceof org.eclipse.uml2.uml.Enumeration) {
-				buffer.append(getPropertyValueForEnumerationType(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ","));
-			}
-
-			// property type is a metaclass
-			else if((propType instanceof org.eclipse.uml2.uml.Class) && (propType.getAppliedStereotypes() != null) && (propType.getAppliedStereotypes().size() > 0) && ((org.eclipse.uml2.uml.Stereotype)propType.getAppliedStereotypes().get(0)).getName().equals("Metaclass")) {
-				buffer.append(getPropertyValueForMetaclassType(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ","));
-			}
-
-			// property type is a stereotype
-			else if(propType instanceof org.eclipse.uml2.uml.Stereotype) {
-				buffer.append(getPropertyValueForStereotypeType(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ","));
-			}
-
-			// property is a composite class
-			else if((propType instanceof org.eclipse.uml2.uml.Class) && !(propType instanceof org.eclipse.uml2.uml.Stereotype) && currentProp.isComposite()) {
-				buffer.append(stProp + EQUAL_SEPARATOR + currentProp.getName() + ",");
-			}
-
-			// otherwise
-			else {
-				buffer.append(getPropertyValue(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ","));
-			}
-		}// display each property
-
-		String propValues = buffer.toString();
-		if(propValues.endsWith(",")) {
-			propValues = propValues.substring(0, propValues.lastIndexOf(","));
-		}
-
-		return propValues;
-	}
-
-	/**
-	 * return the string that represents the value of property when its type is an Enumeration
-	 * 
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValueForEnumerationType(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR) {
-		String out = "";
-		if((property.getUpper() == 1) && (umlElement.getValue(stereotype, property.getName()) != null)) {
-			if((property.getLower() != 0) || umlElement.getValue(stereotype, property.getName()) != null) {
-				if(property.isSetDefault() || umlElement.getValue(stereotype, property.getName()) != null) {
-					Object val = umlElement.getValue(stereotype, property.getName());
-					if (val instanceof EnumerationLiteral)
-						out = property.getName() + EQUAL_SEPARATOR + ((EnumerationLiteral)val).getLabel() + PROPERTY_VALUE_SEPARATOR;
-					else
-						out = property.getName() + EQUAL_SEPARATOR + val + PROPERTY_VALUE_SEPARATOR;
-				} else {
-					out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-				}
-			} else {
-				out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-			}
-		}
-
-		// multiplicity is greater than one
-		else {
-			out = property.getName() + EQUAL_SEPARATOR + umlElement.getValue(stereotype, property.getName()) + PROPERTY_VALUE_SEPARATOR;
-		}
-		return out;
-	}
-
-	/**
-	 * return the string that represents the value of property when its type is a Metaclass
-	 * 
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValueForMetaclassType(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR) {
-		String out = "";
-
-		if((property.getUpper() == 1) && (umlElement.getValue(stereotype, property.getName()) != null) && (umlElement.getValue(stereotype, property.getName()) instanceof NamedElement)) {
-			out = property.getName() + EQUAL_SEPARATOR + ((NamedElement)(umlElement.getValue(stereotype, property.getName()))).getName() + PROPERTY_VALUE_SEPARATOR;
-		}
-
-		// multiplicity greater than one
-		else if(property.getUpper() != 1) {
-			List values = (List)umlElement.getValue(stereotype, property.getName());
-			ArrayList elementNames = new ArrayList();
-			if(values != null) {
-				for(int count = 0; count < values.size(); count++) {
-					if(values.get(count) instanceof NamedElement) {
-						elementNames.add(((NamedElement)values.get(count)).getName());
-					}
-				}
-			}
-			out = property.getName() + EQUAL_SEPARATOR + elementNames + PROPERTY_VALUE_SEPARATOR;
-		}
-
-		// multiplicity = 1 and property value null
-		else {
-			out = property.getName() + EQUAL_SEPARATOR + umlElement.getValue(stereotype, property.getName()) + PROPERTY_VALUE_SEPARATOR;
-		}
-		return out;
-	}
-
-	/**
-	 * return the string that represents the value of property when its type is a stereotype
-	 * 
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValueForStereotypeType(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR) {
-		String out = "";
-		if((property.getUpper() == 1) && (umlElement.getValue(stereotype, property.getName()) != null)) {
-
-			// retrieve the base element from the stereotype application
-			Object value = umlElement.getValue(stereotype, property.getName());
-			Element baseElement = UMLUtil.getBaseElement((EObject)value);
-
-			// display the base element's qualified name
-			out = property.getName() + EQUAL_SEPARATOR + ((NamedElement)baseElement).getName() + PROPERTY_VALUE_SEPARATOR;
-		}
-
-		// multiplicity greater than one
-		else if(property.getUpper() != 1) {
-			// retrieve the base element from the stereotype application
-			List values = (List)umlElement.getValue(stereotype, property.getName());
-			ArrayList baseElements = new ArrayList();
-			if(values != null) {
-				for(int k = 0; k < values.size(); k++) {
-					baseElements.add(((NamedElement)UMLUtil.getBaseElement((EObject)values.get(k))).getName());
-				}
-			}
-
-			out = property.getName() + EQUAL_SEPARATOR + baseElements + PROPERTY_VALUE_SEPARATOR;
-		}
-
-		// multiplicity = 1 and property value null
-		else {
-			out = property.getName() + EQUAL_SEPARATOR + (umlElement.getValue(stereotype, property.getName())) + PROPERTY_VALUE_SEPARATOR;
-		}
-		return out;
-	}
-
-	/**
-	 * return the string that represents the value of property
-	 * 
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValue(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR) {
-		String out = "";
-		if((property.getLower() != 0) || umlElement.getValue(stereotype, property.getName()) != null) {
-			if(property.isSetDefault() || umlElement.getValue(stereotype, property.getName()) != null) {
-				out = property.getName() + EQUAL_SEPARATOR + umlElement.getValue(stereotype, property.getName()) + PROPERTY_VALUE_SEPARATOR;
-			} else {
-				out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-			}
-		} else {
-			out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-
-		}
-		return out;
-	}
-
-	/**
-	 * Parse the stereotype image and select those that have an "shape" kind (EAnnotation).
-	 * 
-	 * @param stereotype
-	 *        to parse
-	 * 
-	 * @return a EList of {@link Image}
-	 */
-	public static EList<Image> getShapes(Stereotype stereotype) {
-
-		EList<Image> shapes = new BasicEList<Image>();
-
-		Iterator<Image> it = stereotype.getIcons().iterator();
-		while(it.hasNext()) {
-			Image image = it.next();
-			if("shape".equals(ImageUtil.getKind(image))) {
-				shapes.add(image);
-			}
-		}
-
-		return shapes;
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TemplateSignatureUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TemplateSignatureUtil.java
deleted file mode 100644
index ea0f3c73e47..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TemplateSignatureUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

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

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

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

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

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.TemplateSignature</code><BR>

- */

-public class TemplateSignatureUtil {

-

-	public static Set<org.eclipse.uml2.uml.Type> getAccessibleTypes(TemplateSignature signature) {

-		Set<org.eclipse.uml2.uml.Type> list = new HashSet<org.eclipse.uml2.uml.Type>();

-

-		for(Iterator<org.eclipse.uml2.uml.TemplateParameter> i = signature.getParameters().iterator(); i.hasNext();) {

-			TemplateParameter current = i.next();

-			ParameterableElement exposedElement = current.getOwnedParameteredElement();

-			if(exposedElement instanceof org.eclipse.uml2.uml.Type) {

-				list.add((org.eclipse.uml2.uml.Type)exposedElement);

-			}

-		}

-		return list;

-	}

-

-	/**

-	 * Retrieve a type accessible in this Signature, given its name.

-	 * 

-	 * @param name

-	 *        the name of the type to find

-	 * 

-	 * @return the type found or <code>null</code> if not found.

-	 */

-	public static org.eclipse.uml2.uml.Type findTypeByName(TemplateSignature signature, String name) {

-		org.eclipse.uml2.uml.Type type = null;

-		boolean isFound = false;

-		if("".equals(name)) {

-			Activator.getDefault().getLog().log(

-					new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Name parameter should not be an empty string."));

-		} else {

-			Iterator<org.eclipse.uml2.uml.Type> it = TemplateSignatureUtil.getAccessibleTypes(signature).iterator();

-			while(!isFound && it.hasNext()) {

-				org.eclipse.uml2.uml.Type t = it.next();

-				if(t.getName().equals(name)) {

-					isFound = true;

-					type = t;

-				}

-			}

-		}

-

-		return type;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java
deleted file mode 100644
index ff39974f4b3..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

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

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

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

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Type</code><BR>

- */

-public class TypeUtil {

-

-	public final static String UNDEFINED_TYPE_NAME = "<Undefined>";

-

-	/**

-	 * Get a string that displays the name of the type, and then its namespace.

-	 * <p>

-	 * For example: "String - UMLPrimitiveType"

-	 * 

-	 * @return a string that displays information about the type

-	 */

-	public static String getInfoString(Type type) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(type.getName());

-		buffer.append(" - ");

-		String tmp = "";

-		Iterator<Namespace> it = type.allNamespaces().iterator();

-		while(it.hasNext()) {

-			Namespace namespace = it.next();

-			if(it.hasNext()) {

-				tmp = NamedElement.SEPARATOR + namespace.getName() + tmp;

-			} else {

-				tmp = namespace.getName() + tmp;

-			}

-		}

-		buffer.append(tmp);

-		return buffer.toString();

-	}

-

-	/**

-	 * Check if a type is a metaclass.

-	 * 

-	 * @param type

-	 *        to check

-	 * 

-	 * @return true if type is metaclass, else false

-	 */

-	public static boolean isMetaclass(Type type) {

-		boolean isMetaclass = false;

-

-		if((type instanceof org.eclipse.uml2.uml.Class) && (type.getAppliedStereotypes() != null) && (type.getAppliedStereotypes().size() > 0)) {

-

-			Stereotype firstStereotype = type.getAppliedStereotypes().get(0);

-

-			if(firstStereotype.getName().equals("Metaclass")) {

-				isMetaclass = true;

-			}

-		}

-		return isMetaclass;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TypedElementUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TypedElementUtil.java
deleted file mode 100644
index 84f0ea2503a..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/TypedElementUtil.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

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

-package org.eclipse.papyrus.uml.tools.utils;

-

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.TypedElement</code><BR>

- */

-public class TypedElementUtil {

-

-	public static String getTypeAsString(TypedElement element) {

-		return (element.getType() != null) ? element.getType().getName() : "<Undefined>";

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
deleted file mode 100644
index f5198ad671c..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

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

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

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

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

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

-import org.eclipse.papyrus.infra.core.utils.PapyrusEcoreUtils;

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-/**

- * A Helper class for UML

- * 

- * @author Camille Letavernier

- */

-//TODO/FIXME : Check implementations. Most of them are old and don't always match the 

-//specification for some cases.

-public class UMLUtil {

-

-	/**

-	 * Retrieve the UML semantic element from the given Object.

-	 * This method relies on {@link EMFHelper#getEObject(Object)} to resolve

-	 * an EObject from an Object, then checks if the resulting EObject is a

-	 * UML Element.

-	 * 

-	 * @param source

-	 *        The Object to resolve

-	 * @return

-	 *         The UML semantic element, or null if it couldn't be resolved

-	 */

-	public static Element resolveUMLElement(Object source) {

-		EObject eElement = EMFHelper.getEObject(source);

-

-		if(eElement instanceof Element) {

-			return (Element)eElement;

-		}

-

-		return null;

-	}

-

-	/**

-	 * Tests if a class is a subclass of another class. The classes are described

-	 * by their className, in the UML Metamodel.

-	 * 

-	 * @param className

-	 * @param superclassName

-	 * @return

-	 *         True if the class className is a subclass of the class superclassName

-	 */

-	public static boolean isSubClass(String className, String superclassName) {

-		EClass eClass = (EClass)getUMLMetamodel().getEClassifier(className);

-		EClass superClass = (EClass)getUMLMetamodel().getEClassifier(superclassName);

-		return EMFHelper.isSubclass(eClass, superClass);

-	}

-

-	/**

-	 * Retrieve the EditingDomain for the given source object

-	 * 

-	 * @param source

-	 * @return

-	 *         The source object's editing domain, or null if it couldn't be found

-	 */

-	public static EditingDomain resolveEditingDomain(Object source) {

-		return EMFHelper.resolveEditingDomain(resolveUMLElement(source));

-	}

-

-	/**

-	 * @return the UML EPackage

-	 */

-	public static EPackage getUMLMetamodel() {

-		return UMLPackage.eINSTANCE;

-	}

-

-	/**

-	 * Search the given stereotype (By name) on the given UML Element.

-	 * If the search is not strict, the name may be the qualified name of a

-	 * sub-stereotype of an applied stereotype

-	 * 

-	 * @param umlElement

-	 *        The UML Element on which the stereotype is applied

-	 * @param stereotypeName

-	 *        The qualified name of the stereotype

-	 * @param strict

-	 *        If set to true, only a stereotype matching the exact qualified name

-	 *        will be returned. Otherwise, any subtype of the given stereotype may be

-	 *        returned. Note that if more than one stereotype is a substype of the

-	 *        given stereotype, the first matching stereotype is returned.

-	 * @return

-	 *         The first matching stereotype, or null if none was found

-	 */

-	public static Stereotype getAppliedStereotype(Element umlElement, String stereotypeName, boolean strict) {

-		Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeName);

-		if(strict || stereotype != null) {

-			return stereotype;

-		}

-

-		//The parent stereotype is not always applicable...

-		//stereotype = umlElement.getApplicableStereotype(stereotypeName);

-

-		stereotype = findStereotype(umlElement, stereotypeName);

-

-		//stereotype = umlElement.getApplicableStereotype(stereotypeName);

-		if(stereotype == null) {

-			return null;

-		}

-

-		//		System.out.println("Looking for a substereotype of " + stereotype + "\n" + stereotype.eResource().getURI());

-		//		System.out.println("Applied stereotypes : " + umlElement.getAppliedStereotypes());

-		//		System.out.println("Parent stereotypes : ");

-		//		for(Stereotype appliedStereotype : umlElement.getAppliedStereotypes()) {

-		//			for(Classifier parentStereotype : appliedStereotype.allParents()) {

-		//				System.out.println(parentStereotype + "\n" + parentStereotype.eResource().getURI());

-		//			}

-		//		}

-		//		System.out.println();

-		for(Stereotype appliedStereotype : umlElement.getAppliedSubstereotypes(stereotype)) {

-			return appliedStereotype;

-		}

-

-		return null;

-

-		//		for(Stereotype appliedStereotype : umlElement.getAppliedStereotypes()) {

-		//			if(getAllSuperStereotypes(appliedStereotype).contains(stereotype)) {

-		//				return appliedStereotype;

-		//			}

-		//		}

-		//

-		//		return null;

-	}

-

-	/**

-	 * Finds the Stereotype matching the given name.

-	 * The search is done in the context of the given UML Element

-	 * (i.e. the Profiles applied on the Element's nearest package)

-	 * 

-	 * @param umlElement

-	 * @param stereotypeName

-	 * @return

-	 */

-	public static Stereotype findStereotype(Element umlElement, String stereotypeName) {

-		Stereotype stereotype = null;

-		org.eclipse.uml2.uml.Package umlPackage = umlElement.getNearestPackage();

-		if(umlPackage == null) {

-			stereotype = umlElement.getApplicableStereotype(stereotypeName);

-		} else {

-			outerLoop: for(Profile profile : umlPackage.getAllAppliedProfiles()) {

-				for(Stereotype ownedStereotype : profile.getOwnedStereotypes()) {

-					if(ownedStereotype.getQualifiedName().equals(stereotypeName)) {

-						stereotype = ownedStereotype;

-						break outerLoop;

-					}

-				}

-			}

-		}

-		return stereotype;

-	}

-

-	/**

-	 * Returns a collection of all super stereotypes of the given stereotype

-	 * (Including itself)

-	 * 

-	 * @param stereotype

-	 * @return

-	 *         A collection of all super stereotypes

-	 */

-	public static Collection<Stereotype> getAllSuperStereotypes(Stereotype stereotype) {

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

-		if(stereotype != null) {

-			getAllSuperStereotypes(stereotype, result);

-		}

-		return result;

-	}

-

-	private static void getAllSuperStereotypes(Stereotype stereotype, Set<Stereotype> result) {

-		result.add(stereotype);

-		for(Classifier superClassifier : stereotype.getGenerals()) {

-			if(superClassifier instanceof Stereotype && !result.contains(superClassifier)) {

-				getAllSuperStereotypes((Stereotype)superClassifier, result);

-			}

-		}

-	}

-

-	/**

-	 * Retrieves the UML Class associated to the given Message

-	 * 

-	 * @param message

-	 * @return the UML Class associated to the given Message

-	 */

-	public static org.eclipse.uml2.uml.Class getContextClassForMessage(Message message) {

-		MessageOccurrenceSpecification receiveEvent = (MessageOccurrenceSpecification)message.getReceiveEvent();

-

-		if(receiveEvent == null) {

-			return null;

-		}

-

-		return getContextClassForMessageOccurrence(receiveEvent);

-	}

-

-	/**

-	 * Retrieves the UML Class associated to the given MessageOccurrenceSpecification

-	 * 

-	 * @param messageOccurrence

-	 * @return the UML Class associated to the given MessageOccurrenceSpecification

-	 */

-	public static org.eclipse.uml2.uml.Class getContextClassForMessageOccurrence(MessageOccurrenceSpecification messageOccurrence) {

-		List<Lifeline> lifelines = messageOccurrence.getCovereds();

-		if(lifelines.isEmpty()) {

-			return null; //We can't find the context

-		} else if(lifelines.size() == 1) {

-			Lifeline lifeline = lifelines.get(0);

-			ConnectableElement element = lifeline.getRepresents();

-			if(element == null) {

-				return null;

-			}

-			Type type = element.getType();

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

-				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class)type;

-				return clazz;

-			} else {

-				return null; //The type is not a Class

-			}

-		} else {

-			return null; //Too many contexts : which one should we choose ?

-		}

-	}

-

-	/**

-	 * Finds the UML Class associated to the given MessageEvent

-	 * 

-	 * @param event

-	 * @return the Class associated to the given MessageEvent

-	 */

-	public static Class getContextClassForMessageEvent(MessageEvent event) {

-		Collection<EStructuralFeature.Setting> settings = PapyrusEcoreUtils.getUsages(event);

-		if(settings.isEmpty()) {

-			return null;

-		}

-

-		if(settings.size() == 1) {

-			EObject referer = settings.iterator().next().getEObject();

-			if(referer instanceof MessageOccurrenceSpecification) {

-				return UMLUtil.getContextClassForMessageOccurrence((MessageOccurrenceSpecification)referer);

-			} else {

-				return null;

-			}

-		}

-

-		MessageOccurrenceSpecification referer = null;

-		EObject newReferer = null;

-

-		for(EStructuralFeature.Setting setting : settings) {

-			newReferer = setting.getEObject();

-			if(!(newReferer instanceof MessageOccurrenceSpecification)) {

-				continue;

-			}

-

-			if(referer == null || referer == newReferer) {

-				referer = (MessageOccurrenceSpecification)newReferer;

-			} else {

-				referer = null;

-				break;

-			}

-		}

-

-		if(referer == null) {

-			return null;

-		}

-

-		return UMLUtil.getContextClassForMessageOccurrence(referer);

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java b/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java
deleted file mode 100644
index 4f426202b1c..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.tools.utils_css/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

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

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-/**

- * Utility class for {@link ValueSpecification}

- */

-public class ValueSpecificationUtil {

-

-	/** The * KeyWord to represent an unlimited integer (infinite) */

-	private static final String UNLIMITED_KEYWORD = "*";

-

-	private static final String INTERVAL_FORMAT = "%1s..%2s";

-

-	/**

-	 * Get a string representing of a ValueSpecification

-	 * 

-	 * @param specification

-	 */

-	public static String getSpecificationValue(ValueSpecification specification) {

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

-		if(specification != null && specification.eClass() != null) {

-			switch(specification.eClass().getClassifierID()) {

-			case UMLPackage.LITERAL_STRING:

-				value = ((LiteralString)specification).getValue();

-				break;

-			case UMLPackage.LITERAL_BOOLEAN:

-				value = Boolean.toString(((LiteralBoolean)specification).booleanValue());

-				break;

-			case UMLPackage.LITERAL_INTEGER:

-				value = Integer.toString(((LiteralInteger)specification).getValue());

-				break;

-			case UMLPackage.LITERAL_UNLIMITED_NATURAL:

-				value = Integer.toString(((LiteralUnlimitedNatural)specification).getValue());

-				if("-1".equals(value)) { //$NON-NLS-1$

-					value = UNLIMITED_KEYWORD; //$NON-NLS-1$

-				}

-				break;

-			case UMLPackage.LITERAL_NULL:

-				break;

-			case UMLPackage.OPAQUE_EXPRESSION:

-				OpaqueExpression exp = (OpaqueExpression)specification;

-				if(!exp.getLanguages().isEmpty()) {

-					value = OpaqueExpressionUtil.getBodyForLanguage(exp, exp.getLanguages().get(0)); //$NON-NLS-1$					

-				}

-				break;

-			case UMLPackage.INSTANCE_VALUE:

-				value = ((InstanceValue)specification).getInstance().getName();

-				break;

-			case UMLPackage.EXPRESSION:

-				Expression expr = (Expression)specification;

-				if(!expr.getOperands().isEmpty()) {

-					StringBuffer operandsBuff = new StringBuffer(expr.getSymbol());

-					operandsBuff.append("(");

-					int initialLength = operandsBuff.length();

-					for(ValueSpecification operand : expr.getOperands()) {

-						if(operandsBuff.length() > initialLength) {

-							operandsBuff.append(",");

-						}

-						operandsBuff.append(getSpecificationValue(operand));

-					}

-					operandsBuff.append(")");

-					value = operandsBuff.toString();

-				} else {

-					value = expr.getSymbol();

-				}

-				break;

-			case UMLPackage.STRING_EXPRESSION:

-				// TODO

-				break;

-			case UMLPackage.DURATION:

-				Duration durationExpr = (Duration)specification;

-				if(durationExpr.getExpr() != null) {

-					value = getSpecificationValue(durationExpr.getExpr());

-				} else if(durationExpr.getObservations().size() > 0) {

-					value = durationExpr.getObservations().get(0).getName();

-				}

-				break;

-			case UMLPackage.TIME_EXPRESSION:

-				TimeExpression timeExpr = (TimeExpression)specification;

-				if(timeExpr.getExpr() != null) {

-					value = getSpecificationValue(timeExpr.getExpr());

-				} else if(timeExpr.getObservations().size() > 0) {

-					value = timeExpr.getObservations().get(0).getName();

-				}

-				break;

-			case UMLPackage.INTERVAL:

-			case UMLPackage.TIME_INTERVAL:

-			case UMLPackage.DURATION_INTERVAL:

-				Interval interval = (Interval)specification;

-				String min = getSpecificationValue(interval.getMin());

-				String max = getSpecificationValue(interval.getMax());

-				value = String.format(INTERVAL_FORMAT, min, max);

-				break;

-			default:

-			{

-				break;

-			}

-			}

-		}

-		return value;

-	}

-

-

-	/**

-	 * Get a string representing of a Constraint

-	 * 

-	 * @param Constraint

-	 */

-	public static String getConstraintnValue(Constraint specification) {

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

-		if(specification != null) {

-			ValueSpecification spe = specification.getSpecification();

-			if(spe != null) {

-				value = getSpecificationValue(spe);

-			}

-		}

-		return value;

-	}

-

-	/**

-	 * Sets the value of a specification, using a string value

-	 * 

-	 * @param specification

-	 *        the value specification to update

-	 * @param value

-	 *        the value to set

-	 */

-	public static void restoreSpecificationValue(ValueSpecification specification, String value) {

-		if(value == null) {

-			return;

-		}

-

-		switch(specification.eClass().getClassifierID()) {

-		case UMLPackage.LITERAL_STRING:

-			restoreLiteralString((LiteralString)specification, value);

-			break;

-		case UMLPackage.LITERAL_BOOLEAN:

-			restoreLiteralBoolean((LiteralBoolean)specification, value);

-			break;

-		case UMLPackage.LITERAL_INTEGER:

-			restoreLiteralInteger((LiteralInteger)specification, value);

-			break;

-		case UMLPackage.LITERAL_UNLIMITED_NATURAL:

-			restoreLiteralUnlimitedNatural((LiteralUnlimitedNatural)specification, value);

-			break;

-		case UMLPackage.LITERAL_NULL:

-			restoreLiteralNull((LiteralNull)specification, value);

-			break;

-		case UMLPackage.OPAQUE_EXPRESSION:

-			OpaqueExpression exp = (OpaqueExpression)specification;

-			if(!exp.getLanguages().isEmpty()) {

-				restoreOpaqueExpression((org.eclipse.uml2.uml.OpaqueExpression)specification, exp.getLanguages().get(0), value);

-			} else {

-				restoreOpaqueExpression((org.eclipse.uml2.uml.OpaqueExpression)specification, value);

-			}

-			break;

-		default:

-		{

-			break;

-		}

-		}

-	}

-

-	/**

-	 * Sets the value of a literal string, using a string value

-	 * 

-	 * @param specification

-	 *        the literal string to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralString(LiteralString specification, String value) {

-		specification.setValue(value);

-	}

-

-	/**

-	 * Sets the value of a literal, using a string value

-	 * 

-	 * @param specification

-	 *        the literal integer to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralInteger(LiteralInteger specification, String value) {

-		int intValue = 0;

-		try {

-			intValue = Integer.decode(value);

-		} catch (NumberFormatException e) {

-			// Do nothing, this was not a number. 0 will be the default value

-		}

-		specification.setValue(intValue);

-	}

-

-	/**

-	 * Sets the value of a literal boolean, using a string value

-	 * 

-	 * @param specification

-	 *        the literal boolean to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralBoolean(LiteralBoolean specification, String value) {

-		if("true".equals(value) || "1".equals(value)) {

-			specification.setValue(true);

-		} else {

-			specification.setValue(false);

-		}

-	}

-

-	/**

-	 * Sets the value of a literal unlimited natural, using a string value

-	 * 

-	 * @param specification

-	 *        the literal unlimited natural to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralUnlimitedNatural(LiteralUnlimitedNatural specification, String value) {

-		int intValue = 0;

-		try {

-			intValue = Integer.decode(value);

-		} catch (NumberFormatException e) {

-			// Do nothing, this was not a number. 0 will be the default value

-		}

-		// Handle the special unlimited value separately

-		if(UNLIMITED_KEYWORD.equals(value)) {

-			intValue = -1;

-		}

-		specification.setValue(intValue);

-	}

-

-	/**

-	 * Sets the value of a literal null, using a string value

-	 * 

-	 * @param specification

-	 *        the literal null to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralNull(LiteralNull specification, String value) {

-		// nothing to set

-	}

-

-	/**

-	 * Sets the value of an opaque expression, using a string value

-	 * 

-	 * @param specification

-	 *        the opaque expression to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreOpaqueExpression(org.eclipse.uml2.uml.OpaqueExpression specification, String value) {

-		// save in "UML" language, but should be desactivable

-		OpaqueExpressionUtil.setBodyForLanguage(specification, "UML", value);

-	}

-

-	/**

-	 * Sets the value of an opaque expression, using a string value.

-	 * 

-	 * @param specification

-	 *        the opaque expression to update

-	 * @param language

-	 *        the specified language

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreOpaqueExpression(org.eclipse.uml2.uml.OpaqueExpression specification, String language, String value) {

-		OpaqueExpressionUtil.setBodyForLanguage(specification, language, value);

-	}

-

-	/**

-	 * Add to the collection the value specification and all its related value specifications, like min and max of an interval for example.

-	 * 

-	 * @param spec

-	 *        the value specification to add

-	 * @param collection

-	 *        the collection

-	 */

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

-	public static void addEnclosedValueSpecificationToCollection(ValueSpecification spec, Collection collection) {

-		if(!collection.contains(spec)) {

-			collection.add(spec);

-			if(spec instanceof Interval) {

-				addEnclosedValueSpecificationToCollection(((Interval)spec).getMin(), collection);

-				addEnclosedValueSpecificationToCollection(((Interval)spec).getMax(), collection);

-			} else if(spec instanceof Duration) {

-				addEnclosedValueSpecificationToCollection(((Duration)spec).getExpr(), collection);

-			} else if(spec instanceof TimeExpression) {

-				addEnclosedValueSpecificationToCollection(((TimeExpression)spec).getExpr(), collection);

-			} else if(spec instanceof Expression) {

-				for(ValueSpecification vs : ((Expression)spec).getOperands()) {

-					addEnclosedValueSpecificationToCollection(vs, collection);

-				}

-				if(spec instanceof StringExpression) {

-					for(StringExpression se : ((StringExpression)spec).getSubExpressions()) {

-						addEnclosedValueSpecificationToCollection(se, collection);

-					}

-				}

-			}

-		}

-	}

-

-}