Sandbox commit

Initial import

139 files changed, 18902 insertions, 0 deletions

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

+<classpath>

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

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

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

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

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

+</classpath>

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.project b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.project
new file mode 100644
index 00000000000..e3f4eeb3d60
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.project
@@ -0,0 +1,28 @@
+<?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
new file mode 100644
index 00000000000..7d214c865a3
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#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
new file mode 100644
index 00000000000..d97a24d4df4
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+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"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/build.properties b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/build.properties
new file mode 100644
index 00000000000..41eb6ade2b4
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/build.properties
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000000..b6f5cf8cd0b
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/plugin.xml
@@ -0,0 +1,12 @@
+<?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>

+

+</plugin>

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
new file mode 100644
index 00000000000..867d75fb9ff
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSArrowStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public ArrowType getCSSArrowSource(){
+		return arrowStyle.getCSSArrowSource();
+	}
+
+	public ArrowType getCSSArrowTarget(){
+		return arrowStyle.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
new file mode 100644
index 00000000000..76fc65ba405
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicCompartment.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSCollapsed(){
+		return drawerStyle.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/GMFCSSBasicSemanticCompartment.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicSemanticCompartment.java
new file mode 100644
index 00000000000..9ebab1fe634
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBasicSemanticCompartment.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSCollapsed(){
+		return drawerStyle.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
new file mode 100644
index 00000000000..616ddc6015d
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanListValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return booleanListValueStyle.getCSSName();
+	}
+
+	public EList getCSSBooleanListValue(){
+		return booleanListValueStyle.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
new file mode 100644
index 00000000000..fced2205785
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSBooleanValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return booleanValueStyle.getCSSName();
+	}
+
+	public boolean isCSSBooleanValue(){
+		return booleanValueStyle.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/GMFCSSByteArrayValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSByteArrayValueStyle.java
new file mode 100644
index 00000000000..688f640d860
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSByteArrayValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return byteArrayValueStyle.getCSSName();
+	}
+
+	public byte[] getCSSByteArrayValue(){
+		return byteArrayValueStyle.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
new file mode 100644
index 00000000000..57cc1c10877
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCanonicalStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSCanonical(){
+		return canonicalStyle.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
new file mode 100644
index 00000000000..9e48f6d7a0a
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSCompartment.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSCollapsed(){
+		return drawerStyle.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
new file mode 100644
index 00000000000..0e83497ce88
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnector.java
@@ -0,0 +1,376 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSRoundedBendpointsRadius(){
+		return connectorStyle.getCSSRoundedBendpointsRadius();
+	}
+
+	public Routing getCSSRouting(){
+		return connectorStyle.getCSSRouting();
+	}
+
+	public Smoothness getCSSSmoothness(){
+		return connectorStyle.getCSSSmoothness();
+	}
+
+	public boolean isCSSAvoidObstructions(){
+		return connectorStyle.isCSSAvoidObstructions();
+	}
+
+	public boolean isCSSClosestDistance(){
+		return connectorStyle.isCSSClosestDistance();
+	}
+
+	public JumpLinkStatus getCSSJumpLinkStatus(){
+		return connectorStyle.getCSSJumpLinkStatus();
+	}
+
+	public JumpLinkType getCSSJumpLinkType(){
+		return connectorStyle.getCSSJumpLinkType();
+	}
+
+	public boolean isCSSJumpLinksReverse(){
+		return connectorStyle.isCSSJumpLinksReverse();
+	}
+
+	public int getCSSLineColor(){
+		return connectorStyle.getCSSLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return connectorStyle.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
new file mode 100644
index 00000000000..ad1fc35cd9e
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSConnectorStyle.java
@@ -0,0 +1,376 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSRoundedBendpointsRadius(){
+		return connectorStyle.getCSSRoundedBendpointsRadius();
+	}
+
+	public Routing getCSSRouting(){
+		return connectorStyle.getCSSRouting();
+	}
+
+	public Smoothness getCSSSmoothness(){
+		return connectorStyle.getCSSSmoothness();
+	}
+
+	public boolean isCSSAvoidObstructions(){
+		return connectorStyle.isCSSAvoidObstructions();
+	}
+
+	public boolean isCSSClosestDistance(){
+		return connectorStyle.isCSSClosestDistance();
+	}
+
+	public JumpLinkStatus getCSSJumpLinkStatus(){
+		return connectorStyle.getCSSJumpLinkStatus();
+	}
+
+	public JumpLinkType getCSSJumpLinkType(){
+		return connectorStyle.getCSSJumpLinkType();
+	}
+
+	public boolean isCSSJumpLinksReverse(){
+		return connectorStyle.isCSSJumpLinksReverse();
+	}
+
+	public int getCSSLineColor(){
+		return connectorStyle.getCSSLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return connectorStyle.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
new file mode 100644
index 00000000000..78ec1b5879d
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDataTypeStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return dataTypeStyle.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/GMFCSSDescriptionStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDescriptionStyle.java
new file mode 100644
index 00000000000..0218ec5b2a9
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDescriptionStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSDescription(){
+		return descriptionStyle.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/GMFCSSDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramLinkStyle.java
new file mode 100644
index 00000000000..414fc968ef7
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramLinkStyle.java
@@ -0,0 +1,337 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	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
new file mode 100644
index 00000000000..0a2af4f994a
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDiagramStyle.java
@@ -0,0 +1,356 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSPageX(){
+		return diagramStyle.getCSSPageX();
+	}
+
+	public int getCSSPageY(){
+		return diagramStyle.getCSSPageY();
+	}
+
+	public int getCSSPageWidth(){
+		return diagramStyle.getCSSPageWidth();
+	}
+
+	public int getCSSPageHeight(){
+		return diagramStyle.getCSSPageHeight();
+	}
+
+	public java.lang.String getCSSDescription(){
+		return diagramStyle.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
new file mode 100644
index 00000000000..3ac09a90bb4
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleListValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return doubleListValueStyle.getCSSName();
+	}
+
+	public EList getCSSDoubleListValue(){
+		return doubleListValueStyle.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
new file mode 100644
index 00000000000..9d982d989e1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDoubleValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return doubleValueStyle.getCSSName();
+	}
+
+	public double getCSSDoubleValue(){
+		return doubleValueStyle.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
new file mode 100644
index 00000000000..03e8cdab769
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSDrawerStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSCollapsed(){
+		return drawerStyle.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
new file mode 100644
index 00000000000..30e95784a32
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectListValueStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return eObjectListValueStyle.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
new file mode 100644
index 00000000000..5a7a1266fe6
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSEObjectValueStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return eObjectValueStyle.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/GMFCSSFillStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFillStyle.java
new file mode 100644
index 00000000000..d2a6f88dba7
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFillStyle.java
@@ -0,0 +1,348 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSFillColor(){
+		return fillStyle.getCSSFillColor();
+	}
+
+	public int getCSSTransparency(){
+		return fillStyle.getCSSTransparency();
+	}
+
+	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
+		return fillStyle.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
new file mode 100644
index 00000000000..f836cca5e2a
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFilteringStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public Filtering getCSSFiltering(){
+		return filteringStyle.getCSSFiltering();
+	}
+
+	public java.util.List getCSSFilteringKeys(){
+		return filteringStyle.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
new file mode 100644
index 00000000000..9e302169d1b
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSFontStyle.java
@@ -0,0 +1,364 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSFontColor(){
+		return fontStyle.getCSSFontColor();
+	}
+
+	public java.lang.String getCSSFontName(){
+		return fontStyle.getCSSFontName();
+	}
+
+	public int getCSSFontHeight(){
+		return fontStyle.getCSSFontHeight();
+	}
+
+	public boolean isCSSBold(){
+		return fontStyle.isCSSBold();
+	}
+
+	public boolean isCSSItalic(){
+		return fontStyle.isCSSItalic();
+	}
+
+	public boolean isCSSUnderline(){
+		return fontStyle.isCSSUnderline();
+	}
+
+	public boolean isCSSStrikeThrough(){
+		return fontStyle.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/GMFCSSGuideStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuideStyle.java
new file mode 100644
index 00000000000..42104f3de9c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSGuideStyle.java
@@ -0,0 +1,337 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	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
new file mode 100644
index 00000000000..0997eaadc47
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSHintedDiagramLinkStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSHint(){
+		return hintedDiagramLinkStyle.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/GMFCSSImageBufferStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageBufferStyle.java
new file mode 100644
index 00000000000..8dedf70f90a
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageBufferStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.Boolean getCSSAntiAlias(){
+		return imageBufferStyle.getCSSAntiAlias();
+	}
+
+	public java.lang.Boolean getCSSMaintainAspectRatio(){
+		return imageBufferStyle.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
new file mode 100644
index 00000000000..11f8b7b2e85
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSImageStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.Boolean getCSSAntiAlias(){
+		return imageStyle.getCSSAntiAlias();
+	}
+
+	public java.lang.Boolean getCSSMaintainAspectRatio(){
+		return imageStyle.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
new file mode 100644
index 00000000000..e4cf664b938
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntListValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return intListValueStyle.getCSSName();
+	}
+
+	public EList getCSSIntListValue(){
+		return intListValueStyle.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
new file mode 100644
index 00000000000..10cb4379973
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSIntValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return intValueStyle.getCSSName();
+	}
+
+	public int getCSSIntValue(){
+		return intValueStyle.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
new file mode 100644
index 00000000000..b39e840de91
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineStyle.java
@@ -0,0 +1,344 @@
+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.LineStyleImpl;
+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.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.adapter.GMFCSSAdapter;
+
+
+public class GMFCSSLineStyle extends LineStyleImpl implements CSSStylableElement, CSSLineStyle {
+
+	protected CSSEngine engine;
+
+	private CSSStylableElement cssAdapter;
+
+	private CSSLineStyle lineStyle;
+	
+	public GMFCSSLineStyle(CSSEngine engine) {
+		this.engine = engine;
+		this.cssAdapter = new GMFCSSAdapter(this, engine);
+		this.lineStyle = new CSSLineStyleImpl(this);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSLineColor(){
+		return lineStyle.getCSSLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return lineStyle.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
new file mode 100644
index 00000000000..9fff53ab760
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSLineTypeStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public LineType getCSSLineType(){
+		return lineTypeStyle.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
new file mode 100644
index 00000000000..148b1aa6014
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListCompartment.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSCollapsed(){
+		return drawerStyle.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
new file mode 100644
index 00000000000..91a78523ce9
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSListValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return listValueStyle.getCSSName();
+	}
+
+	public EList getCSSRawValuesList(){
+		return listValueStyle.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/GMFCSSMultiDiagramLinkStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSMultiDiagramLinkStyle.java
new file mode 100644
index 00000000000..12af407b49d
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSMultiDiagramLinkStyle.java
@@ -0,0 +1,337 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	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
new file mode 100644
index 00000000000..580a4c9d749
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSNamedStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return namedStyle.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/GMFCSSPageStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPageStyle.java
new file mode 100644
index 00000000000..c56cff9c4b0
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPageStyle.java
@@ -0,0 +1,352 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSPageX(){
+		return pageStyle.getCSSPageX();
+	}
+
+	public int getCSSPageY(){
+		return pageStyle.getCSSPageY();
+	}
+
+	public int getCSSPageWidth(){
+		return pageStyle.getCSSPageWidth();
+	}
+
+	public int getCSSPageHeight(){
+		return pageStyle.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
new file mode 100644
index 00000000000..8600065a983
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSPropertiesSetStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return propertiesSetStyle.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/GMFCSSRoundedCornersStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoundedCornersStyle.java
new file mode 100644
index 00000000000..3be7d52de07
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoundedCornersStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSRoundedBendpointsRadius(){
+		return roundedCornersStyle.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
new file mode 100644
index 00000000000..61824125eee
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSRoutingStyle.java
@@ -0,0 +1,368 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSRoundedBendpointsRadius(){
+		return routingStyle.getCSSRoundedBendpointsRadius();
+	}
+
+	public Routing getCSSRouting(){
+		return routingStyle.getCSSRouting();
+	}
+
+	public Smoothness getCSSSmoothness(){
+		return routingStyle.getCSSSmoothness();
+	}
+
+	public boolean isCSSAvoidObstructions(){
+		return routingStyle.isCSSAvoidObstructions();
+	}
+
+	public boolean isCSSClosestDistance(){
+		return routingStyle.isCSSClosestDistance();
+	}
+
+	public JumpLinkStatus getCSSJumpLinkStatus(){
+		return routingStyle.getCSSJumpLinkStatus();
+	}
+
+	public JumpLinkType getCSSJumpLinkType(){
+		return routingStyle.getCSSJumpLinkType();
+	}
+
+	public boolean isCSSJumpLinksReverse(){
+		return routingStyle.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
new file mode 100644
index 00000000000..6cc99963283
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSemanticListCompartment.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSCollapsed(){
+		return drawerStyle.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
new file mode 100644
index 00000000000..41e97636087
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShape.java
@@ -0,0 +1,392 @@
+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.ShapeImpl;
+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.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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSFontColor(){
+		return shapeStyle.getCSSFontColor();
+	}
+
+	public java.lang.String getCSSFontName(){
+		return shapeStyle.getCSSFontName();
+	}
+
+	public int getCSSFontHeight(){
+		return shapeStyle.getCSSFontHeight();
+	}
+
+	public boolean isCSSBold(){
+		return shapeStyle.isCSSBold();
+	}
+
+	public boolean isCSSItalic(){
+		return shapeStyle.isCSSItalic();
+	}
+
+	public boolean isCSSUnderline(){
+		return shapeStyle.isCSSUnderline();
+	}
+
+	public boolean isCSSStrikeThrough(){
+		return shapeStyle.isCSSStrikeThrough();
+	}
+
+	public java.lang.String getCSSDescription(){
+		return shapeStyle.getCSSDescription();
+	}
+
+	public int getCSSFillColor(){
+		return shapeStyle.getCSSFillColor();
+	}
+
+	public int getCSSTransparency(){
+		return shapeStyle.getCSSTransparency();
+	}
+
+	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
+		return shapeStyle.getCSSGradient();
+	}
+
+	public int getCSSLineColor(){
+		return shapeStyle.getCSSLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return shapeStyle.getCSSLineWidth();
+	}
+
+	public int getCSSRoundedBendpointsRadius(){
+		return shapeStyle.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/GMFCSSShapeStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShapeStyle.java
new file mode 100644
index 00000000000..69bbf466127
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSShapeStyle.java
@@ -0,0 +1,392 @@
+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.ShapeStyleImpl;
+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.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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSFontColor(){
+		return shapeStyle.getCSSFontColor();
+	}
+
+	public java.lang.String getCSSFontName(){
+		return shapeStyle.getCSSFontName();
+	}
+
+	public int getCSSFontHeight(){
+		return shapeStyle.getCSSFontHeight();
+	}
+
+	public boolean isCSSBold(){
+		return shapeStyle.isCSSBold();
+	}
+
+	public boolean isCSSItalic(){
+		return shapeStyle.isCSSItalic();
+	}
+
+	public boolean isCSSUnderline(){
+		return shapeStyle.isCSSUnderline();
+	}
+
+	public boolean isCSSStrikeThrough(){
+		return shapeStyle.isCSSStrikeThrough();
+	}
+
+	public java.lang.String getCSSDescription(){
+		return shapeStyle.getCSSDescription();
+	}
+
+	public int getCSSFillColor(){
+		return shapeStyle.getCSSFillColor();
+	}
+
+	public int getCSSTransparency(){
+		return shapeStyle.getCSSTransparency();
+	}
+
+	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
+		return shapeStyle.getCSSGradient();
+	}
+
+	public int getCSSLineColor(){
+		return shapeStyle.getCSSLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return shapeStyle.getCSSLineWidth();
+	}
+
+	public int getCSSRoundedBendpointsRadius(){
+		return shapeStyle.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
new file mode 100644
index 00000000000..b6cf9d24164
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSingleValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return singleValueStyle.getCSSName();
+	}
+
+	public java.lang.String getCSSRawValue(){
+		return singleValueStyle.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/GMFCSSSortingStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSortingStyle.java
new file mode 100644
index 00000000000..4a908edcd50
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSSortingStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public Sorting getCSSSorting(){
+		return sortingStyle.getCSSSorting();
+	}
+
+	public java.util.Map getCSSSortingKeys(){
+		return sortingStyle.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
new file mode 100644
index 00000000000..fee22d3b7ff
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStandardDiagram.java
@@ -0,0 +1,356 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public int getCSSPageX(){
+		return diagramStyle.getCSSPageX();
+	}
+
+	public int getCSSPageY(){
+		return diagramStyle.getCSSPageY();
+	}
+
+	public int getCSSPageWidth(){
+		return diagramStyle.getCSSPageWidth();
+	}
+
+	public int getCSSPageHeight(){
+		return diagramStyle.getCSSPageHeight();
+	}
+
+	public java.lang.String getCSSDescription(){
+		return diagramStyle.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
new file mode 100644
index 00000000000..5821bcfc693
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringListValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return stringListValueStyle.getCSSName();
+	}
+
+	public EList getCSSStringListValue(){
+		return stringListValueStyle.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/GMFCSSStringValueStyle.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringValueStyle.java
new file mode 100644
index 00000000000..5e82445dfb5
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSStringValueStyle.java
@@ -0,0 +1,344 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return stringValueStyle.getCSSName();
+	}
+
+	public java.lang.String getCSSStringValue(){
+		return stringValueStyle.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
new file mode 100644
index 00000000000..d5740d1bbf4
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTextStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public TextAlignment getCSSTextAlignment(){
+		return textStyle.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
new file mode 100644
index 00000000000..4807c20b76a
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/GMFCSSTitleStyle.java
@@ -0,0 +1,340 @@
+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.adapter.GMFCSSAdapter;
+
+
+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);
+	}
+
+	//////////////////////////////////////////
+	//	Forwards accesses to CSS properties	//
+	//////////////////////////////////////////
+
+	public boolean isCSSShowTitle(){
+		return titleStyle.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/factory/GMFCSSFactory.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/factory/GMFCSSFactory.java
new file mode 100644
index 00000000000..4b2b7fe4e45
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/factory/GMFCSSFactory.java
@@ -0,0 +1,351 @@
+package org.eclipse.papyrus.prototype.infra.gmfdiag.css.factory;
+
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.gmf.runtime.notation.impl.NotationFactoryImpl;
+import org.eclipse.gmf.runtime.notation.*;
+import org.eclipse.papyrus.prototype.infra.gmfdiag.css.*;
+import org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine.GMFCSSEngineImpl;
+
+public class GMFCSSFactory extends NotationFactoryImpl {
+	
+	
+		@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 RoutingStyle createRoutingStyle() {
+			RoutingStyle routingStyle = new GMFCSSRoutingStyle(getCSSEngine());
+			return routingStyle;
+		}
+	
+	
+		@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 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 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 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 CSSEngine getCSSEngine(){
+		return new GMFCSSEngineImpl();
+	}
+}
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
new file mode 100644
index 00000000000..8f6f7d8c2a7
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSArrowStyle.java
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..3e4da1c997c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanListValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..9c7ec448adf
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSBooleanValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..b9b65c0ea38
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSByteArrayValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..0882705b2b5
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSCanonicalStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..eecb46dcbfa
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSConnectorStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..912ecdd47b1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDataTypeStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..3e6b37f9061
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDescriptionStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..960cea39253
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramLinkStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..cbc862a4fc1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDiagramStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..37be00f4d99
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleListValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..613cf5d6983
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDoubleValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..e364ae192cf
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSDrawerStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..31c4c01d719
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectListValueStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..f66b01f03a8
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSEObjectValueStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..b47ae1dc0e6
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFillStyle.java
@@ -0,0 +1,16 @@
+package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
+
+import org.eclipse.gmf.runtime.notation.*;
+import org.eclipse.emf.common.util.EList;
+
+public interface CSSFillStyle {
+	
+	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
new file mode 100644
index 00000000000..88e8738a2c1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFilteringStyle.java
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..08bbaa8a423
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSFontStyle.java
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000000..cfd21b76439
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSGuideStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..ece8ad3d4dd
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSHintedDiagramLinkStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..3701171bf49
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageBufferStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..d7824b68a2e
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSImageStyle.java
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..882c91fb175
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntListValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..6cdb6874120
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSIntValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..a218cb836c1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineStyle.java
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..4d4bbe9422b
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSLineTypeStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..b51d3a921a6
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSListValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..75923de9bcd
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSMultiDiagramLinkStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..39fa31f36d5
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSNamedStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..9c7ae92c3a2
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPageStyle.java
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 00000000000..30e6a1284fe
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSPropertiesSetStyle.java
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..8a87bb01547
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoundedCornersStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..4dc6c45ac08
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSRoutingStyle.java
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000000..a468fd44975
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSShapeStyle.java
@@ -0,0 +1,9 @@
+package org.eclipse.papyrus.prototype.infra.gmfdiag.css.style;
+
+import org.eclipse.gmf.runtime.notation.*;
+import org.eclipse.emf.common.util.EList;
+
+public interface CSSShapeStyle extends CSSFontStyle, CSSDescriptionStyle, CSSFillStyle, CSSLineStyle, CSSRoundedCornersStyle{
+	
+
+}
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
new file mode 100644
index 00000000000..2a2bdf78dc3
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSingleValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..58a8a4b2307
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSSortingStyle.java
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..6277f08b6cf
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringListValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..c28002d19ec
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSStringValueStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..a5ca2f2846e
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTextStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..2e3286bcb47
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/CSSTitleStyle.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..d6d68fc3add
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSArrowStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSArrowStyleImpl implements CSSArrowStyle{
+	
+	private ArrowStyle arrowStyle;
+
+	public CSSArrowStyleImpl(ArrowStyle arrowStyle){
+		this.arrowStyle = arrowStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public ArrowType getCSSArrowSource(){
+		return arrowStyle.getArrowSource();
+	}
+
+	public ArrowType getCSSArrowTarget(){
+		return arrowStyle.getArrowTarget();
+	}
+}
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
new file mode 100644
index 00000000000..f3c65f7e4e5
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanListValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSBooleanListValueStyleImpl implements CSSBooleanListValueStyle{
+	
+	private BooleanListValueStyle booleanListValueStyle;
+
+	public CSSBooleanListValueStyleImpl(BooleanListValueStyle booleanListValueStyle){
+		this.booleanListValueStyle = booleanListValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return booleanListValueStyle.getName();
+	}
+
+	public EList getCSSBooleanListValue(){
+		return booleanListValueStyle.getBooleanListValue();
+	}
+}
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
new file mode 100644
index 00000000000..a5c862fd8cc
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSBooleanValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSBooleanValueStyleImpl implements CSSBooleanValueStyle{
+	
+	private BooleanValueStyle booleanValueStyle;
+
+	public CSSBooleanValueStyleImpl(BooleanValueStyle booleanValueStyle){
+		this.booleanValueStyle = booleanValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return booleanValueStyle.getName();
+	}
+
+	public boolean isCSSBooleanValue(){
+		return booleanValueStyle.isBooleanValue();
+	}
+}
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
new file mode 100644
index 00000000000..35e4b626095
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSByteArrayValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSByteArrayValueStyleImpl implements CSSByteArrayValueStyle{
+	
+	private ByteArrayValueStyle byteArrayValueStyle;
+
+	public CSSByteArrayValueStyleImpl(ByteArrayValueStyle byteArrayValueStyle){
+		this.byteArrayValueStyle = byteArrayValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return byteArrayValueStyle.getName();
+	}
+
+	public byte[] getCSSByteArrayValue(){
+		return byteArrayValueStyle.getByteArrayValue();
+	}
+}
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
new file mode 100644
index 00000000000..9268d16fa15
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSCanonicalStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSCanonicalStyleImpl implements CSSCanonicalStyle{
+	
+	private CanonicalStyle canonicalStyle;
+
+	public CSSCanonicalStyleImpl(CanonicalStyle canonicalStyle){
+		this.canonicalStyle = canonicalStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public boolean isCSSCanonical(){
+		return canonicalStyle.isCanonical();
+	}
+}
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
new file mode 100644
index 00000000000..5ec566da388
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSConnectorStyleImpl.java
@@ -0,0 +1,58 @@
+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;
+
+public class CSSConnectorStyleImpl implements CSSConnectorStyle{
+	
+	private ConnectorStyle connectorStyle;
+
+	public CSSConnectorStyleImpl(ConnectorStyle connectorStyle){
+		this.connectorStyle = connectorStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSRoundedBendpointsRadius(){
+		return connectorStyle.getRoundedBendpointsRadius();
+	}
+
+	public Routing getCSSRouting(){
+		return connectorStyle.getRouting();
+	}
+
+	public Smoothness getCSSSmoothness(){
+		return connectorStyle.getSmoothness();
+	}
+
+	public boolean isCSSAvoidObstructions(){
+		return connectorStyle.isAvoidObstructions();
+	}
+
+	public boolean isCSSClosestDistance(){
+		return connectorStyle.isClosestDistance();
+	}
+
+	public JumpLinkStatus getCSSJumpLinkStatus(){
+		return connectorStyle.getJumpLinkStatus();
+	}
+
+	public JumpLinkType getCSSJumpLinkType(){
+		return connectorStyle.getJumpLinkType();
+	}
+
+	public boolean isCSSJumpLinksReverse(){
+		return connectorStyle.isJumpLinksReverse();
+	}
+
+	public int getCSSLineColor(){
+		return connectorStyle.getLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return connectorStyle.getLineWidth();
+	}
+}
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
new file mode 100644
index 00000000000..b9bebd65d46
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDataTypeStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSDataTypeStyleImpl implements CSSDataTypeStyle{
+	
+	private DataTypeStyle dataTypeStyle;
+
+	public CSSDataTypeStyleImpl(DataTypeStyle dataTypeStyle){
+		this.dataTypeStyle = dataTypeStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return dataTypeStyle.getName();
+	}
+}
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
new file mode 100644
index 00000000000..fe5b344f3d7
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDescriptionStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSDescriptionStyleImpl implements CSSDescriptionStyle{
+	
+	private DescriptionStyle descriptionStyle;
+
+	public CSSDescriptionStyleImpl(DescriptionStyle descriptionStyle){
+		this.descriptionStyle = descriptionStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSDescription(){
+		return descriptionStyle.getDescription();
+	}
+}
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
new file mode 100644
index 00000000000..441fc4b0aff
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramLinkStyleImpl.java
@@ -0,0 +1,19 @@
+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;
+
+public class CSSDiagramLinkStyleImpl implements CSSDiagramLinkStyle{
+	
+	private DiagramLinkStyle diagramLinkStyle;
+
+	public CSSDiagramLinkStyleImpl(DiagramLinkStyle diagramLinkStyle){
+		this.diagramLinkStyle = diagramLinkStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	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
new file mode 100644
index 00000000000..70a6f446da7
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDiagramStyleImpl.java
@@ -0,0 +1,38 @@
+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;
+
+public class CSSDiagramStyleImpl implements CSSDiagramStyle{
+	
+	private DiagramStyle diagramStyle;
+
+	public CSSDiagramStyleImpl(DiagramStyle diagramStyle){
+		this.diagramStyle = diagramStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSPageX(){
+		return diagramStyle.getPageX();
+	}
+
+	public int getCSSPageY(){
+		return diagramStyle.getPageY();
+	}
+
+	public int getCSSPageWidth(){
+		return diagramStyle.getPageWidth();
+	}
+
+	public int getCSSPageHeight(){
+		return diagramStyle.getPageHeight();
+	}
+
+	public java.lang.String getCSSDescription(){
+		return diagramStyle.getDescription();
+	}
+}
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
new file mode 100644
index 00000000000..b16badb67de
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleListValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSDoubleListValueStyleImpl implements CSSDoubleListValueStyle{
+	
+	private DoubleListValueStyle doubleListValueStyle;
+
+	public CSSDoubleListValueStyleImpl(DoubleListValueStyle doubleListValueStyle){
+		this.doubleListValueStyle = doubleListValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return doubleListValueStyle.getName();
+	}
+
+	public EList getCSSDoubleListValue(){
+		return doubleListValueStyle.getDoubleListValue();
+	}
+}
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
new file mode 100644
index 00000000000..1cee02fc08c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDoubleValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSDoubleValueStyleImpl implements CSSDoubleValueStyle{
+	
+	private DoubleValueStyle doubleValueStyle;
+
+	public CSSDoubleValueStyleImpl(DoubleValueStyle doubleValueStyle){
+		this.doubleValueStyle = doubleValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return doubleValueStyle.getName();
+	}
+
+	public double getCSSDoubleValue(){
+		return doubleValueStyle.getDoubleValue();
+	}
+}
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
new file mode 100644
index 00000000000..fd2cbff5b41
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSDrawerStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSDrawerStyleImpl implements CSSDrawerStyle{
+	
+	private DrawerStyle drawerStyle;
+
+	public CSSDrawerStyleImpl(DrawerStyle drawerStyle){
+		this.drawerStyle = drawerStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public boolean isCSSCollapsed(){
+		return drawerStyle.isCollapsed();
+	}
+}
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
new file mode 100644
index 00000000000..50efe05a948
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectListValueStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSEObjectListValueStyleImpl implements CSSEObjectListValueStyle{
+	
+	private EObjectListValueStyle eObjectListValueStyle;
+
+	public CSSEObjectListValueStyleImpl(EObjectListValueStyle eObjectListValueStyle){
+		this.eObjectListValueStyle = eObjectListValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return eObjectListValueStyle.getName();
+	}
+}
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
new file mode 100644
index 00000000000..55a2faf6c2d
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSEObjectValueStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSEObjectValueStyleImpl implements CSSEObjectValueStyle{
+	
+	private EObjectValueStyle eObjectValueStyle;
+
+	public CSSEObjectValueStyleImpl(EObjectValueStyle eObjectValueStyle){
+		this.eObjectValueStyle = eObjectValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return eObjectValueStyle.getName();
+	}
+}
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
new file mode 100644
index 00000000000..429db183bb3
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFillStyleImpl.java
@@ -0,0 +1,30 @@
+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;
+
+public class CSSFillStyleImpl implements CSSFillStyle{
+	
+	private FillStyle fillStyle;
+
+	public CSSFillStyleImpl(FillStyle fillStyle){
+		this.fillStyle = fillStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSFillColor(){
+		return fillStyle.getFillColor();
+	}
+
+	public int getCSSTransparency(){
+		return fillStyle.getTransparency();
+	}
+
+	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
+		return fillStyle.getGradient();
+	}
+}
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
new file mode 100644
index 00000000000..5049b237486
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFilteringStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSFilteringStyleImpl implements CSSFilteringStyle{
+	
+	private FilteringStyle filteringStyle;
+
+	public CSSFilteringStyleImpl(FilteringStyle filteringStyle){
+		this.filteringStyle = filteringStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public Filtering getCSSFiltering(){
+		return filteringStyle.getFiltering();
+	}
+
+	public java.util.List getCSSFilteringKeys(){
+		return filteringStyle.getFilteringKeys();
+	}
+}
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
new file mode 100644
index 00000000000..55836eea7ab
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSFontStyleImpl.java
@@ -0,0 +1,46 @@
+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;
+
+public class CSSFontStyleImpl implements CSSFontStyle{
+	
+	private FontStyle fontStyle;
+
+	public CSSFontStyleImpl(FontStyle fontStyle){
+		this.fontStyle = fontStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSFontColor(){
+		return fontStyle.getFontColor();
+	}
+
+	public java.lang.String getCSSFontName(){
+		return fontStyle.getFontName();
+	}
+
+	public int getCSSFontHeight(){
+		return fontStyle.getFontHeight();
+	}
+
+	public boolean isCSSBold(){
+		return fontStyle.isBold();
+	}
+
+	public boolean isCSSItalic(){
+		return fontStyle.isItalic();
+	}
+
+	public boolean isCSSUnderline(){
+		return fontStyle.isUnderline();
+	}
+
+	public boolean isCSSStrikeThrough(){
+		return fontStyle.isStrikeThrough();
+	}
+}
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
new file mode 100644
index 00000000000..0f2760c5913
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSGuideStyleImpl.java
@@ -0,0 +1,19 @@
+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;
+
+public class CSSGuideStyleImpl implements CSSGuideStyle{
+	
+	private GuideStyle guideStyle;
+
+	public CSSGuideStyleImpl(GuideStyle guideStyle){
+		this.guideStyle = guideStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	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
new file mode 100644
index 00000000000..879a4df8d38
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSHintedDiagramLinkStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSHintedDiagramLinkStyleImpl implements CSSHintedDiagramLinkStyle{
+	
+	private HintedDiagramLinkStyle hintedDiagramLinkStyle;
+
+	public CSSHintedDiagramLinkStyleImpl(HintedDiagramLinkStyle hintedDiagramLinkStyle){
+		this.hintedDiagramLinkStyle = hintedDiagramLinkStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSHint(){
+		return hintedDiagramLinkStyle.getHint();
+	}
+}
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
new file mode 100644
index 00000000000..a310d1bf58e
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageBufferStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSImageBufferStyleImpl implements CSSImageBufferStyle{
+	
+	private ImageBufferStyle imageBufferStyle;
+
+	public CSSImageBufferStyleImpl(ImageBufferStyle imageBufferStyle){
+		this.imageBufferStyle = imageBufferStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.Boolean getCSSAntiAlias(){
+		return imageBufferStyle.getAntiAlias();
+	}
+
+	public java.lang.Boolean getCSSMaintainAspectRatio(){
+		return imageBufferStyle.getMaintainAspectRatio();
+	}
+}
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
new file mode 100644
index 00000000000..0d752cd32a1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSImageStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSImageStyleImpl implements CSSImageStyle{
+	
+	private ImageStyle imageStyle;
+
+	public CSSImageStyleImpl(ImageStyle imageStyle){
+		this.imageStyle = imageStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.Boolean getCSSAntiAlias(){
+		return imageStyle.getAntiAlias();
+	}
+
+	public java.lang.Boolean getCSSMaintainAspectRatio(){
+		return imageStyle.getMaintainAspectRatio();
+	}
+}
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
new file mode 100644
index 00000000000..ca198fd327c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntListValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSIntListValueStyleImpl implements CSSIntListValueStyle{
+	
+	private IntListValueStyle intListValueStyle;
+
+	public CSSIntListValueStyleImpl(IntListValueStyle intListValueStyle){
+		this.intListValueStyle = intListValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return intListValueStyle.getName();
+	}
+
+	public EList getCSSIntListValue(){
+		return intListValueStyle.getIntListValue();
+	}
+}
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
new file mode 100644
index 00000000000..01a2d2174f5
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSIntValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSIntValueStyleImpl implements CSSIntValueStyle{
+	
+	private IntValueStyle intValueStyle;
+
+	public CSSIntValueStyleImpl(IntValueStyle intValueStyle){
+		this.intValueStyle = intValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return intValueStyle.getName();
+	}
+
+	public int getCSSIntValue(){
+		return intValueStyle.getIntValue();
+	}
+}
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
new file mode 100644
index 00000000000..537206d84a5
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSLineStyleImpl implements CSSLineStyle{
+	
+	private LineStyle lineStyle;
+
+	public CSSLineStyleImpl(LineStyle lineStyle){
+		this.lineStyle = lineStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSLineColor(){
+		return lineStyle.getLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return lineStyle.getLineWidth();
+	}
+}
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
new file mode 100644
index 00000000000..0739616eeb8
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSLineTypeStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSLineTypeStyleImpl implements CSSLineTypeStyle{
+	
+	private LineTypeStyle lineTypeStyle;
+
+	public CSSLineTypeStyleImpl(LineTypeStyle lineTypeStyle){
+		this.lineTypeStyle = lineTypeStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public LineType getCSSLineType(){
+		return lineTypeStyle.getLineType();
+	}
+}
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
new file mode 100644
index 00000000000..23a981eb5b3
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSListValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSListValueStyleImpl implements CSSListValueStyle{
+	
+	private ListValueStyle listValueStyle;
+
+	public CSSListValueStyleImpl(ListValueStyle listValueStyle){
+		this.listValueStyle = listValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return listValueStyle.getName();
+	}
+
+	public EList getCSSRawValuesList(){
+		return listValueStyle.getRawValuesList();
+	}
+}
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
new file mode 100644
index 00000000000..6710c1ab461
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSMultiDiagramLinkStyleImpl.java
@@ -0,0 +1,19 @@
+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;
+
+public class CSSMultiDiagramLinkStyleImpl implements CSSMultiDiagramLinkStyle{
+	
+	private MultiDiagramLinkStyle multiDiagramLinkStyle;
+
+	public CSSMultiDiagramLinkStyleImpl(MultiDiagramLinkStyle multiDiagramLinkStyle){
+		this.multiDiagramLinkStyle = multiDiagramLinkStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	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
new file mode 100644
index 00000000000..1c31226bd26
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSNamedStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSNamedStyleImpl implements CSSNamedStyle{
+	
+	private NamedStyle namedStyle;
+
+	public CSSNamedStyleImpl(NamedStyle namedStyle){
+		this.namedStyle = namedStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return namedStyle.getName();
+	}
+}
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
new file mode 100644
index 00000000000..4319f9fd4db
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPageStyleImpl.java
@@ -0,0 +1,34 @@
+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;
+
+public class CSSPageStyleImpl implements CSSPageStyle{
+	
+	private PageStyle pageStyle;
+
+	public CSSPageStyleImpl(PageStyle pageStyle){
+		this.pageStyle = pageStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSPageX(){
+		return pageStyle.getPageX();
+	}
+
+	public int getCSSPageY(){
+		return pageStyle.getPageY();
+	}
+
+	public int getCSSPageWidth(){
+		return pageStyle.getPageWidth();
+	}
+
+	public int getCSSPageHeight(){
+		return pageStyle.getPageHeight();
+	}
+}
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
new file mode 100644
index 00000000000..f24268b5b8b
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSPropertiesSetStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSPropertiesSetStyleImpl implements CSSPropertiesSetStyle{
+	
+	private PropertiesSetStyle propertiesSetStyle;
+
+	public CSSPropertiesSetStyleImpl(PropertiesSetStyle propertiesSetStyle){
+		this.propertiesSetStyle = propertiesSetStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return propertiesSetStyle.getName();
+	}
+}
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
new file mode 100644
index 00000000000..a20896d5c8f
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoundedCornersStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSRoundedCornersStyleImpl implements CSSRoundedCornersStyle{
+	
+	private RoundedCornersStyle roundedCornersStyle;
+
+	public CSSRoundedCornersStyleImpl(RoundedCornersStyle roundedCornersStyle){
+		this.roundedCornersStyle = roundedCornersStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSRoundedBendpointsRadius(){
+		return roundedCornersStyle.getRoundedBendpointsRadius();
+	}
+}
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
new file mode 100644
index 00000000000..3af776eb911
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSRoutingStyleImpl.java
@@ -0,0 +1,50 @@
+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;
+
+public class CSSRoutingStyleImpl implements CSSRoutingStyle{
+	
+	private RoutingStyle routingStyle;
+
+	public CSSRoutingStyleImpl(RoutingStyle routingStyle){
+		this.routingStyle = routingStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSRoundedBendpointsRadius(){
+		return routingStyle.getRoundedBendpointsRadius();
+	}
+
+	public Routing getCSSRouting(){
+		return routingStyle.getRouting();
+	}
+
+	public Smoothness getCSSSmoothness(){
+		return routingStyle.getSmoothness();
+	}
+
+	public boolean isCSSAvoidObstructions(){
+		return routingStyle.isAvoidObstructions();
+	}
+
+	public boolean isCSSClosestDistance(){
+		return routingStyle.isClosestDistance();
+	}
+
+	public JumpLinkStatus getCSSJumpLinkStatus(){
+		return routingStyle.getJumpLinkStatus();
+	}
+
+	public JumpLinkType getCSSJumpLinkType(){
+		return routingStyle.getJumpLinkType();
+	}
+
+	public boolean isCSSJumpLinksReverse(){
+		return routingStyle.isJumpLinksReverse();
+	}
+}
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
new file mode 100644
index 00000000000..7c7ec97819d
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSShapeStyleImpl.java
@@ -0,0 +1,74 @@
+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;
+
+public class CSSShapeStyleImpl implements CSSShapeStyle{
+	
+	private ShapeStyle shapeStyle;
+
+	public CSSShapeStyleImpl(ShapeStyle shapeStyle){
+		this.shapeStyle = shapeStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public int getCSSFontColor(){
+		return shapeStyle.getFontColor();
+	}
+
+	public java.lang.String getCSSFontName(){
+		return shapeStyle.getFontName();
+	}
+
+	public int getCSSFontHeight(){
+		return shapeStyle.getFontHeight();
+	}
+
+	public boolean isCSSBold(){
+		return shapeStyle.isBold();
+	}
+
+	public boolean isCSSItalic(){
+		return shapeStyle.isItalic();
+	}
+
+	public boolean isCSSUnderline(){
+		return shapeStyle.isUnderline();
+	}
+
+	public boolean isCSSStrikeThrough(){
+		return shapeStyle.isStrikeThrough();
+	}
+
+	public java.lang.String getCSSDescription(){
+		return shapeStyle.getDescription();
+	}
+
+	public int getCSSFillColor(){
+		return shapeStyle.getFillColor();
+	}
+
+	public int getCSSTransparency(){
+		return shapeStyle.getTransparency();
+	}
+
+	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
+		return shapeStyle.getGradient();
+	}
+
+	public int getCSSLineColor(){
+		return shapeStyle.getLineColor();
+	}
+
+	public int getCSSLineWidth(){
+		return shapeStyle.getLineWidth();
+	}
+
+	public int getCSSRoundedBendpointsRadius(){
+		return shapeStyle.getRoundedBendpointsRadius();
+	}
+}
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
new file mode 100644
index 00000000000..c5c6ec4f60a
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSingleValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSSingleValueStyleImpl implements CSSSingleValueStyle{
+	
+	private SingleValueStyle singleValueStyle;
+
+	public CSSSingleValueStyleImpl(SingleValueStyle singleValueStyle){
+		this.singleValueStyle = singleValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return singleValueStyle.getName();
+	}
+
+	public java.lang.String getCSSRawValue(){
+		return singleValueStyle.getRawValue();
+	}
+}
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
new file mode 100644
index 00000000000..1b5cd3c7dc6
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSSortingStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSSortingStyleImpl implements CSSSortingStyle{
+	
+	private SortingStyle sortingStyle;
+
+	public CSSSortingStyleImpl(SortingStyle sortingStyle){
+		this.sortingStyle = sortingStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public Sorting getCSSSorting(){
+		return sortingStyle.getSorting();
+	}
+
+	public java.util.Map getCSSSortingKeys(){
+		return sortingStyle.getSortingKeys();
+	}
+}
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
new file mode 100644
index 00000000000..27e7f1b017c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringListValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSStringListValueStyleImpl implements CSSStringListValueStyle{
+	
+	private StringListValueStyle stringListValueStyle;
+
+	public CSSStringListValueStyleImpl(StringListValueStyle stringListValueStyle){
+		this.stringListValueStyle = stringListValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return stringListValueStyle.getName();
+	}
+
+	public EList getCSSStringListValue(){
+		return stringListValueStyle.getStringListValue();
+	}
+}
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
new file mode 100644
index 00000000000..65d2da6e43f
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSStringValueStyleImpl.java
@@ -0,0 +1,26 @@
+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;
+
+public class CSSStringValueStyleImpl implements CSSStringValueStyle{
+	
+	private StringValueStyle stringValueStyle;
+
+	public CSSStringValueStyleImpl(StringValueStyle stringValueStyle){
+		this.stringValueStyle = stringValueStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public java.lang.String getCSSName(){
+		return stringValueStyle.getName();
+	}
+
+	public java.lang.String getCSSStringValue(){
+		return stringValueStyle.getStringValue();
+	}
+}
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
new file mode 100644
index 00000000000..1b9768d73df
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTextStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSTextStyleImpl implements CSSTextStyle{
+	
+	private TextStyle textStyle;
+
+	public CSSTextStyleImpl(TextStyle textStyle){
+		this.textStyle = textStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public TextAlignment getCSSTextAlignment(){
+		return textStyle.getTextAlignment();
+	}
+}
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
new file mode 100644
index 00000000000..b8c8c99bca1
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/prototype/infra/gmfdiag/css/style/impl/CSSTitleStyleImpl.java
@@ -0,0 +1,22 @@
+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;
+
+public class CSSTitleStyleImpl implements CSSTitleStyle{
+	
+	private TitleStyle titleStyle;
+
+	public CSSTitleStyleImpl(TitleStyle titleStyle){
+		this.titleStyle = titleStyle; 
+	}
+
+	////////////////////////////////////////////////
+	//	Implements a getter for each CSS property //
+	////////////////////////////////////////////////
+
+	public boolean isCSSShowTitle(){
+		return titleStyle.isShowTitle();
+	}
+}
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
new file mode 100644
index 00000000000..a558a183ac4
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/Activator.java
@@ -0,0 +1,50 @@
+package org.eclipse.papyrus.prototype.infra.gmfdiag.css;

+

+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.gmf.css"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

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

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

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

+	 */

+	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/adapter/GMFCSSAdapter.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/adapter/GMFCSSAdapter.java
new file mode 100644
index 00000000000..d2f282ae986
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/adapter/GMFCSSAdapter.java
@@ -0,0 +1,174 @@
+package org.eclipse.papyrus.prototype.infra.gmfdiag.css.adapter;

+

+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.papyrus.infra.emf.utils.EMFHelper;

+import org.w3c.dom.Node;

+import org.w3c.dom.NodeList;

+

+

+public class GMFCSSAdapter extends ElementAdapter implements NodeList {

+

+	private EObject sourceElement;

+

+	private String namespaceURI;

+

+	private String localName;

+

+	/**

+	 * The css id property

+	 */

+	public static final String CSS_GMF_ID_KEY = "Papyrus.GMF.ID";

+

+	/**

+	 * The css class property

+	 */

+	public static final String CSS_GMF_CLASS_KEY = "Papyrus.GMF.Class";

+

+	/**

+	 * The css style property

+	 */

+	public static final String CSS_GMF_STYLE_KEY = "Papyrus.GMF.Style";

+

+	/**

+	 * 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 = "Papyrus.GMF.Style";

+

+	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);

+

+		sourceElement = eObject;

+		namespaceURI = computeNamespaceURI();

+		localName = computeLocalName();

+	}

+

+	private String computeNamespaceURI() {

+		return EMFHelper.getQualifiedName(sourceElement.eClass(), ".");

+	}

+

+	private String computeLocalName() {

+		return sourceElement.eClass().getName();

+	}

+

+	public Node getParentNode() {

+		return (Node)sourceElement.eContainer();

+	}

+

+	public NodeList getChildNodes() {

+		return this;

+	}

+

+	public String getNamespaceURI() {

+		return namespaceURI;

+	}

+

+	public String getCSSId() {

+		return getCSSID(sourceElement);

+	}

+

+	public String getCSSClass() {

+		return getCSSClass(sourceElement);

+	}

+

+	public String getCSSStyle() {

+		return getCSSStyle(sourceElement);

+	}

+

+	@Override

+	public String getLocalName() {

+		return localName;

+	}

+

+	@Override

+	public String getAttribute(String attr) {

+		EStructuralFeature feature = sourceElement.eClass().getEStructuralFeature(attr);

+		if(feature != null) {

+			Object value = sourceElement.eGet(feature);

+			if(value != null) {

+				return value.toString();

+			}

+		}

+

+		return "";

+	}

+

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * Returns the GMF EObject handled by this adapter

+	 */

+	@Override

+	public EObject getNativeWidget() {

+		return sourceElement;

+	}

+

+

+

+	/////////////

+	//Node List//

+	/////////////

+

+

+

+	public Node item(int index) {

+		//TODO Some contained elements may not be Nodes

+		return (Node)sourceElement.eContents().get(index);

+	}

+

+	public int getLength() {

+		//TODO Some contained elements may not be Nodes

+		return sourceElement.eContents().size();

+	}

+

+}

diff --git a/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/AbstractGMFCSSEngineImpl.java b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/AbstractGMFCSSEngineImpl.java
new file mode 100644
index 00000000000..6912b388cc3
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/AbstractGMFCSSEngineImpl.java
@@ -0,0 +1,8 @@
+package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

+

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

+

+

+public class AbstractGMFCSSEngineImpl extends CSSEngineImpl {

+

+}

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
new file mode 100644
index 00000000000..3e4ac52b4fb
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.prototype.infra.gmfdiag.css/src/org/eclipse/papyrus/prototype/infra/gmfdiag/css/engine/GMFCSSEngineImpl.java
@@ -0,0 +1,10 @@
+package org.eclipse.papyrus.prototype.infra.gmfdiag.css.engine;

+

+

+

+public class GMFCSSEngineImpl extends AbstractGMFCSSEngineImpl {

+

+	public GMFCSSEngineImpl() {

+

+	}

+}