370797: [Theme] Papyrus should provide a support for CSS files on its diagrams

https://bugs.eclipse.org/bugs/show_bug.cgi?id=370797

90 files changed, 0 insertions, 8206 deletions

diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSArrowStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSArrowStyleImpl.java
deleted file mode 100644
index a3bba0f1a5e..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSArrowStyleImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.ArrowType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.ArrowStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSArrowStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSArrowStyleDelegate;
-
-public class CSSArrowStyleImpl extends ArrowStyleImpl implements CSSArrowStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSArrowStyle arrowStyle;
-
-	protected CSSArrowStyle getArrowStyle() {
-		if(arrowStyle == null) {
-			arrowStyle = new  CSSArrowStyleDelegate(this, getEngine());
-		}
-		return arrowStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public ArrowType getCSSArrowSource(){
-		ArrowType value = super.getArrowSource();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getArrowStyle_ArrowSource(), value)){
-			return value;
-		} else {
-			return getArrowStyle().getCSSArrowSource();
-		}
-	}
-
-	public ArrowType getCSSArrowTarget(){
-		ArrowType value = super.getArrowTarget();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getArrowStyle_ArrowTarget(), value)){
-			return value;
-		} else {
-			return getArrowStyle().getCSSArrowTarget();
-		}
-	}
-
-
-	@Override
-	public ArrowType getArrowSource(){
-		//return super.getArrowSource();
-		return getCSSArrowSource();
-	}
-
-	@Override
-	public ArrowType getArrowTarget(){
-		//return super.getArrowTarget();
-		return getCSSArrowTarget();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setArrowSource(ArrowType value){
-		super.setArrowSource(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getArrowStyle_ArrowSource();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setArrowTarget(ArrowType value){
-		super.setArrowTarget(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getArrowStyle_ArrowTarget();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java
deleted file mode 100644
index 7a028fd1b19..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicCompartmentImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.BasicCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDrawerStyleDelegate;
-
-public class CSSBasicCompartmentImpl extends BasicCompartmentImpl implements CSSDrawerStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDrawerStyle drawerStyle;
-
-	protected CSSDrawerStyle getDrawerStyle() {
-		if(drawerStyle == null) {
-			drawerStyle = new  CSSDrawerStyleDelegate(this, getEngine());
-		}
-		return drawerStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {		
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSCollapsed(){
-		boolean value = super.isCollapsed();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getDrawerStyle_Collapsed(), value)){
-			return value;
-		} else {
-			return getDrawerStyle().isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value){
-		super.setVisible(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value){
-		super.setType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value){
-		super.setMutable(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setCollapsed(boolean value){
-		super.setCollapsed(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(this, feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java
deleted file mode 100644
index 4f67e2ae126..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSBasicSemanticCompartmentImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.BasicSemanticCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDrawerStyleDelegate;
-
-public class CSSBasicSemanticCompartmentImpl extends BasicSemanticCompartmentImpl implements CSSDrawerStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDrawerStyle drawerStyle;
-
-	protected CSSDrawerStyle getDrawerStyle() {
-		if(drawerStyle == null) {
-			drawerStyle = new  CSSDrawerStyleDelegate(this, getEngine());
-		}
-		return drawerStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {		
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSCollapsed(){
-		boolean value = super.isCollapsed();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getDrawerStyle_Collapsed(), value)){
-			return value;
-		} else {
-			return getDrawerStyle().isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value){
-		super.setVisible(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value){
-		super.setType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value){
-		super.setMutable(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setCollapsed(boolean value){
-		super.setCollapsed(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(this, feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSCanonicalStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSCanonicalStyleImpl.java
deleted file mode 100644
index 4d48ffded98..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSCanonicalStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.CanonicalStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSCanonicalStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSCanonicalStyleDelegate;
-
-public class CSSCanonicalStyleImpl extends CanonicalStyleImpl implements CSSCanonicalStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSCanonicalStyle canonicalStyle;
-
-	protected CSSCanonicalStyle getCanonicalStyle() {
-		if(canonicalStyle == null) {
-			canonicalStyle = new  CSSCanonicalStyleDelegate(this, getEngine());
-		}
-		return canonicalStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSCanonical(){
-		boolean value = super.isCanonical();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getCanonicalStyle_Canonical(), value)){
-			return value;
-		} else {
-			return getCanonicalStyle().isCSSCanonical();
-		}
-	}
-
-
-	@Override
-	public boolean isCanonical(){
-		//return super.isCanonical();
-		return isCSSCanonical();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setCanonical(boolean value){
-		super.setCanonical(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getCanonicalStyle_Canonical();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java
deleted file mode 100644
index c37f4b4d777..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSCompartmentImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.CompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDrawerStyleDelegate;
-
-public class CSSCompartmentImpl extends CompartmentImpl implements CSSDrawerStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDrawerStyle drawerStyle;
-
-	protected CSSDrawerStyle getDrawerStyle() {
-		if(drawerStyle == null) {
-			drawerStyle = new  CSSDrawerStyleDelegate(this, getEngine());
-		}
-		return drawerStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {		
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSCollapsed(){
-		boolean value = super.isCollapsed();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getDrawerStyle_Collapsed(), value)){
-			return value;
-		} else {
-			return getDrawerStyle().isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value){
-		super.setVisible(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value){
-		super.setType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value){
-		super.setMutable(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setCollapsed(boolean value){
-		super.setCollapsed(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setCanonical(boolean value){
-		super.setCanonical(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getCanonicalStyle_Canonical();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setShowTitle(boolean value){
-		super.setShowTitle(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getTitleStyle_ShowTitle();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(this, feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java
deleted file mode 100644
index 7b9ba46f940..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorImpl.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.gmf.runtime.notation.impl.ConnectorImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSConnectorStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSConnectorStyleDelegate;
-
-public class CSSConnectorImpl extends ConnectorImpl implements CSSConnectorStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSConnectorStyle connectorStyle;
-
-	protected CSSConnectorStyle getConnectorStyle() {
-		if(connectorStyle == null) {
-			connectorStyle = new  CSSConnectorStyleDelegate(this, getEngine());
-		}
-		return connectorStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {		
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSRoundedBendpointsRadius(){
-		int value = super.getRoundedBendpointsRadius();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSRoundedBendpointsRadius();
-		}
-	}
-
-	public Routing getCSSRouting(){
-		Routing value = super.getRouting();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoutingStyle_Routing(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSRouting();
-		}
-	}
-
-	public Smoothness getCSSSmoothness(){
-		Smoothness value = super.getSmoothness();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoutingStyle_Smoothness(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSSmoothness();
-		}
-	}
-
-	public boolean isCSSAvoidObstructions(){
-		boolean value = super.isAvoidObstructions();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().isCSSAvoidObstructions();
-		}
-	}
-
-	public boolean isCSSClosestDistance(){
-		boolean value = super.isClosestDistance();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().isCSSClosestDistance();
-		}
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus(){
-		JumpLinkStatus value = super.getJumpLinkStatus();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSJumpLinkStatus();
-		}
-	}
-
-	public JumpLinkType getCSSJumpLinkType(){
-		JumpLinkType value = super.getJumpLinkType();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSJumpLinkType();
-		}
-	}
-
-	public boolean isCSSJumpLinksReverse(){
-		boolean value = super.isJumpLinksReverse();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().isCSSJumpLinksReverse();
-		}
-	}
-
-	public int getCSSLineColor(){
-		int value = super.getLineColor();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getLineStyle_LineColor(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth(){
-		int value = super.getLineWidth();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getLineStyle_LineWidth(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSLineWidth();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-	@Override
-	public Routing getRouting(){
-		//return super.getRouting();
-		return getCSSRouting();
-	}
-
-	@Override
-	public Smoothness getSmoothness(){
-		//return super.getSmoothness();
-		return getCSSSmoothness();
-	}
-
-	@Override
-	public boolean isAvoidObstructions(){
-		//return super.isAvoidObstructions();
-		return isCSSAvoidObstructions();
-	}
-
-	@Override
-	public boolean isClosestDistance(){
-		//return super.isClosestDistance();
-		return isCSSClosestDistance();
-	}
-
-	@Override
-	public JumpLinkStatus getJumpLinkStatus(){
-		//return super.getJumpLinkStatus();
-		return getCSSJumpLinkStatus();
-	}
-
-	@Override
-	public JumpLinkType getJumpLinkType(){
-		//return super.getJumpLinkType();
-		return getCSSJumpLinkType();
-	}
-
-	@Override
-	public boolean isJumpLinksReverse(){
-		//return super.isJumpLinksReverse();
-		return isCSSJumpLinksReverse();
-	}
-
-	@Override
-	public int getLineColor(){
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth(){
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value){
-		super.setVisible(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value){
-		super.setType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value){
-		super.setMutable(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setRoundedBendpointsRadius(int value){
-		super.setRoundedBendpointsRadius(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setRouting(Routing value){
-		super.setRouting(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_Routing();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setSmoothness(Smoothness value){
-		super.setSmoothness(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_Smoothness();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setAvoidObstructions(boolean value){
-		super.setAvoidObstructions(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setClosestDistance(boolean value){
-		super.setClosestDistance(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setJumpLinkStatus(JumpLinkStatus value){
-		super.setJumpLinkStatus(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setJumpLinkType(JumpLinkType value){
-		super.setJumpLinkType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setJumpLinksReverse(boolean value){
-		super.setJumpLinksReverse(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setLineColor(int value){
-		super.setLineColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineColor();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setLineWidth(int value){
-		super.setLineWidth(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineWidth();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(this, feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorStyleImpl.java
deleted file mode 100644
index 449bd55174d..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSConnectorStyleImpl.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.ConnectorStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSConnectorStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSConnectorStyleDelegate;
-
-public class CSSConnectorStyleImpl extends ConnectorStyleImpl implements CSSConnectorStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSConnectorStyle connectorStyle;
-
-	protected CSSConnectorStyle getConnectorStyle() {
-		if(connectorStyle == null) {
-			connectorStyle = new  CSSConnectorStyleDelegate(this, getEngine());
-		}
-		return connectorStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSRoundedBendpointsRadius(){
-		int value = super.getRoundedBendpointsRadius();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSRoundedBendpointsRadius();
-		}
-	}
-
-	public Routing getCSSRouting(){
-		Routing value = super.getRouting();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_Routing(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSRouting();
-		}
-	}
-
-	public Smoothness getCSSSmoothness(){
-		Smoothness value = super.getSmoothness();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_Smoothness(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSSmoothness();
-		}
-	}
-
-	public boolean isCSSAvoidObstructions(){
-		boolean value = super.isAvoidObstructions();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().isCSSAvoidObstructions();
-		}
-	}
-
-	public boolean isCSSClosestDistance(){
-		boolean value = super.isClosestDistance();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().isCSSClosestDistance();
-		}
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus(){
-		JumpLinkStatus value = super.getJumpLinkStatus();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSJumpLinkStatus();
-		}
-	}
-
-	public JumpLinkType getCSSJumpLinkType(){
-		JumpLinkType value = super.getJumpLinkType();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSJumpLinkType();
-		}
-	}
-
-	public boolean isCSSJumpLinksReverse(){
-		boolean value = super.isJumpLinksReverse();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().isCSSJumpLinksReverse();
-		}
-	}
-
-	public int getCSSLineColor(){
-		int value = super.getLineColor();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getLineStyle_LineColor(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth(){
-		int value = super.getLineWidth();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getLineStyle_LineWidth(), value)){
-			return value;
-		} else {
-			return getConnectorStyle().getCSSLineWidth();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-	@Override
-	public Routing getRouting(){
-		//return super.getRouting();
-		return getCSSRouting();
-	}
-
-	@Override
-	public Smoothness getSmoothness(){
-		//return super.getSmoothness();
-		return getCSSSmoothness();
-	}
-
-	@Override
-	public boolean isAvoidObstructions(){
-		//return super.isAvoidObstructions();
-		return isCSSAvoidObstructions();
-	}
-
-	@Override
-	public boolean isClosestDistance(){
-		//return super.isClosestDistance();
-		return isCSSClosestDistance();
-	}
-
-	@Override
-	public JumpLinkStatus getJumpLinkStatus(){
-		//return super.getJumpLinkStatus();
-		return getCSSJumpLinkStatus();
-	}
-
-	@Override
-	public JumpLinkType getJumpLinkType(){
-		//return super.getJumpLinkType();
-		return getCSSJumpLinkType();
-	}
-
-	@Override
-	public boolean isJumpLinksReverse(){
-		//return super.isJumpLinksReverse();
-		return isCSSJumpLinksReverse();
-	}
-
-	@Override
-	public int getLineColor(){
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth(){
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setRoundedBendpointsRadius(int value){
-		super.setRoundedBendpointsRadius(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setRouting(Routing value){
-		super.setRouting(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_Routing();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setSmoothness(Smoothness value){
-		super.setSmoothness(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_Smoothness();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setAvoidObstructions(boolean value){
-		super.setAvoidObstructions(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setClosestDistance(boolean value){
-		super.setClosestDistance(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setJumpLinkStatus(JumpLinkStatus value){
-		super.setJumpLinkStatus(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setJumpLinkType(JumpLinkType value){
-		super.setJumpLinkType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setJumpLinksReverse(boolean value){
-		super.setJumpLinksReverse(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setLineColor(int value){
-		super.setLineColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineColor();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setLineWidth(int value){
-		super.setLineWidth(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineWidth();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDataTypeStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDataTypeStyleImpl.java
deleted file mode 100644
index 380079f2bb6..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDataTypeStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.DataTypeStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDataTypeStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDataTypeStyleDelegate;
-
-public class CSSDataTypeStyleImpl extends DataTypeStyleImpl implements CSSDataTypeStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDataTypeStyle dataTypeStyle;
-
-	protected CSSDataTypeStyle getDataTypeStyle() {
-		if(dataTypeStyle == null) {
-			dataTypeStyle = new  CSSDataTypeStyleDelegate(this, getEngine());
-		}
-		return dataTypeStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public java.lang.String getCSSName(){
-		java.lang.String value = super.getName();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){
-			return value;
-		} else {
-			return getDataTypeStyle().getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setName(java.lang.String value){
-		super.setName(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDescriptionStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDescriptionStyleImpl.java
deleted file mode 100644
index e60a2f97b1b..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDescriptionStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.DescriptionStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDescriptionStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDescriptionStyleDelegate;
-
-public class CSSDescriptionStyleImpl extends DescriptionStyleImpl implements CSSDescriptionStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDescriptionStyle descriptionStyle;
-
-	protected CSSDescriptionStyle getDescriptionStyle() {
-		if(descriptionStyle == null) {
-			descriptionStyle = new  CSSDescriptionStyleDelegate(this, getEngine());
-		}
-		return descriptionStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public java.lang.String getCSSDescription(){
-		java.lang.String value = super.getDescription();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getDescriptionStyle_Description(), value)){
-			return value;
-		} else {
-			return getDescriptionStyle().getCSSDescription();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getDescription(){
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setDescription(java.lang.String value){
-		super.setDescription(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDescriptionStyle_Description();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDiagramLinkStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDiagramLinkStyleImpl.java
deleted file mode 100644
index 792cc3c9ba2..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDiagramLinkStyleImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.DiagramLinkStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDiagramLinkStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDiagramLinkStyleDelegate;
-
-public class CSSDiagramLinkStyleImpl extends DiagramLinkStyleImpl implements CSSDiagramLinkStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDiagramLinkStyle diagramLinkStyle;
-
-	protected CSSDiagramLinkStyle getDiagramLinkStyle() {
-		if(diagramLinkStyle == null) {
-			diagramLinkStyle = new  CSSDiagramLinkStyleDelegate(this, getEngine());
-		}
-		return diagramLinkStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-
-
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDiagramStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDiagramStyleImpl.java
deleted file mode 100644
index 9bb74294d17..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDiagramStyleImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.DiagramStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDiagramStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDiagramStyleDelegate;
-
-public class CSSDiagramStyleImpl extends DiagramStyleImpl implements CSSDiagramStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDiagramStyle diagramStyle;
-
-	protected CSSDiagramStyle getDiagramStyle() {
-		if(diagramStyle == null) {
-			diagramStyle = new CSSDiagramStyleDelegate(this, getEngine());
-		}
-		return diagramStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView() {
-		EObject parent = eContainer();
-		while(!(parent instanceof View) && parent != null) {
-			parent = parent.eContainer();
-		}
-
-		if(parent != null) {
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSPageX() {
-		int value = super.getPageX();
-
-		if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageX(), value)) {
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageX();
-		}
-	}
-
-	public int getCSSPageY() {
-		int value = super.getPageY();
-
-		if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageY(), value)) {
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageY();
-		}
-	}
-
-	public int getCSSPageWidth() {
-		int value = super.getPageWidth();
-
-		if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageWidth(), value)) {
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageWidth();
-		}
-	}
-
-	public int getCSSPageHeight() {
-		int value = super.getPageHeight();
-
-		if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageHeight(), value)) {
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageHeight();
-		}
-	}
-
-	public java.lang.String getCSSDescription() {
-		java.lang.String value = super.getDescription();
-
-		if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getDescriptionStyle_Description(), value)) {
-			return value;
-		} else {
-			return getDiagramStyle().getCSSDescription();
-		}
-	}
-
-
-	@Override
-	public int getPageX() {
-		//return super.getPageX();
-		return getCSSPageX();
-	}
-
-	@Override
-	public int getPageY() {
-		//return super.getPageY();
-		return getCSSPageY();
-	}
-
-	@Override
-	public int getPageWidth() {
-		//return super.getPageWidth();
-		return getCSSPageWidth();
-	}
-
-	@Override
-	public int getPageHeight() {
-		//return super.getPageHeight();
-		return getCSSPageHeight();
-	}
-
-	@Override
-	public java.lang.String getDescription() {
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setPageX(int value) {
-		super.setPageX(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageX();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setPageY(int value) {
-		super.setPageY(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageY();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setPageWidth(int value) {
-		super.setPageWidth(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageWidth();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setPageHeight(int value) {
-		super.setPageHeight(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageHeight();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setDescription(java.lang.String value) {
-		super.setDescription(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDescriptionStyle_Description();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDrawerStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDrawerStyleImpl.java
deleted file mode 100644
index fa2788b619c..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDrawerStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.DrawerStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDrawerStyleDelegate;
-
-public class CSSDrawerStyleImpl extends DrawerStyleImpl implements CSSDrawerStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDrawerStyle drawerStyle;
-
-	protected CSSDrawerStyle getDrawerStyle() {
-		if(drawerStyle == null) {
-			drawerStyle = new  CSSDrawerStyleDelegate(this, getEngine());
-		}
-		return drawerStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSCollapsed(){
-		boolean value = super.isCollapsed();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getDrawerStyle_Collapsed(), value)){
-			return value;
-		} else {
-			return getDrawerStyle().isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setCollapsed(boolean value){
-		super.setCollapsed(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFillStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFillStyleImpl.java
deleted file mode 100644
index ca4710433d5..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFillStyleImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.FillStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSFillStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSFillStyleDelegate;
-
-public class CSSFillStyleImpl extends FillStyleImpl implements CSSFillStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSFillStyle fillStyle;
-
-	protected CSSFillStyle getFillStyle() {
-		if(fillStyle == null) {
-			fillStyle = new  CSSFillStyleDelegate(this, getEngine());
-		}
-		return fillStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSFillColor(){
-		int value = super.getFillColor();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFillStyle_FillColor(), value)){
-			return value;
-		} else {
-			return getFillStyle().getCSSFillColor();
-		}
-	}
-
-	public int getCSSTransparency(){
-		int value = super.getTransparency();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFillStyle_Transparency(), value)){
-			return value;
-		} else {
-			return getFillStyle().getCSSTransparency();
-		}
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
-		org.eclipse.gmf.runtime.notation.datatype.GradientData value = super.getGradient();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFillStyle_Gradient(), value)){
-			return value;
-		} else {
-			return getFillStyle().getCSSGradient();
-		}
-	}
-
-
-	@Override
-	public int getFillColor(){
-		//return super.getFillColor();
-		return getCSSFillColor();
-	}
-
-	@Override
-	public int getTransparency(){
-		//return super.getTransparency();
-		return getCSSTransparency();
-	}
-
-	@Override
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient(){
-		//return super.getGradient();
-		return getCSSGradient();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setFillColor(int value){
-		super.setFillColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_FillColor();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setTransparency(int value){
-		super.setTransparency(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_Transparency();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setGradient(org.eclipse.gmf.runtime.notation.datatype.GradientData value){
-		super.setGradient(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_Gradient();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFilteringStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFilteringStyleImpl.java
deleted file mode 100644
index 5215c40daa6..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFilteringStyleImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.FilteringStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSFilteringStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSFilteringStyleDelegate;
-
-public class CSSFilteringStyleImpl extends FilteringStyleImpl implements CSSFilteringStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSFilteringStyle filteringStyle;
-
-	protected CSSFilteringStyle getFilteringStyle() {
-		if(filteringStyle == null) {
-			filteringStyle = new  CSSFilteringStyleDelegate(this, getEngine());
-		}
-		return filteringStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public Filtering getCSSFiltering(){
-		Filtering value = super.getFiltering();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFilteringStyle_Filtering(), value)){
-			return value;
-		} else {
-			return getFilteringStyle().getCSSFiltering();
-		}
-	}
-
-	public java.util.List getCSSFilteringKeys(){
-		java.util.List value = super.getFilteringKeys();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys(), value)){
-			return value;
-		} else {
-			return getFilteringStyle().getCSSFilteringKeys();
-		}
-	}
-
-
-	@Override
-	public Filtering getFiltering(){
-		//return super.getFiltering();
-		return getCSSFiltering();
-	}
-
-	@Override
-	public java.util.List getFilteringKeys(){
-		//return super.getFilteringKeys();
-		return getCSSFilteringKeys();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setFiltering(Filtering value){
-		super.setFiltering(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFilteringStyle_Filtering();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setFilteringKeys(java.util.List value){
-		super.setFilteringKeys(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFontStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFontStyleImpl.java
deleted file mode 100644
index 1ca85f5f869..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSFontStyleImpl.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.FontStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSFontStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSFontStyleDelegate;
-
-public class CSSFontStyleImpl extends FontStyleImpl implements CSSFontStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSFontStyle fontStyle;
-
-	protected CSSFontStyle getFontStyle() {
-		if(fontStyle == null) {
-			fontStyle = new  CSSFontStyleDelegate(this, getEngine());
-		}
-		return fontStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSFontColor(){
-		int value = super.getFontColor();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_FontColor(), value)){
-			return value;
-		} else {
-			return getFontStyle().getCSSFontColor();
-		}
-	}
-
-	public java.lang.String getCSSFontName(){
-		java.lang.String value = super.getFontName();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_FontName(), value)){
-			return value;
-		} else {
-			return getFontStyle().getCSSFontName();
-		}
-	}
-
-	public int getCSSFontHeight(){
-		int value = super.getFontHeight();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_FontHeight(), value)){
-			return value;
-		} else {
-			return getFontStyle().getCSSFontHeight();
-		}
-	}
-
-	public boolean isCSSBold(){
-		boolean value = super.isBold();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_Bold(), value)){
-			return value;
-		} else {
-			return getFontStyle().isCSSBold();
-		}
-	}
-
-	public boolean isCSSItalic(){
-		boolean value = super.isItalic();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_Italic(), value)){
-			return value;
-		} else {
-			return getFontStyle().isCSSItalic();
-		}
-	}
-
-	public boolean isCSSUnderline(){
-		boolean value = super.isUnderline();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_Underline(), value)){
-			return value;
-		} else {
-			return getFontStyle().isCSSUnderline();
-		}
-	}
-
-	public boolean isCSSStrikeThrough(){
-		boolean value = super.isStrikeThrough();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_StrikeThrough(), value)){
-			return value;
-		} else {
-			return getFontStyle().isCSSStrikeThrough();
-		}
-	}
-
-
-	@Override
-	public int getFontColor(){
-		//return super.getFontColor();
-		return getCSSFontColor();
-	}
-
-	@Override
-	public java.lang.String getFontName(){
-		//return super.getFontName();
-		return getCSSFontName();
-	}
-
-	@Override
-	public int getFontHeight(){
-		//return super.getFontHeight();
-		return getCSSFontHeight();
-	}
-
-	@Override
-	public boolean isBold(){
-		//return super.isBold();
-		return isCSSBold();
-	}
-
-	@Override
-	public boolean isItalic(){
-		//return super.isItalic();
-		return isCSSItalic();
-	}
-
-	@Override
-	public boolean isUnderline(){
-		//return super.isUnderline();
-		return isCSSUnderline();
-	}
-
-	@Override
-	public boolean isStrikeThrough(){
-		//return super.isStrikeThrough();
-		return isCSSStrikeThrough();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setFontColor(int value){
-		super.setFontColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontColor();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setFontName(java.lang.String value){
-		super.setFontName(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontName();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setFontHeight(int value){
-		super.setFontHeight(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontHeight();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setBold(boolean value){
-		super.setBold(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Bold();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setItalic(boolean value){
-		super.setItalic(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Italic();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setUnderline(boolean value){
-		super.setUnderline(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Underline();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setStrikeThrough(boolean value){
-		super.setStrikeThrough(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_StrikeThrough();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSGuideStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSGuideStyleImpl.java
deleted file mode 100644
index 37e3879f7d7..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSGuideStyleImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.GuideStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSGuideStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSGuideStyleDelegate;
-
-public class CSSGuideStyleImpl extends GuideStyleImpl implements CSSGuideStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSGuideStyle guideStyle;
-
-	protected CSSGuideStyle getGuideStyle() {
-		if(guideStyle == null) {
-			guideStyle = new  CSSGuideStyleDelegate(this, getEngine());
-		}
-		return guideStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-
-
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSHintedDiagramLinkStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSHintedDiagramLinkStyleImpl.java
deleted file mode 100644
index 4afab3d12a3..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSHintedDiagramLinkStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.HintedDiagramLinkStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSHintedDiagramLinkStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSHintedDiagramLinkStyleDelegate;
-
-public class CSSHintedDiagramLinkStyleImpl extends HintedDiagramLinkStyleImpl implements CSSHintedDiagramLinkStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSHintedDiagramLinkStyle hintedDiagramLinkStyle;
-
-	protected CSSHintedDiagramLinkStyle getHintedDiagramLinkStyle() {
-		if(hintedDiagramLinkStyle == null) {
-			hintedDiagramLinkStyle = new  CSSHintedDiagramLinkStyleDelegate(this, getEngine());
-		}
-		return hintedDiagramLinkStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public java.lang.String getCSSHint(){
-		java.lang.String value = super.getHint();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getHintedDiagramLinkStyle_Hint(), value)){
-			return value;
-		} else {
-			return getHintedDiagramLinkStyle().getCSSHint();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getHint(){
-		//return super.getHint();
-		return getCSSHint();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setHint(java.lang.String value){
-		super.setHint(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getHintedDiagramLinkStyle_Hint();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSImageBufferStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSImageBufferStyleImpl.java
deleted file mode 100644
index 2ba20044436..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSImageBufferStyleImpl.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.ImageBufferStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageBufferStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSImageBufferStyleDelegate;
-
-public class CSSImageBufferStyleImpl extends ImageBufferStyleImpl implements CSSImageBufferStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSImageBufferStyle imageBufferStyle;
-
-	protected CSSImageBufferStyle getImageBufferStyle() {
-		if(imageBufferStyle == null) {
-			imageBufferStyle = new CSSImageBufferStyleDelegate(this, getEngine());
-		}
-		return imageBufferStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView() {
-		EObject parent = eContainer();
-		while(!(parent instanceof View) && parent != null) {
-			parent = parent.eContainer();
-		}
-
-		if(parent != null) {
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public java.lang.Boolean getCSSAntiAlias() {
-		java.lang.Boolean value = super.getAntiAlias();
-
-		if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getImageStyle_AntiAlias(), value)) {
-			return value;
-		} else {
-			return getImageBufferStyle().getCSSAntiAlias();
-		}
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio() {
-		java.lang.Boolean value = super.getMaintainAspectRatio();
-
-		if(ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio(), value)) {
-			return value;
-		} else {
-			return getImageBufferStyle().getCSSMaintainAspectRatio();
-		}
-	}
-
-
-	@Override
-	public java.lang.Boolean getAntiAlias() {
-		//return super.getAntiAlias();
-		return getCSSAntiAlias();
-	}
-
-	@Override
-	public java.lang.Boolean getMaintainAspectRatio() {
-		//return super.getMaintainAspectRatio();
-		return getCSSMaintainAspectRatio();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setAntiAlias(java.lang.Boolean value) {
-		super.setAntiAlias(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getImageStyle_AntiAlias();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setMaintainAspectRatio(java.lang.Boolean value) {
-		super.setMaintainAspectRatio(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSImageStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSImageStyleImpl.java
deleted file mode 100644
index d59406785ac..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSImageStyleImpl.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.ImageStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSImageStyleDelegate;
-
-public class CSSImageStyleImpl extends ImageStyleImpl implements CSSImageStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSImageStyle imageStyle;
-
-	protected CSSImageStyle getImageStyle() {
-		if(imageStyle == null) {
-			imageStyle = new  CSSImageStyleDelegate(this, getEngine());
-		}
-		return imageStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public java.lang.Boolean getCSSAntiAlias(){
-		java.lang.Boolean value = super.getAntiAlias();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getImageStyle_AntiAlias(), value)){
-			return value;
-		} else {
-			return getImageStyle().getCSSAntiAlias();
-		}
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio(){
-		java.lang.Boolean value = super.getMaintainAspectRatio();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio(), value)){
-			return value;
-		} else {
-			return getImageStyle().getCSSMaintainAspectRatio();
-		}
-	}
-
-
-	@Override
-	public java.lang.Boolean getAntiAlias(){
-		//return super.getAntiAlias();
-		return getCSSAntiAlias();
-	}
-
-	@Override
-	public java.lang.Boolean getMaintainAspectRatio(){
-		//return super.getMaintainAspectRatio();
-		return getCSSMaintainAspectRatio();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setAntiAlias(java.lang.Boolean value){
-		super.setAntiAlias(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getImageStyle_AntiAlias();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setMaintainAspectRatio(java.lang.Boolean value){
-		super.setMaintainAspectRatio(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSLineStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSLineStyleImpl.java
deleted file mode 100644
index 2e10f5acf27..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSLineStyleImpl.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.LineStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSLineStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSLineStyleDelegate;
-
-public class CSSLineStyleImpl extends LineStyleImpl implements CSSLineStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSLineStyle lineStyle;
-
-	protected CSSLineStyle getLineStyle() {
-		if(lineStyle == null) {
-			lineStyle = new  CSSLineStyleDelegate(this, getEngine());
-		}
-		return lineStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSLineColor(){
-		int value = super.getLineColor();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getLineStyle_LineColor(), value)){
-			return value;
-		} else {
-			return getLineStyle().getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth(){
-		int value = super.getLineWidth();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getLineStyle_LineWidth(), value)){
-			return value;
-		} else {
-			return getLineStyle().getCSSLineWidth();
-		}
-	}
-
-
-	@Override
-	public int getLineColor(){
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth(){
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setLineColor(int value){
-		super.setLineColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineColor();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setLineWidth(int value){
-		super.setLineWidth(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineWidth();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSLineTypeStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSLineTypeStyleImpl.java
deleted file mode 100644
index 48bfda1962e..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSLineTypeStyleImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.LineType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.LineTypeStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSLineTypeStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSLineTypeStyleDelegate;
-
-public class CSSLineTypeStyleImpl extends LineTypeStyleImpl implements CSSLineTypeStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSLineTypeStyle lineTypeStyle;
-
-	protected CSSLineTypeStyle getLineTypeStyle() {
-		if(lineTypeStyle == null) {
-			lineTypeStyle = new  CSSLineTypeStyleDelegate(this, getEngine());
-		}
-		return lineTypeStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public LineType getCSSLineType(){
-		LineType value = super.getLineType();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getLineTypeStyle_LineType(), value)){
-			return value;
-		} else {
-			return getLineTypeStyle().getCSSLineType();
-		}
-	}
-
-
-	@Override
-	public LineType getLineType(){
-		//return super.getLineType();
-		return getCSSLineType();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setLineType(LineType value){
-		super.setLineType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineTypeStyle_LineType();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
deleted file mode 100644
index da75d161e63..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSListCompartmentImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Sorting;
-import org.eclipse.gmf.runtime.notation.impl.ListCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDrawerStyleDelegate;
-
-public class CSSListCompartmentImpl extends ListCompartmentImpl implements CSSDrawerStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDrawerStyle drawerStyle;
-
-	protected CSSDrawerStyle getDrawerStyle() {
-		if(drawerStyle == null) {
-			drawerStyle = new  CSSDrawerStyleDelegate(this, getEngine());
-		}
-		return drawerStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {		
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSCollapsed(){
-		boolean value = super.isCollapsed();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getDrawerStyle_Collapsed(), value)){
-			return value;
-		} else {
-			return getDrawerStyle().isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value){
-		super.setVisible(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value){
-		super.setType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value){
-		super.setMutable(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setCollapsed(boolean value){
-		super.setCollapsed(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setSorting(Sorting value){
-		super.setSorting(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getSortingStyle_Sorting();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setSortingKeys(java.util.Map value){
-		super.setSortingKeys(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getSortingStyle_SortingKeys();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFiltering(Filtering value){
-		super.setFiltering(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFilteringStyle_Filtering();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFilteringKeys(java.util.List value){
-		super.setFilteringKeys(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setShowTitle(boolean value){
-		super.setShowTitle(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getTitleStyle_ShowTitle();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(this, feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSMultiDiagramLinkStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSMultiDiagramLinkStyleImpl.java
deleted file mode 100644
index 54d34c70817..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSMultiDiagramLinkStyleImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.MultiDiagramLinkStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSMultiDiagramLinkStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSMultiDiagramLinkStyleDelegate;
-
-public class CSSMultiDiagramLinkStyleImpl extends MultiDiagramLinkStyleImpl implements CSSMultiDiagramLinkStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSMultiDiagramLinkStyle multiDiagramLinkStyle;
-
-	protected CSSMultiDiagramLinkStyle getMultiDiagramLinkStyle() {
-		if(multiDiagramLinkStyle == null) {
-			multiDiagramLinkStyle = new  CSSMultiDiagramLinkStyleDelegate(this, getEngine());
-		}
-		return multiDiagramLinkStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-
-
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSNamedStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSNamedStyleImpl.java
deleted file mode 100644
index af5233bb769..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSNamedStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.NamedStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSNamedStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSNamedStyleDelegate;
-
-public class CSSNamedStyleImpl extends NamedStyleImpl implements CSSNamedStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSNamedStyle namedStyle;
-
-	protected CSSNamedStyle getNamedStyle() {
-		if(namedStyle == null) {
-			namedStyle = new  CSSNamedStyleDelegate(this, getEngine());
-		}
-		return namedStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public java.lang.String getCSSName(){
-		java.lang.String value = super.getName();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){
-			return value;
-		} else {
-			return getNamedStyle().getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setName(java.lang.String value){
-		super.setName(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSPageStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSPageStyleImpl.java
deleted file mode 100644
index afcaa0c748b..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSPageStyleImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.PageStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSPageStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSPageStyleDelegate;
-
-public class CSSPageStyleImpl extends PageStyleImpl implements CSSPageStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSPageStyle pageStyle;
-
-	protected CSSPageStyle getPageStyle() {
-		if(pageStyle == null) {
-			pageStyle = new  CSSPageStyleDelegate(this, getEngine());
-		}
-		return pageStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSPageX(){
-		int value = super.getPageX();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageX(), value)){
-			return value;
-		} else {
-			return getPageStyle().getCSSPageX();
-		}
-	}
-
-	public int getCSSPageY(){
-		int value = super.getPageY();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageY(), value)){
-			return value;
-		} else {
-			return getPageStyle().getCSSPageY();
-		}
-	}
-
-	public int getCSSPageWidth(){
-		int value = super.getPageWidth();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageWidth(), value)){
-			return value;
-		} else {
-			return getPageStyle().getCSSPageWidth();
-		}
-	}
-
-	public int getCSSPageHeight(){
-		int value = super.getPageHeight();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getPageStyle_PageHeight(), value)){
-			return value;
-		} else {
-			return getPageStyle().getCSSPageHeight();
-		}
-	}
-
-
-	@Override
-	public int getPageX(){
-		//return super.getPageX();
-		return getCSSPageX();
-	}
-
-	@Override
-	public int getPageY(){
-		//return super.getPageY();
-		return getCSSPageY();
-	}
-
-	@Override
-	public int getPageWidth(){
-		//return super.getPageWidth();
-		return getCSSPageWidth();
-	}
-
-	@Override
-	public int getPageHeight(){
-		//return super.getPageHeight();
-		return getCSSPageHeight();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setPageX(int value){
-		super.setPageX(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageX();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setPageY(int value){
-		super.setPageY(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageY();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setPageWidth(int value){
-		super.setPageWidth(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageWidth();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setPageHeight(int value){
-		super.setPageHeight(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageHeight();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSPropertiesSetStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSPropertiesSetStyleImpl.java
deleted file mode 100644
index 30ffdecd8b1..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSPropertiesSetStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.PropertiesSetStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSPropertiesSetStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSPropertiesSetStyleDelegate;
-
-public class CSSPropertiesSetStyleImpl extends PropertiesSetStyleImpl implements CSSPropertiesSetStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSPropertiesSetStyle propertiesSetStyle;
-
-	protected CSSPropertiesSetStyle getPropertiesSetStyle() {
-		if(propertiesSetStyle == null) {
-			propertiesSetStyle = new  CSSPropertiesSetStyleDelegate(this, getEngine());
-		}
-		return propertiesSetStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public java.lang.String getCSSName(){
-		java.lang.String value = super.getName();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getNamedStyle_Name(), value)){
-			return value;
-		} else {
-			return getPropertiesSetStyle().getCSSName();
-		}
-	}
-
-
-	@Override
-	public java.lang.String getName(){
-		//return super.getName();
-		return getCSSName();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setName(java.lang.String value){
-		super.setName(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getNamedStyle_Name();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSRoundedCornersStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSRoundedCornersStyleImpl.java
deleted file mode 100644
index a7d930c6235..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSRoundedCornersStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.RoundedCornersStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSRoundedCornersStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSRoundedCornersStyleDelegate;
-
-public class CSSRoundedCornersStyleImpl extends RoundedCornersStyleImpl implements CSSRoundedCornersStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSRoundedCornersStyle roundedCornersStyle;
-
-	protected CSSRoundedCornersStyle getRoundedCornersStyle() {
-		if(roundedCornersStyle == null) {
-			roundedCornersStyle = new  CSSRoundedCornersStyleDelegate(this, getEngine());
-		}
-		return roundedCornersStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSRoundedBendpointsRadius(){
-		int value = super.getRoundedBendpointsRadius();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius(), value)){
-			return value;
-		} else {
-			return getRoundedCornersStyle().getCSSRoundedBendpointsRadius();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setRoundedBendpointsRadius(int value){
-		super.setRoundedBendpointsRadius(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSRoutingStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSRoutingStyleImpl.java
deleted file mode 100644
index e97e9da0f62..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSRoutingStyleImpl.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.RoutingStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSRoutingStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSRoutingStyleDelegate;
-
-public class CSSRoutingStyleImpl extends RoutingStyleImpl implements CSSRoutingStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSRoutingStyle routingStyle;
-
-	protected CSSRoutingStyle getRoutingStyle() {
-		if(routingStyle == null) {
-			routingStyle = new  CSSRoutingStyleDelegate(this, getEngine());
-		}
-		return routingStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSRoundedBendpointsRadius(){
-		int value = super.getRoundedBendpointsRadius();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().getCSSRoundedBendpointsRadius();
-		}
-	}
-
-	public Routing getCSSRouting(){
-		Routing value = super.getRouting();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_Routing(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().getCSSRouting();
-		}
-	}
-
-	public Smoothness getCSSSmoothness(){
-		Smoothness value = super.getSmoothness();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_Smoothness(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().getCSSSmoothness();
-		}
-	}
-
-	public boolean isCSSAvoidObstructions(){
-		boolean value = super.isAvoidObstructions();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().isCSSAvoidObstructions();
-		}
-	}
-
-	public boolean isCSSClosestDistance(){
-		boolean value = super.isClosestDistance();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().isCSSClosestDistance();
-		}
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus(){
-		JumpLinkStatus value = super.getJumpLinkStatus();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().getCSSJumpLinkStatus();
-		}
-	}
-
-	public JumpLinkType getCSSJumpLinkType(){
-		JumpLinkType value = super.getJumpLinkType();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().getCSSJumpLinkType();
-		}
-	}
-
-	public boolean isCSSJumpLinksReverse(){
-		boolean value = super.isJumpLinksReverse();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse(), value)){
-			return value;
-		} else {
-			return getRoutingStyle().isCSSJumpLinksReverse();
-		}
-	}
-
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-	@Override
-	public Routing getRouting(){
-		//return super.getRouting();
-		return getCSSRouting();
-	}
-
-	@Override
-	public Smoothness getSmoothness(){
-		//return super.getSmoothness();
-		return getCSSSmoothness();
-	}
-
-	@Override
-	public boolean isAvoidObstructions(){
-		//return super.isAvoidObstructions();
-		return isCSSAvoidObstructions();
-	}
-
-	@Override
-	public boolean isClosestDistance(){
-		//return super.isClosestDistance();
-		return isCSSClosestDistance();
-	}
-
-	@Override
-	public JumpLinkStatus getJumpLinkStatus(){
-		//return super.getJumpLinkStatus();
-		return getCSSJumpLinkStatus();
-	}
-
-	@Override
-	public JumpLinkType getJumpLinkType(){
-		//return super.getJumpLinkType();
-		return getCSSJumpLinkType();
-	}
-
-	@Override
-	public boolean isJumpLinksReverse(){
-		//return super.isJumpLinksReverse();
-		return isCSSJumpLinksReverse();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setRoundedBendpointsRadius(int value){
-		super.setRoundedBendpointsRadius(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setRouting(Routing value){
-		super.setRouting(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_Routing();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setSmoothness(Smoothness value){
-		super.setSmoothness(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_Smoothness();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setAvoidObstructions(boolean value){
-		super.setAvoidObstructions(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setClosestDistance(boolean value){
-		super.setClosestDistance(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setJumpLinkStatus(JumpLinkStatus value){
-		super.setJumpLinkStatus(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setJumpLinkType(JumpLinkType value){
-		super.setJumpLinkType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setJumpLinksReverse(boolean value){
-		super.setJumpLinksReverse(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java
deleted file mode 100644
index 132c94b14de..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSemanticListCompartmentImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Sorting;
-import org.eclipse.gmf.runtime.notation.impl.SemanticListCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDrawerStyleDelegate;
-
-public class CSSSemanticListCompartmentImpl extends SemanticListCompartmentImpl implements CSSDrawerStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDrawerStyle drawerStyle;
-
-	protected CSSDrawerStyle getDrawerStyle() {
-		if(drawerStyle == null) {
-			drawerStyle = new  CSSDrawerStyleDelegate(this, getEngine());
-		}
-		return drawerStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {		
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSCollapsed(){
-		boolean value = super.isCollapsed();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getDrawerStyle_Collapsed(), value)){
-			return value;
-		} else {
-			return getDrawerStyle().isCSSCollapsed();
-		}
-	}
-
-
-	@Override
-	public boolean isCollapsed(){
-		//return super.isCollapsed();
-		return isCSSCollapsed();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value){
-		super.setVisible(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value){
-		super.setType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value){
-		super.setMutable(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setCollapsed(boolean value){
-		super.setCollapsed(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setSorting(Sorting value){
-		super.setSorting(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getSortingStyle_Sorting();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setSortingKeys(java.util.Map value){
-		super.setSortingKeys(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getSortingStyle_SortingKeys();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFiltering(Filtering value){
-		super.setFiltering(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFilteringStyle_Filtering();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFilteringKeys(java.util.List value){
-		super.setFilteringKeys(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setShowTitle(boolean value){
-		super.setShowTitle(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getTitleStyle_ShowTitle();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(this, feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java
deleted file mode 100644
index 28fe6143d1d..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeImpl.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.ShapeImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSShapeStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSShapeStyleDelegate;
-
-public class CSSShapeImpl extends ShapeImpl implements CSSShapeStyle, CustomStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSShapeStyle shapeStyle;
-
-	private CustomStyle customStyle;
-
-	protected CSSShapeStyle getShapeStyle() {
-		if(shapeStyle == null) {
-			shapeStyle = new CSSShapeStyleDelegate(this, getEngine());
-		}
-		return shapeStyle;
-	}
-
-	protected CustomStyle getCustomStyle() {
-		if(customStyle == null) {
-			customStyle = new CSSCustomStyleDelegate(this, getEngine());
-		}
-		return customStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSFontColor() {
-		int value = super.getFontColor();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFontStyle_FontColor(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSFontColor();
-		}
-	}
-
-	public java.lang.String getCSSFontName() {
-		java.lang.String value = super.getFontName();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFontStyle_FontName(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSFontName();
-		}
-	}
-
-	public int getCSSFontHeight() {
-		int value = super.getFontHeight();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFontStyle_FontHeight(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSFontHeight();
-		}
-	}
-
-	public boolean isCSSBold() {
-		boolean value = super.isBold();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFontStyle_Bold(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().isCSSBold();
-		}
-	}
-
-	public boolean isCSSItalic() {
-		boolean value = super.isItalic();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFontStyle_Italic(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().isCSSItalic();
-		}
-	}
-
-	public boolean isCSSUnderline() {
-		boolean value = super.isUnderline();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFontStyle_Underline(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().isCSSUnderline();
-		}
-	}
-
-	public boolean isCSSStrikeThrough() {
-		boolean value = super.isStrikeThrough();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFontStyle_StrikeThrough(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().isCSSStrikeThrough();
-		}
-	}
-
-	public java.lang.String getCSSDescription() {
-		java.lang.String value = super.getDescription();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getDescriptionStyle_Description(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSDescription();
-		}
-	}
-
-	public int getCSSFillColor() {
-		int value = super.getFillColor();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFillStyle_FillColor(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSFillColor();
-		}
-	}
-
-	public int getCSSTransparency() {
-		int value = super.getTransparency();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFillStyle_Transparency(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSTransparency();
-		}
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient() {
-		org.eclipse.gmf.runtime.notation.datatype.GradientData value = super.getGradient();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getFillStyle_Gradient(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSGradient();
-		}
-	}
-
-	public int getCSSLineColor() {
-		int value = super.getLineColor();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getLineStyle_LineColor(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth() {
-		int value = super.getLineWidth();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getLineStyle_LineWidth(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSLineWidth();
-		}
-	}
-
-	public int getCSSRoundedBendpointsRadius() {
-		int value = super.getRoundedBendpointsRadius();
-
-		if(ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius(), value)) {
-			return value;
-		} else {
-			return getShapeStyle().getCSSRoundedBendpointsRadius();
-		}
-	}
-
-
-	@Override
-	public int getFontColor() {
-		//return super.getFontColor();
-		return getCSSFontColor();
-	}
-
-	@Override
-	public java.lang.String getFontName() {
-		//return super.getFontName();
-		return getCSSFontName();
-	}
-
-	@Override
-	public int getFontHeight() {
-		//return super.getFontHeight();
-		return getCSSFontHeight();
-	}
-
-	@Override
-	public boolean isBold() {
-		//return super.isBold();
-		return isCSSBold();
-	}
-
-	@Override
-	public boolean isItalic() {
-		//return super.isItalic();
-		return isCSSItalic();
-	}
-
-	@Override
-	public boolean isUnderline() {
-		//return super.isUnderline();
-		return isCSSUnderline();
-	}
-
-	@Override
-	public boolean isStrikeThrough() {
-		//return super.isStrikeThrough();
-		return isCSSStrikeThrough();
-	}
-
-	@Override
-	public java.lang.String getDescription() {
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-	@Override
-	public int getFillColor() {
-		//return super.getFillColor();
-		return getCSSFillColor();
-	}
-
-	@Override
-	public int getTransparency() {
-		//return super.getTransparency();
-		return getCSSTransparency();
-	}
-
-	@Override
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient() {
-		//return super.getGradient();
-		return getCSSGradient();
-	}
-
-	@Override
-	public int getLineColor() {
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth() {
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-	@Override
-	public int getRoundedBendpointsRadius() {
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value) {
-		super.setVisible(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value) {
-		super.setType(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value) {
-		super.setMutable(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFontColor(int value) {
-		super.setFontColor(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontColor();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFontName(java.lang.String value) {
-		super.setFontName(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontName();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFontHeight(int value) {
-		super.setFontHeight(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontHeight();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setBold(boolean value) {
-		super.setBold(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Bold();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setItalic(boolean value) {
-		super.setItalic(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Italic();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setUnderline(boolean value) {
-		super.setUnderline(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Underline();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setStrikeThrough(boolean value) {
-		super.setStrikeThrough(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_StrikeThrough();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setDescription(java.lang.String value) {
-		super.setDescription(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDescriptionStyle_Description();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setFillColor(int value) {
-		super.setFillColor(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_FillColor();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setTransparency(int value) {
-		super.setTransparency(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_Transparency();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setGradient(org.eclipse.gmf.runtime.notation.datatype.GradientData value) {
-		super.setGradient(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_Gradient();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setLineColor(int value) {
-		super.setLineColor(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineColor();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setLineWidth(int value) {
-		super.setLineWidth(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineWidth();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setRoundedBendpointsRadius(int value) {
-		super.setRoundedBendpointsRadius(value);
-
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		if(feature != null) {
-			ForceValueHelper.unsetValue(this, feature);
-		}
-	}
-
-	public boolean showElementIcon() {
-		return getCustomStyle().showElementIcon();
-	}
-
-	public int getQualifiedNameDepth() {
-		return getCustomStyle().getQualifiedNameDepth();
-	}
-
-	public boolean showShadow() {
-		return getCustomStyle().showShadow();
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeStyleImpl.java
deleted file mode 100644
index 40209121b56..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSShapeStyleImpl.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.ShapeStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSShapeStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSShapeStyleDelegate;
-
-public class CSSShapeStyleImpl extends ShapeStyleImpl implements CSSShapeStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSShapeStyle shapeStyle;
-
-	protected CSSShapeStyle getShapeStyle() {
-		if(shapeStyle == null) {
-			shapeStyle = new  CSSShapeStyleDelegate(this, getEngine());
-		}
-		return shapeStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSFontColor(){
-		int value = super.getFontColor();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_FontColor(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSFontColor();
-		}
-	}
-
-	public java.lang.String getCSSFontName(){
-		java.lang.String value = super.getFontName();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_FontName(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSFontName();
-		}
-	}
-
-	public int getCSSFontHeight(){
-		int value = super.getFontHeight();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_FontHeight(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSFontHeight();
-		}
-	}
-
-	public boolean isCSSBold(){
-		boolean value = super.isBold();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_Bold(), value)){
-			return value;
-		} else {
-			return getShapeStyle().isCSSBold();
-		}
-	}
-
-	public boolean isCSSItalic(){
-		boolean value = super.isItalic();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_Italic(), value)){
-			return value;
-		} else {
-			return getShapeStyle().isCSSItalic();
-		}
-	}
-
-	public boolean isCSSUnderline(){
-		boolean value = super.isUnderline();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_Underline(), value)){
-			return value;
-		} else {
-			return getShapeStyle().isCSSUnderline();
-		}
-	}
-
-	public boolean isCSSStrikeThrough(){
-		boolean value = super.isStrikeThrough();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFontStyle_StrikeThrough(), value)){
-			return value;
-		} else {
-			return getShapeStyle().isCSSStrikeThrough();
-		}
-	}
-
-	public java.lang.String getCSSDescription(){
-		java.lang.String value = super.getDescription();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getDescriptionStyle_Description(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSDescription();
-		}
-	}
-
-	public int getCSSFillColor(){
-		int value = super.getFillColor();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFillStyle_FillColor(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSFillColor();
-		}
-	}
-
-	public int getCSSTransparency(){
-		int value = super.getTransparency();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFillStyle_Transparency(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSTransparency();
-		}
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient(){
-		org.eclipse.gmf.runtime.notation.datatype.GradientData value = super.getGradient();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getFillStyle_Gradient(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSGradient();
-		}
-	}
-
-	public int getCSSLineColor(){
-		int value = super.getLineColor();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getLineStyle_LineColor(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSLineColor();
-		}
-	}
-
-	public int getCSSLineWidth(){
-		int value = super.getLineWidth();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getLineStyle_LineWidth(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSLineWidth();
-		}
-	}
-
-	public int getCSSRoundedBendpointsRadius(){
-		int value = super.getRoundedBendpointsRadius();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius(), value)){
-			return value;
-		} else {
-			return getShapeStyle().getCSSRoundedBendpointsRadius();
-		}
-	}
-
-
-	@Override
-	public int getFontColor(){
-		//return super.getFontColor();
-		return getCSSFontColor();
-	}
-
-	@Override
-	public java.lang.String getFontName(){
-		//return super.getFontName();
-		return getCSSFontName();
-	}
-
-	@Override
-	public int getFontHeight(){
-		//return super.getFontHeight();
-		return getCSSFontHeight();
-	}
-
-	@Override
-	public boolean isBold(){
-		//return super.isBold();
-		return isCSSBold();
-	}
-
-	@Override
-	public boolean isItalic(){
-		//return super.isItalic();
-		return isCSSItalic();
-	}
-
-	@Override
-	public boolean isUnderline(){
-		//return super.isUnderline();
-		return isCSSUnderline();
-	}
-
-	@Override
-	public boolean isStrikeThrough(){
-		//return super.isStrikeThrough();
-		return isCSSStrikeThrough();
-	}
-
-	@Override
-	public java.lang.String getDescription(){
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-	@Override
-	public int getFillColor(){
-		//return super.getFillColor();
-		return getCSSFillColor();
-	}
-
-	@Override
-	public int getTransparency(){
-		//return super.getTransparency();
-		return getCSSTransparency();
-	}
-
-	@Override
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getGradient(){
-		//return super.getGradient();
-		return getCSSGradient();
-	}
-
-	@Override
-	public int getLineColor(){
-		//return super.getLineColor();
-		return getCSSLineColor();
-	}
-
-	@Override
-	public int getLineWidth(){
-		//return super.getLineWidth();
-		return getCSSLineWidth();
-	}
-
-	@Override
-	public int getRoundedBendpointsRadius(){
-		//return super.getRoundedBendpointsRadius();
-		return getCSSRoundedBendpointsRadius();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setFontColor(int value){
-		super.setFontColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontColor();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setFontName(java.lang.String value){
-		super.setFontName(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontName();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setFontHeight(int value){
-		super.setFontHeight(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_FontHeight();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setBold(boolean value){
-		super.setBold(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Bold();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setItalic(boolean value){
-		super.setItalic(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Italic();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setUnderline(boolean value){
-		super.setUnderline(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_Underline();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setStrikeThrough(boolean value){
-		super.setStrikeThrough(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFontStyle_StrikeThrough();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setDescription(java.lang.String value){
-		super.setDescription(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDescriptionStyle_Description();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setFillColor(int value){
-		super.setFillColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_FillColor();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setTransparency(int value){
-		super.setTransparency(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_Transparency();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setGradient(org.eclipse.gmf.runtime.notation.datatype.GradientData value){
-		super.setGradient(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getFillStyle_Gradient();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setLineColor(int value){
-		super.setLineColor(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineColor();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setLineWidth(int value){
-		super.setLineWidth(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getLineStyle_LineWidth();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setRoundedBendpointsRadius(int value){
-		super.setRoundedBendpointsRadius(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSortingStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSortingStyleImpl.java
deleted file mode 100644
index b58437bec41..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSSortingStyleImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Sorting;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.SortingStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSSortingStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSSortingStyleDelegate;
-
-public class CSSSortingStyleImpl extends SortingStyleImpl implements CSSSortingStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSSortingStyle sortingStyle;
-
-	protected CSSSortingStyle getSortingStyle() {
-		if(sortingStyle == null) {
-			sortingStyle = new  CSSSortingStyleDelegate(this, getEngine());
-		}
-		return sortingStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public Sorting getCSSSorting(){
-		Sorting value = super.getSorting();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getSortingStyle_Sorting(), value)){
-			return value;
-		} else {
-			return getSortingStyle().getCSSSorting();
-		}
-	}
-
-	public java.util.Map getCSSSortingKeys(){
-		java.util.Map value = super.getSortingKeys();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getSortingStyle_SortingKeys(), value)){
-			return value;
-		} else {
-			return getSortingStyle().getCSSSortingKeys();
-		}
-	}
-
-
-	@Override
-	public Sorting getSorting(){
-		//return super.getSorting();
-		return getCSSSorting();
-	}
-
-	@Override
-	public java.util.Map getSortingKeys(){
-		//return super.getSortingKeys();
-		return getCSSSortingKeys();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setSorting(Sorting value){
-		super.setSorting(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getSortingStyle_Sorting();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	@Override
-	public void setSortingKeys(java.util.Map value){
-		super.setSortingKeys(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getSortingStyle_SortingKeys();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java
deleted file mode 100644
index a6d8b3cec04..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSStandardDiagramImpl.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.impl.StandardDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDiagramStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSDiagramStyleDelegate;
-
-public class CSSStandardDiagramImpl extends StandardDiagramImpl implements CSSDiagramStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSDiagramStyle diagramStyle;
-
-	protected CSSDiagramStyle getDiagramStyle() {
-		if(diagramStyle == null) {
-			diagramStyle = new  CSSDiagramStyleDelegate(this, getEngine());
-		}
-		return diagramStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine() {
-		if(engine == null) {		
-			engine = ((CSSDiagramImpl)getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public int getCSSPageX(){
-		int value = super.getPageX();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getPageStyle_PageX(), value)){
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageX();
-		}
-	}
-
-	public int getCSSPageY(){
-		int value = super.getPageY();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getPageStyle_PageY(), value)){
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageY();
-		}
-	}
-
-	public int getCSSPageWidth(){
-		int value = super.getPageWidth();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getPageStyle_PageWidth(), value)){
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageWidth();
-		}
-	}
-
-	public int getCSSPageHeight(){
-		int value = super.getPageHeight();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getPageStyle_PageHeight(), value)){
-			return value;
-		} else {
-			return getDiagramStyle().getCSSPageHeight();
-		}
-	}
-
-	public java.lang.String getCSSDescription(){
-		java.lang.String value = super.getDescription();
-
-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getDescriptionStyle_Description(), value)){
-			return value;
-		} else {
-			return getDiagramStyle().getCSSDescription();
-		}
-	}
-
-
-	@Override
-	public int getPageX(){
-		//return super.getPageX();
-		return getCSSPageX();
-	}
-
-	@Override
-	public int getPageY(){
-		//return super.getPageY();
-		return getCSSPageY();
-	}
-
-	@Override
-	public int getPageWidth(){
-		//return super.getPageWidth();
-		return getCSSPageWidth();
-	}
-
-	@Override
-	public int getPageHeight(){
-		//return super.getPageHeight();
-		return getCSSPageHeight();
-	}
-
-	@Override
-	public java.lang.String getDescription(){
-		//return super.getDescription();
-		return getCSSDescription();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setVisible(boolean value){
-		super.setVisible(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setType(java.lang.String value){
-		super.setType(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMutable(boolean value){
-		super.setMutable(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setName(java.lang.String value){
-		super.setName(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDiagram_Name();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setMeasurementUnit(MeasurementUnit value){
-		super.setMeasurementUnit(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDiagram_MeasurementUnit();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setPageX(int value){
-		super.setPageX(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageX();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setPageY(int value){
-		super.setPageY(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageY();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setPageWidth(int value){
-		super.setPageWidth(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageWidth();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setPageHeight(int value){
-		super.setPageHeight(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getPageStyle_PageHeight();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	@Override
-	public void setDescription(java.lang.String value){
-		super.setDescription(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getDescriptionStyle_Description();
-		ForceValueHelper.setValue(this, feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(this, feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSTextStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSTextStyleImpl.java
deleted file mode 100644
index 6e44a44ab1b..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSTextStyleImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.TextStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSTextStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSTextStyleDelegate;
-
-public class CSSTextStyleImpl extends TextStyleImpl implements CSSTextStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSTextStyle textStyle;
-
-	protected CSSTextStyle getTextStyle() {
-		if(textStyle == null) {
-			textStyle = new  CSSTextStyleDelegate(this, getEngine());
-		}
-		return textStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public TextAlignment getCSSTextAlignment(){
-		TextAlignment value = super.getTextAlignment();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getTextStyle_TextAlignment(), value)){
-			return value;
-		} else {
-			return getTextStyle().getCSSTextAlignment();
-		}
-	}
-
-
-	@Override
-	public TextAlignment getTextAlignment(){
-		//return super.getTextAlignment();
-		return getCSSTextAlignment();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setTextAlignment(TextAlignment value){
-		super.setTextAlignment(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getTextStyle_TextAlignment();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSTitleStyleImpl.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSTitleStyleImpl.java
deleted file mode 100644
index 4cc1a922ce4..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSTitleStyleImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.impl.TitleStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSTitleStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSTitleStyleDelegate;
-
-public class CSSTitleStyleImpl extends TitleStyleImpl implements CSSTitleStyle {
-
-	protected ExtendedCSSEngine engine;
-
-	private CSSTitleStyle titleStyle;
-
-	protected CSSTitleStyle getTitleStyle() {
-		if(titleStyle == null) {
-			titleStyle = new  CSSTitleStyleDelegate(this, getEngine());
-		}
-		return titleStyle;
-	}
-
-	protected ExtendedCSSEngine getEngine(){
-		if (engine == null){
-			engine = ((CSSDiagramImpl)findView().getDiagram()).getEngine();
-		}
-		return engine;
-	}
-
-	protected View findView(){
-		EObject parent = eContainer();
-		while (! (parent instanceof View) && parent != null){
-			parent = parent.eContainer();
-		}
-
-		if (parent != null){
-			return (View)parent;
-		}
-
-		return null;
-	}
-
-
-	//////////////////////////////////////////
-	//	Forwards accesses to CSS properties	//
-	//////////////////////////////////////////
-
-
-	public boolean isCSSShowTitle(){
-		boolean value = super.isShowTitle();
-
-		if (ForceValueHelper.isSet(findView(), this, NotationPackage.eINSTANCE.getTitleStyle_ShowTitle(), value)){
-			return value;
-		} else {
-			return getTitleStyle().isCSSShowTitle();
-		}
-	}
-
-
-	@Override
-	public boolean isShowTitle(){
-		//return super.isShowTitle();
-		return isCSSShowTitle();
-	}
-
-
-
-	////////////////////////////////////////////////
-	//	Implements a setter for each CSS property //
-	////////////////////////////////////////////////	
-
-	@Override
-	public void setShowTitle(boolean value){
-		super.setShowTitle(value);
-	
-		EStructuralFeature feature = NotationPackage.eINSTANCE.getTitleStyle_ShowTitle();
-		ForceValueHelper.setValue(findView(), feature, value);
-	}
-
-	//////////////////////////////////
-	//	Implements the unset method //
-	//////////////////////////////////
-
-	@Override
-	public void eUnset(int featureId) {
-		super.eUnset(featureId);
-
-		EStructuralFeature feature = eDynamicFeature(featureId);
-		ForceValueHelper.unsetValue(findView(), feature);
-	}
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/factory/CSSNotationFactory.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/factory/CSSNotationFactory.java
deleted file mode 100644
index 21f9695faf5..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/factory/CSSNotationFactory.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.factory;
-
-import org.eclipse.gmf.runtime.notation.ArrowStyle;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
-import org.eclipse.gmf.runtime.notation.CanonicalStyle;
-import org.eclipse.gmf.runtime.notation.Compartment;
-import org.eclipse.gmf.runtime.notation.Connector;
-import org.eclipse.gmf.runtime.notation.ConnectorStyle;
-import org.eclipse.gmf.runtime.notation.DataTypeStyle;
-import org.eclipse.gmf.runtime.notation.DescriptionStyle;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.DiagramLinkStyle;
-import org.eclipse.gmf.runtime.notation.DiagramStyle;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.FilteringStyle;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.GuideStyle;
-import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
-import org.eclipse.gmf.runtime.notation.ImageBufferStyle;
-import org.eclipse.gmf.runtime.notation.ImageStyle;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.LineTypeStyle;
-import org.eclipse.gmf.runtime.notation.ListCompartment;
-import org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle;
-import org.eclipse.gmf.runtime.notation.NamedStyle;
-import org.eclipse.gmf.runtime.notation.PageStyle;
-import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
-import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.gmf.runtime.notation.SemanticListCompartment;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.SortingStyle;
-import org.eclipse.gmf.runtime.notation.StandardDiagram;
-import org.eclipse.gmf.runtime.notation.TextStyle;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.gmf.runtime.notation.impl.NotationFactoryImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSArrowStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSBasicCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSBasicSemanticCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSCanonicalStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSConnectorImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSConnectorStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSDataTypeStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSDescriptionStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSDiagramLinkStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSDiagramStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSDrawerStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSFillStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSFilteringStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSFontStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSGuideStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSHintedDiagramLinkStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSImageBufferStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSImageStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSLineStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSLineTypeStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSListCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSMultiDiagramLinkStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSNamedStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSPageStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSPropertiesSetStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSRoundedCornersStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSRoutingStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSSemanticListCompartmentImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSSortingStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSStandardDiagramImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSTextStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSTitleStyleImpl;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
-
-public class CSSNotationFactory extends NotationFactoryImpl {
-
-	public static CSSNotationFactory eINSTANCE = new CSSNotationFactory();
-
-	@Override
-	public Diagram createDiagram() {
-		return new CSSDiagramImpl();
-	}
-
-	@Override
-	public FillStyle createFillStyle() {
-		return new CSSFillStyleImpl();
-	}
-
-	@Override
-	public LineStyle createLineStyle() {
-		return new CSSLineStyleImpl();
-	}
-
-	@Override
-	public FontStyle createFontStyle() {
-		return new CSSFontStyleImpl();
-	}
-
-	@Override
-	public TitleStyle createTitleStyle() {
-		return new CSSTitleStyleImpl();
-	}
-
-	@Override
-	public SortingStyle createSortingStyle() {
-		return new CSSSortingStyleImpl();
-	}
-
-	@Override
-	public DescriptionStyle createDescriptionStyle() {
-		return new CSSDescriptionStyleImpl();
-	}
-
-	@Override
-	public RoutingStyle createRoutingStyle() {
-		return new CSSRoutingStyleImpl();
-	}
-
-	@Override
-	public CanonicalStyle createCanonicalStyle() {
-		return new CSSCanonicalStyleImpl();
-	}
-
-	@Override
-	public ShapeStyle createShapeStyle() {
-		return new CSSShapeStyleImpl();
-	}
-
-	@Override
-	public ConnectorStyle createConnectorStyle() {
-		return new CSSConnectorStyleImpl();
-	}
-
-	@Override
-	public PageStyle createPageStyle() {
-		return new CSSPageStyleImpl();
-	}
-
-	@Override
-	public DrawerStyle createDrawerStyle() {
-		return new CSSDrawerStyleImpl();
-	}
-
-	@Override
-	public GuideStyle createGuideStyle() {
-		return new CSSGuideStyleImpl();
-	}
-
-	@Override
-	public FilteringStyle createFilteringStyle() {
-		return new CSSFilteringStyleImpl();
-	}
-
-	@Override
-	public DiagramStyle createDiagramStyle() {
-		return new CSSDiagramStyleImpl();
-	}
-
-	@Override
-	public ImageStyle createImageStyle() {
-		return new CSSImageStyleImpl();
-	}
-
-	@Override
-	public ImageBufferStyle createImageBufferStyle() {
-		return new CSSImageBufferStyleImpl();
-	}
-
-	@Override
-	public PropertiesSetStyle createPropertiesSetStyle() {
-		return new CSSPropertiesSetStyleImpl();
-	}
-
-	@Override
-	public NamedStyle createNamedStyle() {
-		return new CSSNamedStyleImpl();
-	}
-
-	@Override
-	public DataTypeStyle createDataTypeStyle() {
-		return new CSSDataTypeStyleImpl();
-	}
-
-	@Override
-	public HintedDiagramLinkStyle createHintedDiagramLinkStyle() {
-		return new CSSHintedDiagramLinkStyleImpl();
-	}
-
-	@Override
-	public DiagramLinkStyle createDiagramLinkStyle() {
-		return new CSSDiagramLinkStyleImpl();
-	}
-
-	@Override
-	public MultiDiagramLinkStyle createMultiDiagramLinkStyle() {
-		return new CSSMultiDiagramLinkStyleImpl();
-	}
-
-	@Override
-	public TextStyle createTextStyle() {
-		return new CSSTextStyleImpl();
-	}
-
-	@Override
-	public LineTypeStyle createLineTypeStyle() {
-		return new CSSLineTypeStyleImpl();
-	}
-
-	@Override
-	public ArrowStyle createArrowStyle() {
-		return new CSSArrowStyleImpl();
-	}
-
-	@Override
-	public Shape createShape() {
-		return new CSSShapeImpl();
-	}
-
-	@Override
-	public Compartment createCompartment() {
-		return new CSSCompartmentImpl();
-	}
-
-	@Override
-	public ListCompartment createListCompartment() {
-		return new CSSListCompartmentImpl();
-	}
-
-	@Override
-	public Connector createConnector() {
-		return new CSSConnectorImpl();
-	}
-
-	@Override
-	public StandardDiagram createStandardDiagram() {
-		return new CSSStandardDiagramImpl();
-	}
-
-	@Override
-	public BasicCompartment createBasicCompartment() {
-		return new CSSBasicCompartmentImpl();
-	}
-
-	@Override
-	public BasicSemanticCompartment createBasicSemanticCompartment() {
-		return new CSSBasicSemanticCompartmentImpl();
-	}
-
-	@Override
-	public SemanticListCompartment createSemanticListCompartment() {
-		return new CSSSemanticListCompartmentImpl();
-	}
-
-	@Override
-	public RoundedCornersStyle createRoundedCornersStyle() {
-		return new CSSRoundedCornersStyleImpl();
-	}
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSArrowStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSArrowStyle.java
deleted file mode 100644
index fbb6e165f43..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSArrowStyle.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.ArrowType;
-
-public interface CSSArrowStyle {
-
-	public ArrowType getCSSArrowSource();
-
-
-	public ArrowType getCSSArrowTarget();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSCanonicalStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSCanonicalStyle.java
deleted file mode 100644
index b1ee98c8e62..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSCanonicalStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSCanonicalStyle {
-
-	public boolean isCSSCanonical();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSConnectorStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSConnectorStyle.java
deleted file mode 100644
index 9f50152b2c2..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSConnectorStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSConnectorStyle extends CSSRoundedCornersStyle, CSSRoutingStyle, CSSLineStyle{
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDataTypeStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDataTypeStyle.java
deleted file mode 100644
index 2868401218a..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDataTypeStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSDataTypeStyle extends CSSNamedStyle{
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDescriptionStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDescriptionStyle.java
deleted file mode 100644
index 88e5cfb06d8..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDescriptionStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSDescriptionStyle {
-
-	public java.lang.String getCSSDescription();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDiagramLinkStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDiagramLinkStyle.java
deleted file mode 100644
index 0db0b204e8c..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDiagramLinkStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSDiagramLinkStyle {
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDiagramStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDiagramStyle.java
deleted file mode 100644
index f170fac480a..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDiagramStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSDiagramStyle extends CSSPageStyle, CSSGuideStyle, CSSDescriptionStyle{
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDrawerStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDrawerStyle.java
deleted file mode 100644
index 1ec950900f5..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSDrawerStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSDrawerStyle {
-
-	public boolean isCSSCollapsed();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFillStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFillStyle.java
deleted file mode 100644
index fd6a89219b0..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFillStyle.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSFillStyle {
-
-	public int getCSSFillColor();
-
-
-	public int getCSSTransparency();
-
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFilteringStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFilteringStyle.java
deleted file mode 100644
index 2de3c9f3b32..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFilteringStyle.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.Filtering;
-
-public interface CSSFilteringStyle {
-
-	public Filtering getCSSFiltering();
-
-
-	public java.util.List getCSSFilteringKeys();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFontStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFontStyle.java
deleted file mode 100644
index 027d267e8b6..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSFontStyle.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-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/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSGuideStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSGuideStyle.java
deleted file mode 100644
index 32181eb4f1e..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSGuideStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSGuideStyle {
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSHintedDiagramLinkStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSHintedDiagramLinkStyle.java
deleted file mode 100644
index ecb8ec897fb..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSHintedDiagramLinkStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSHintedDiagramLinkStyle extends CSSDiagramLinkStyle{
-
-	public java.lang.String getCSSHint();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSImageBufferStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSImageBufferStyle.java
deleted file mode 100644
index 5c3a842084a..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSImageBufferStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSImageBufferStyle extends CSSImageStyle{
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSImageStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSImageStyle.java
deleted file mode 100644
index b8beaa6496b..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSImageStyle.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSImageStyle {
-
-	public java.lang.Boolean getCSSAntiAlias();
-
-
-	public java.lang.Boolean getCSSMaintainAspectRatio();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSLineStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSLineStyle.java
deleted file mode 100644
index 270f27ca46b..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSLineStyle.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSLineStyle {
-
-	public int getCSSLineColor();
-
-
-	public int getCSSLineWidth();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSLineTypeStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSLineTypeStyle.java
deleted file mode 100644
index 0184f72e80e..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSLineTypeStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.LineType;
-
-public interface CSSLineTypeStyle {
-
-	public LineType getCSSLineType();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSMultiDiagramLinkStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSMultiDiagramLinkStyle.java
deleted file mode 100644
index 964bb81e747..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSMultiDiagramLinkStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSMultiDiagramLinkStyle {
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSNamedStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSNamedStyle.java
deleted file mode 100644
index e3a61075cf3..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSNamedStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSNamedStyle {
-
-	public java.lang.String getCSSName();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSPageStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSPageStyle.java
deleted file mode 100644
index ee993dca5ef..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSPageStyle.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSPageStyle {
-
-	public int getCSSPageX();
-
-
-	public int getCSSPageY();
-
-
-	public int getCSSPageWidth();
-
-
-	public int getCSSPageHeight();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSPropertiesSetStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSPropertiesSetStyle.java
deleted file mode 100644
index 10e7c9eec5a..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSPropertiesSetStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSPropertiesSetStyle extends CSSNamedStyle{
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSRoundedCornersStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSRoundedCornersStyle.java
deleted file mode 100644
index 2f08a0fefb0..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSRoundedCornersStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSRoundedCornersStyle {
-
-	public int getCSSRoundedBendpointsRadius();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSRoutingStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSRoutingStyle.java
deleted file mode 100644
index 9d4d5508f72..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSRoutingStyle.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-
-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/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSShapeStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSShapeStyle.java
deleted file mode 100644
index 930e30b4ab7..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSShapeStyle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSShapeStyle extends CSSFontStyle, CSSDescriptionStyle, CSSFillStyle, CSSLineStyle, CSSRoundedCornersStyle{
-
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSSortingStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSSortingStyle.java
deleted file mode 100644
index f0ef31f175f..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSSortingStyle.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.Sorting;
-
-public interface CSSSortingStyle {
-
-	public Sorting getCSSSorting();
-
-
-	public java.util.Map getCSSSortingKeys();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSTextStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSTextStyle.java
deleted file mode 100644
index 9be4935f83b..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSTextStyle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-
-public interface CSSTextStyle {
-
-	public TextAlignment getCSSTextAlignment();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSTitleStyle.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSTitleStyle.java
deleted file mode 100644
index ca35bb83871..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSTitleStyle.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style;
-
-
-public interface CSSTitleStyle {
-
-	public boolean isCSSShowTitle();
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSArrowStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSArrowStyleDelegate.java
deleted file mode 100644
index 00c2db80d43..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSArrowStyleDelegate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.ArrowStyle;
-import org.eclipse.gmf.runtime.notation.ArrowType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSArrowStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSArrowStyleDelegate implements CSSArrowStyle {
-
-	private ArrowStyle arrowStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSArrowStyleDelegate(ArrowStyle arrowStyle, ExtendedCSSEngine engine) {
-		this.arrowStyle = arrowStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public ArrowType getCSSArrowSource() {
-		CSSValue cssValue = engine.retrievePropertyValue(arrowStyle, "arrowSource");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getArrowStyle_ArrowSource().getDefaultValue();
-			return (ArrowType)defaultValue;
-		}
-		return ArrowType.get(cssValue.getCssText());
-	}
-
-	public ArrowType getCSSArrowTarget() {
-		CSSValue cssValue = engine.retrievePropertyValue(arrowStyle, "arrowTarget");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getArrowStyle_ArrowTarget().getDefaultValue();
-			return (ArrowType)defaultValue;
-		}
-		return ArrowType.get(cssValue.getCssText());
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSCanonicalStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSCanonicalStyleDelegate.java
deleted file mode 100644
index 9fbc8650e84..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSCanonicalStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.CanonicalStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSCanonicalStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSCanonicalStyleDelegate implements CSSCanonicalStyle {
-
-	private CanonicalStyle canonicalStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSCanonicalStyleDelegate(CanonicalStyle canonicalStyle, ExtendedCSSEngine engine) {
-		this.canonicalStyle = canonicalStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public boolean isCSSCanonical() {
-		CSSValue cssValue = engine.retrievePropertyValue(canonicalStyle, "canonical");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getCanonicalStyle_Canonical().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSConnectorStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSConnectorStyleDelegate.java
deleted file mode 100644
index e32d67fb72b..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSConnectorStyleDelegate.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.ConnectorStyle;
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSConnectorStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSConnectorStyleDelegate implements CSSConnectorStyle {
-
-	private ConnectorStyle connectorStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSConnectorStyleDelegate(ConnectorStyle connectorStyle, ExtendedCSSEngine engine) {
-		this.connectorStyle = connectorStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "roundedBendpointsRadius");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public Routing getCSSRouting() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "routing");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Routing().getDefaultValue();
-			return (Routing)defaultValue;
-		}
-		return Routing.get(cssValue.getCssText());
-	}
-
-	public Smoothness getCSSSmoothness() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "smoothness");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Smoothness().getDefaultValue();
-			return (Smoothness)defaultValue;
-		}
-		return Smoothness.get(cssValue.getCssText());
-	}
-
-	public boolean isCSSAvoidObstructions() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "avoidObstructions");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSClosestDistance() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "closestDistance");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "jumpLinkStatus");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus().getDefaultValue();
-			return (JumpLinkStatus)defaultValue;
-		}
-		return JumpLinkStatus.get(cssValue.getCssText());
-	}
-
-	public JumpLinkType getCSSJumpLinkType() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "jumpLinkType");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType().getDefaultValue();
-			return (JumpLinkType)defaultValue;
-		}
-		return JumpLinkType.get(cssValue.getCssText());
-	}
-
-	public boolean isCSSJumpLinksReverse() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "jumpLinksReverse");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public int getCSSLineColor() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "lineColor");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineColor().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, "GMFColor", null);
-	}
-
-	public int getCSSLineWidth() {
-		CSSValue cssValue = engine.retrievePropertyValue(connectorStyle, "lineWidth");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDataTypeStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDataTypeStyleDelegate.java
deleted file mode 100644
index 11747c803c5..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDataTypeStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.DataTypeStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDataTypeStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSDataTypeStyleDelegate implements CSSDataTypeStyle {
-
-	private DataTypeStyle dataTypeStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSDataTypeStyleDelegate(DataTypeStyle dataTypeStyle, ExtendedCSSEngine engine) {
-		this.dataTypeStyle = dataTypeStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName() {
-		CSSValue cssValue = engine.retrievePropertyValue(dataTypeStyle, "name");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDescriptionStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDescriptionStyleDelegate.java
deleted file mode 100644
index 9cf85f7ef02..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDescriptionStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.DescriptionStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDescriptionStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSDescriptionStyleDelegate implements CSSDescriptionStyle {
-
-	private DescriptionStyle descriptionStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSDescriptionStyleDelegate(DescriptionStyle descriptionStyle, ExtendedCSSEngine engine) {
-		this.descriptionStyle = descriptionStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSDescription() {
-		CSSValue cssValue = engine.retrievePropertyValue(descriptionStyle, "description");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getDescriptionStyle_Description().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDiagramLinkStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDiagramLinkStyleDelegate.java
deleted file mode 100644
index 5c3f276b80d..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDiagramLinkStyleDelegate.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.DiagramLinkStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDiagramLinkStyle;
-
-public class CSSDiagramLinkStyleDelegate implements CSSDiagramLinkStyle {
-
-	private DiagramLinkStyle diagramLinkStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSDiagramLinkStyleDelegate(DiagramLinkStyle diagramLinkStyle, ExtendedCSSEngine engine) {
-		this.diagramLinkStyle = diagramLinkStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDiagramStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDiagramStyleDelegate.java
deleted file mode 100644
index 74a03e1d251..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDiagramStyleDelegate.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.DiagramStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDiagramStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSDiagramStyleDelegate implements CSSDiagramStyle {
-
-	private DiagramStyle diagramStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSDiagramStyleDelegate(DiagramStyle diagramStyle, ExtendedCSSEngine engine) {
-		this.diagramStyle = diagramStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSPageX() {
-		CSSValue cssValue = engine.retrievePropertyValue(diagramStyle, "pageX");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageX().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public int getCSSPageY() {
-		CSSValue cssValue = engine.retrievePropertyValue(diagramStyle, "pageY");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageY().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public int getCSSPageWidth() {
-		CSSValue cssValue = engine.retrievePropertyValue(diagramStyle, "pageWidth");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public int getCSSPageHeight() {
-		CSSValue cssValue = engine.retrievePropertyValue(diagramStyle, "pageHeight");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageHeight().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public java.lang.String getCSSDescription() {
-		CSSValue cssValue = engine.retrievePropertyValue(diagramStyle, "description");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getDescriptionStyle_Description().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDrawerStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDrawerStyleDelegate.java
deleted file mode 100644
index a12158362ed..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSDrawerStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSDrawerStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSDrawerStyleDelegate implements CSSDrawerStyle {
-
-	private DrawerStyle drawerStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSDrawerStyleDelegate(DrawerStyle drawerStyle, ExtendedCSSEngine engine) {
-		this.drawerStyle = drawerStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public boolean isCSSCollapsed() {
-		CSSValue cssValue = engine.retrievePropertyValue(drawerStyle, "collapsed");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getDrawerStyle_Collapsed().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFillStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFillStyleDelegate.java
deleted file mode 100644
index cf8e083cfa3..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFillStyleDelegate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.helper.GradientHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSFillStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSFillStyleDelegate implements CSSFillStyle {
-
-	private FillStyle fillStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSFillStyleDelegate(FillStyle fillStyle, ExtendedCSSEngine engine) {
-		this.fillStyle = fillStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSFillColor() {
-		CSSValue cssValue = engine.retrievePropertyValue(fillStyle, "fillColor");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_FillColor().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, "GMFColor", null);
-	}
-
-	public int getCSSTransparency() {
-		CSSValue cssValue = engine.retrievePropertyValue(fillStyle, "transparency");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_Transparency().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient() {
-		return GradientHelper.computeGradient(engine, fillStyle);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFilteringStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFilteringStyleDelegate.java
deleted file mode 100644
index 9bcf85bb90d..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFilteringStyleDelegate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.FilteringStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSFilteringStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSFilteringStyleDelegate implements CSSFilteringStyle {
-
-	private FilteringStyle filteringStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSFilteringStyleDelegate(FilteringStyle filteringStyle, ExtendedCSSEngine engine) {
-		this.filteringStyle = filteringStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public Filtering getCSSFiltering() {
-		CSSValue cssValue = engine.retrievePropertyValue(filteringStyle, "filtering");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFilteringStyle_Filtering().getDefaultValue();
-			return (Filtering)defaultValue;
-		}
-		return Filtering.get(cssValue.getCssText());
-	}
-
-	public java.util.List getCSSFilteringKeys() {
-		CSSValue cssValue = engine.retrievePropertyValue(filteringStyle, "filteringKeys");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys().getDefaultValue();
-			return (java.util.List)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFontStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFontStyleDelegate.java
deleted file mode 100644
index 4e90054981d..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSFontStyleDelegate.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSFontStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSFontStyleDelegate implements CSSFontStyle {
-
-	private FontStyle fontStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSFontStyleDelegate(FontStyle fontStyle, ExtendedCSSEngine engine) {
-		this.fontStyle = fontStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSFontColor() {
-		CSSValue cssValue = engine.retrievePropertyValue(fontStyle, "fontColor");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontColor().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, "GMFColor", null);
-	}
-
-	public java.lang.String getCSSFontName() {
-		CSSValue cssValue = engine.retrievePropertyValue(fontStyle, "fontName");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontName().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-
-	public int getCSSFontHeight() {
-		CSSValue cssValue = engine.retrievePropertyValue(fontStyle, "fontHeight");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontHeight().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public boolean isCSSBold() {
-		CSSValue cssValue = engine.retrievePropertyValue(fontStyle, "bold");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Bold().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSItalic() {
-		CSSValue cssValue = engine.retrievePropertyValue(fontStyle, "italic");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Italic().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSUnderline() {
-		CSSValue cssValue = engine.retrievePropertyValue(fontStyle, "underline");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Underline().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSStrikeThrough() {
-		CSSValue cssValue = engine.retrievePropertyValue(fontStyle, "strikeThrough");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSGuideStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSGuideStyleDelegate.java
deleted file mode 100644
index b486201d060..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSGuideStyleDelegate.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.GuideStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSGuideStyle;
-
-public class CSSGuideStyleDelegate implements CSSGuideStyle {
-
-	private GuideStyle guideStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSGuideStyleDelegate(GuideStyle guideStyle, ExtendedCSSEngine engine) {
-		this.guideStyle = guideStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSHintedDiagramLinkStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSHintedDiagramLinkStyleDelegate.java
deleted file mode 100644
index eaf7a3554a2..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSHintedDiagramLinkStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSHintedDiagramLinkStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSHintedDiagramLinkStyleDelegate implements CSSHintedDiagramLinkStyle {
-
-	private HintedDiagramLinkStyle hintedDiagramLinkStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSHintedDiagramLinkStyleDelegate(HintedDiagramLinkStyle hintedDiagramLinkStyle, ExtendedCSSEngine engine) {
-		this.hintedDiagramLinkStyle = hintedDiagramLinkStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSHint() {
-		CSSValue cssValue = engine.retrievePropertyValue(hintedDiagramLinkStyle, "hint");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getHintedDiagramLinkStyle_Hint().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageBufferStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageBufferStyleDelegate.java
deleted file mode 100644
index 0338871689e..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageBufferStyleDelegate.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.ImageBufferStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageBufferStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSImageBufferStyleDelegate implements CSSImageBufferStyle {
-
-	private ImageBufferStyle imageBufferStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSImageBufferStyleDelegate(ImageBufferStyle imageBufferStyle, ExtendedCSSEngine engine) {
-		this.imageBufferStyle = imageBufferStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.Boolean getCSSAntiAlias() {
-		CSSValue cssValue = engine.retrievePropertyValue(imageBufferStyle, "antiAlias");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue();
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio() {
-		CSSValue cssValue = engine.retrievePropertyValue(imageBufferStyle, "maintainAspectRatio");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue();
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageStyleDelegate.java
deleted file mode 100644
index 848cefac75a..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageStyleDelegate.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.ImageStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSImageStyleDelegate implements CSSImageStyle {
-
-	private ImageStyle imageStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSImageStyleDelegate(ImageStyle imageStyle, ExtendedCSSEngine engine) {
-		this.imageStyle = imageStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.Boolean getCSSAntiAlias() {
-		CSSValue cssValue = engine.retrievePropertyValue(imageStyle, "antiAlias");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue();
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-
-	public java.lang.Boolean getCSSMaintainAspectRatio() {
-		CSSValue cssValue = engine.retrievePropertyValue(imageStyle, "maintainAspectRatio");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue();
-			return (java.lang.Boolean)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSLineStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSLineStyleDelegate.java
deleted file mode 100644
index a8bd75d6cbf..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSLineStyleDelegate.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSLineStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSLineStyleDelegate implements CSSLineStyle {
-
-	private LineStyle lineStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSLineStyleDelegate(LineStyle lineStyle, ExtendedCSSEngine engine) {
-		this.lineStyle = lineStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSLineColor() {
-		CSSValue cssValue = engine.retrievePropertyValue(lineStyle, "lineColor");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineColor().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, "GMFColor", null);
-	}
-
-	public int getCSSLineWidth() {
-		CSSValue cssValue = engine.retrievePropertyValue(lineStyle, "lineWidth");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSLineTypeStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSLineTypeStyleDelegate.java
deleted file mode 100644
index 18e62462cb1..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSLineTypeStyleDelegate.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.LineType;
-import org.eclipse.gmf.runtime.notation.LineTypeStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSLineTypeStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSLineTypeStyleDelegate implements CSSLineTypeStyle {
-
-	private LineTypeStyle lineTypeStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSLineTypeStyleDelegate(LineTypeStyle lineTypeStyle, ExtendedCSSEngine engine) {
-		this.lineTypeStyle = lineTypeStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public LineType getCSSLineType() {
-		CSSValue cssValue = engine.retrievePropertyValue(lineTypeStyle, "lineType");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineTypeStyle_LineType().getDefaultValue();
-			return (LineType)defaultValue;
-		}
-		return LineType.get(cssValue.getCssText());
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSMultiDiagramLinkStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSMultiDiagramLinkStyleDelegate.java
deleted file mode 100644
index 74e06c37010..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSMultiDiagramLinkStyleDelegate.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSMultiDiagramLinkStyle;
-
-public class CSSMultiDiagramLinkStyleDelegate implements CSSMultiDiagramLinkStyle {
-
-	private MultiDiagramLinkStyle multiDiagramLinkStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSMultiDiagramLinkStyleDelegate(MultiDiagramLinkStyle multiDiagramLinkStyle, ExtendedCSSEngine engine) {
-		this.multiDiagramLinkStyle = multiDiagramLinkStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSNamedStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSNamedStyleDelegate.java
deleted file mode 100644
index 6da8c32c504..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSNamedStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NamedStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSNamedStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSNamedStyleDelegate implements CSSNamedStyle {
-
-	private NamedStyle namedStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSNamedStyleDelegate(NamedStyle namedStyle, ExtendedCSSEngine engine) {
-		this.namedStyle = namedStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName() {
-		CSSValue cssValue = engine.retrievePropertyValue(namedStyle, "name");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSPageStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSPageStyleDelegate.java
deleted file mode 100644
index de900903bb2..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSPageStyleDelegate.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.PageStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSPageStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSPageStyleDelegate implements CSSPageStyle {
-
-	private PageStyle pageStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSPageStyleDelegate(PageStyle pageStyle, ExtendedCSSEngine engine) {
-		this.pageStyle = pageStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSPageX() {
-		CSSValue cssValue = engine.retrievePropertyValue(pageStyle, "pageX");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageX().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public int getCSSPageY() {
-		CSSValue cssValue = engine.retrievePropertyValue(pageStyle, "pageY");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageY().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public int getCSSPageWidth() {
-		CSSValue cssValue = engine.retrievePropertyValue(pageStyle, "pageWidth");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public int getCSSPageHeight() {
-		CSSValue cssValue = engine.retrievePropertyValue(pageStyle, "pageHeight");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getPageStyle_PageHeight().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSPropertiesSetStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSPropertiesSetStyleDelegate.java
deleted file mode 100644
index 7f3a79b69e8..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSPropertiesSetStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSPropertiesSetStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSPropertiesSetStyleDelegate implements CSSPropertiesSetStyle {
-
-	private PropertiesSetStyle propertiesSetStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSPropertiesSetStyleDelegate(PropertiesSetStyle propertiesSetStyle, ExtendedCSSEngine engine) {
-		this.propertiesSetStyle = propertiesSetStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public java.lang.String getCSSName() {
-		CSSValue cssValue = engine.retrievePropertyValue(propertiesSetStyle, "name");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getNamedStyle_Name().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSRoundedCornersStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSRoundedCornersStyleDelegate.java
deleted file mode 100644
index 60ecd63fb03..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSRoundedCornersStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSRoundedCornersStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSRoundedCornersStyleDelegate implements CSSRoundedCornersStyle {
-
-	private RoundedCornersStyle roundedCornersStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSRoundedCornersStyleDelegate(RoundedCornersStyle roundedCornersStyle, ExtendedCSSEngine engine) {
-		this.roundedCornersStyle = roundedCornersStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius() {
-		CSSValue cssValue = engine.retrievePropertyValue(roundedCornersStyle, "roundedBendpointsRadius");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSRoutingStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSRoutingStyleDelegate.java
deleted file mode 100644
index 129db80c098..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSRoutingStyleDelegate.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSRoutingStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSRoutingStyleDelegate implements CSSRoutingStyle {
-
-	private RoutingStyle routingStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSRoutingStyleDelegate(RoutingStyle routingStyle, ExtendedCSSEngine engine) {
-		this.routingStyle = routingStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSRoundedBendpointsRadius() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "roundedBendpointsRadius");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public Routing getCSSRouting() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "routing");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Routing().getDefaultValue();
-			return (Routing)defaultValue;
-		}
-		return Routing.get(cssValue.getCssText());
-	}
-
-	public Smoothness getCSSSmoothness() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "smoothness");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_Smoothness().getDefaultValue();
-			return (Smoothness)defaultValue;
-		}
-		return Smoothness.get(cssValue.getCssText());
-	}
-
-	public boolean isCSSAvoidObstructions() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "avoidObstructions");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSClosestDistance() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "closestDistance");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public JumpLinkStatus getCSSJumpLinkStatus() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "jumpLinkStatus");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus().getDefaultValue();
-			return (JumpLinkStatus)defaultValue;
-		}
-		return JumpLinkStatus.get(cssValue.getCssText());
-	}
-
-	public JumpLinkType getCSSJumpLinkType() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "jumpLinkType");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType().getDefaultValue();
-			return (JumpLinkType)defaultValue;
-		}
-		return JumpLinkType.get(cssValue.getCssText());
-	}
-
-	public boolean isCSSJumpLinksReverse() {
-		CSSValue cssValue = engine.retrievePropertyValue(routingStyle, "jumpLinksReverse");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSShapeStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSShapeStyleDelegate.java
deleted file mode 100644
index 2695076a88d..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSShapeStyleDelegate.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.helper.GradientHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSShapeStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSShapeStyleDelegate implements CSSShapeStyle {
-
-	private ShapeStyle shapeStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSShapeStyleDelegate(ShapeStyle shapeStyle, ExtendedCSSEngine engine) {
-		this.shapeStyle = shapeStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public int getCSSFontColor() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "fontColor");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontColor().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, "GMFColor", null);
-	}
-
-	public java.lang.String getCSSFontName() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "fontName");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontName().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-
-	public int getCSSFontHeight() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "fontHeight");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_FontHeight().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public boolean isCSSBold() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "bold");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Bold().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSItalic() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "italic");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Italic().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSUnderline() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "underline");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_Underline().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public boolean isCSSStrikeThrough() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "strikeThrough");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-
-	public java.lang.String getCSSDescription() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "description");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getDescriptionStyle_Description().getDefaultValue();
-			return (String)defaultValue;
-		}
-		return (String)engine.convert(cssValue, String.class, null);
-	}
-
-	public int getCSSFillColor() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "fillColor");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_FillColor().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, "GMFColor", null);
-	}
-
-	public int getCSSTransparency() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "transparency");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getFillStyle_Transparency().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public org.eclipse.gmf.runtime.notation.datatype.GradientData getCSSGradient() {
-		return GradientHelper.computeGradient(engine, shapeStyle);
-	}
-
-	public int getCSSLineColor() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "lineColor");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineColor().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, "GMFColor", null);
-	}
-
-	public int getCSSLineWidth() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "lineWidth");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getLineStyle_LineWidth().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-
-	public int getCSSRoundedBendpointsRadius() {
-		CSSValue cssValue = engine.retrievePropertyValue(shapeStyle, "roundedBendpointsRadius");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius().getDefaultValue();
-			return (Integer)defaultValue;
-		}
-		return (Integer)engine.convert(cssValue, Integer.class, null);
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSSortingStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSSortingStyleDelegate.java
deleted file mode 100644
index 15294bf1926..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSSortingStyleDelegate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Sorting;
-import org.eclipse.gmf.runtime.notation.SortingStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSSortingStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSSortingStyleDelegate implements CSSSortingStyle {
-
-	private SortingStyle sortingStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSSortingStyleDelegate(SortingStyle sortingStyle, ExtendedCSSEngine engine) {
-		this.sortingStyle = sortingStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public Sorting getCSSSorting() {
-		CSSValue cssValue = engine.retrievePropertyValue(sortingStyle, "sorting");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getSortingStyle_Sorting().getDefaultValue();
-			return (Sorting)defaultValue;
-		}
-		return Sorting.get(cssValue.getCssText());
-	}
-
-	public java.util.Map getCSSSortingKeys() {
-		CSSValue cssValue = engine.retrievePropertyValue(sortingStyle, "sortingKeys");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getSortingStyle_SortingKeys().getDefaultValue();
-			return (java.util.Map)defaultValue;
-		}
-		return null;
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSTextStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSTextStyleDelegate.java
deleted file mode 100644
index c815646b8a0..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSTextStyleDelegate.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-import org.eclipse.gmf.runtime.notation.TextStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSTextStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSTextStyleDelegate implements CSSTextStyle {
-
-	private TextStyle textStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSTextStyleDelegate(TextStyle textStyle, ExtendedCSSEngine engine) {
-		this.textStyle = textStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public TextAlignment getCSSTextAlignment() {
-		CSSValue cssValue = engine.retrievePropertyValue(textStyle, "textAlignment");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getTextStyle_TextAlignment().getDefaultValue();
-			return (TextAlignment)defaultValue;
-		}
-		return TextAlignment.get(cssValue.getCssText());
-	}
-}
diff --git a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSTitleStyleDelegate.java b/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSTitleStyleDelegate.java
deleted file mode 100644
index 85225e42316..00000000000
--- a/incoming/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSTitleStyleDelegate.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
-
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSTitleStyle;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSTitleStyleDelegate implements CSSTitleStyle {
-
-	private TitleStyle titleStyle;
-
-	private ExtendedCSSEngine engine;
-
-	public CSSTitleStyleDelegate(TitleStyle titleStyle, ExtendedCSSEngine engine) {
-		this.titleStyle = titleStyle;
-		this.engine = engine;
-	}
-
-	////////////////////////////////////////////////
-	//	Implements a getter for each CSS property //
-	////////////////////////////////////////////////
-
-	public boolean isCSSShowTitle() {
-		CSSValue cssValue = engine.retrievePropertyValue(titleStyle, "showTitle");
-		if(cssValue == null) {
-			Object defaultValue = NotationPackage.eINSTANCE.getTitleStyle_ShowTitle().getDefaultValue();
-			return (Boolean)defaultValue;
-		}
-		return (Boolean)engine.convert(cssValue, Boolean.class, null);
-	}
-}