391945: [Refactoring] Part 2: Refactoring on Kepler (0.10)

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

56 files changed, 2314 insertions, 2055 deletions

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
index 2aea9d38572..6cc14f69f57 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
@@ -30,7 +30,5 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.10.0.qualifier

 Bundle-Name: CSS Editor (Incubation)

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext;singl

- eton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java
index 8aaa9f3343e..3933620a748 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/AbstractCSSRuntimeModule.java
@@ -14,7 +14,7 @@ import com.google.inject.name.Names;
 /**
  * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule}
  */
-@SuppressWarnings("all")
+ @SuppressWarnings("all")
 public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
 
 	protected Properties properties = null;
@@ -24,17 +24,16 @@ public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
 		properties = tryBindProperties(binder, "org/eclipse/papyrus/infra/gmfdiag/CSS.properties");
 		super.configure(binder);
 	}
-
+	
 	public void configureLanguageName(Binder binder) {
 		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.infra.gmfdiag.CSS");
 	}
-
+	
 	public void configureFileExtensions(Binder binder) {
-		if(properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) {
+		if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null)
 			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("css");
-		}
 	}
-
+	
 	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
 	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
 		return org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess.class;
@@ -42,12 +41,12 @@ public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
 
 	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
 	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
-		return org.eclipse.papyrus.infra.gmfdiag.serializer.AbstractCSSSemanticSequencer.class;
+		return org.eclipse.papyrus.infra.gmfdiag.serializer.CSSSemanticSequencer.class;
 	}
 
 	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
 	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
-		return org.eclipse.papyrus.infra.gmfdiag.serializer.AbstractCSSSyntacticSequencer.class;
+		return org.eclipse.papyrus.infra.gmfdiag.serializer.CSSSyntacticSequencer.class;
 	}
 
 	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
@@ -91,8 +90,7 @@ public abstract class AbstractCSSRuntimeModule extends DefaultRuntimeModule {
 	}
 
 	// contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
-	@org.eclipse.xtext.service.SingletonBinding(eager = true)
-	public Class<? extends org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator> bindCSSJavaValidator() {
+	@org.eclipse.xtext.service.SingletonBinding(eager=true)	public Class<? extends org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator> bindCSSJavaValidator() {
 		return org.eclipse.papyrus.infra.gmfdiag.validation.CSSJavaValidator.class;
 	}
 
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
index 44d9b071329..55030d2f5a7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.genmodel
@@ -5,7 +5,7 @@
     modelPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext" forceOverwrite="true"

     modelName="CSS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

     complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.edit"

-    editorPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.editor">

+    editorPluginID="org.eclipse.papyrus.infra.gmfdiag.css.xtext.editor" runtimeVersion="2.8">

   <genPackages prefix="Css" basePackage="org.eclipse.papyrus.infra.gmfdiag" disposableProviderFactory="true"

       ecorePackage="CSS.ecore#/">

     <genEnums typeSafeEnumCompatible="false" ecoreEnum="CSS.ecore#//UNARY">

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
index 822fab0c9c0..37c88bb1387 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSS.xmi
@@ -804,6 +804,7 @@
       <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     </type>

     <alternatives xsi:type="xtext:Group">

+      <elements xsi:type="xtext:Keyword" cardinality="?" value="-"/>

       <elements xsi:type="xtext:Alternatives">

         <elements xsi:type="xtext:CharacterRange">

           <left value="a"/>

@@ -829,6 +830,7 @@
           <left value="0"/>

           <right value="9"/>

         </elements>

+        <elements xsi:type="xtext:Keyword" value="-"/>

       </elements>

     </alternatives>

   </rules>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java
index 85a2da23684..df2788fc6c4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/CSSStandaloneSetupGenerated.java
@@ -1,8 +1,9 @@
+
 package org.eclipse.papyrus.infra.gmfdiag;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.ISetup;
+import org.eclipse.emf.ecore.resource.Resource;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -15,35 +16,34 @@ public class CSSStandaloneSetupGenerated implements ISetup {
 
 	public Injector createInjectorAndDoEMFRegistration() {
 		// register default ePackages
-		if(!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore")) {
-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());
-		}
-		if(!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi")) {
-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());
-		}
-		if(!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI)) {
+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore"))
+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+				"ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());
+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi"))
+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+				"xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());
+		if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI))
 			EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE);
-		}
 
 		Injector injector = createInjector();
 		register(injector);
 		return injector;
 	}
-
+	
 	public Injector createInjector() {
 		return Guice.createInjector(new org.eclipse.papyrus.infra.gmfdiag.CSSRuntimeModule());
 	}
-
+	
 	public void register(Injector injector) {
-		if(!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS")) {
-			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS", org.eclipse.papyrus.infra.gmfdiag.css.CssPackage.eINSTANCE);
-		}
+	if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS")) {
+		EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/CSS", org.eclipse.papyrus.infra.gmfdiag.css.CssPackage.eINSTANCE);
+	}
 
 		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
 		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("css", resourceFactory);
 		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("css", serviceProvider);
-
+		
 
 
 
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
index f8e6bc8194f..b232209a4d6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Expression.java
@@ -3,6 +3,7 @@
 package org.eclipse.papyrus.infra.gmfdiag.css;

 

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

+

 import org.eclipse.emf.ecore.EObject;

 

 /**

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
index 46caaa6b134..cc43c4d9ef6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Import.java
@@ -3,6 +3,7 @@
 package org.eclipse.papyrus.infra.gmfdiag.css;

 

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

+

 import org.eclipse.emf.ecore.EObject;

 

 /**

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
index d468ae16151..de3a7c97c81 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/Stylesheet.java
@@ -3,6 +3,7 @@
 package org.eclipse.papyrus.infra.gmfdiag.css;

 

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

+

 import org.eclipse.emf.ecore.EObject;

 

 /**

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
index f1baba3132a..f22a029c637 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AngleImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
index 71a3f5f8d05..6034f06472e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

 import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
index 08ef6774365..c3165d4d4a1 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/AttributeValueImpl.java
@@ -3,9 +3,12 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;

 import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java
index 35021f484c9..b6fc8dc3b8c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CSSIdImpl.java
@@ -3,8 +3,11 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CSSId;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java
index cc9f85fb489..af366856dce 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ClassImpl.java
@@ -3,8 +3,11 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 

 /**

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java
index 8a443d31d27..5363af9b82f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CombinatorImpl.java
@@ -3,9 +3,12 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.KIND;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
index f7c965b3a1b..84174cd652d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CompositeSelectorImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Combinator;

 import org.eclipse.papyrus.infra.gmfdiag.css.CompositeSelector;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
index 4d524fc8c0a..9a2bcfd1536 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ContentImpl.java
@@ -3,7 +3,9 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Content;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
index c9b2dec7685..d85c35efae2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssFactoryImpl.java
@@ -6,8 +6,11 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

+

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

+

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;

 import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

 import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
index c414ebef0d3..3441652cf4f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/CssPackageImpl.java
@@ -7,7 +7,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

+

 import org.eclipse.emf.ecore.impl.EPackageImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

 import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

 import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

@@ -48,1776 +50,1732 @@ import org.eclipse.papyrus.infra.gmfdiag.css.Uri;
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- * 

  * @generated

  */

-public class CssPackageImpl extends EPackageImpl implements CssPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass stylesheetEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass contentEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass importEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass mediaEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass pageEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass pseudoPageEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass rulesetEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass selectorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass compositeSelectorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass simpleSelectorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass selectorConditionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass combinatorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass declarationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass expressionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass subtermEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass termEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass functionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass nameEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass numberEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass percentageEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass lengthEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass emsEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass exsEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass angleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass timeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass frequencyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass uriEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass stringValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass hexColorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass classEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass attributeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass attributeValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass pseudoEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass cssIdEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass unaryOperatorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EEnum unaryEEnum = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EEnum kindEEnum = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EEnum attributE_OPEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private CssPackageImpl() {

-		super(eNS_URI, CssFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>

-	 * This method is used to initialize {@link CssPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead,

-	 * they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static CssPackage init() {

-		if(isInited) {

-			return (CssPackage)EPackage.Registry.INSTANCE.getEPackage(CssPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		CssPackageImpl theCssPackage = (CssPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CssPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CssPackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theCssPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theCssPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theCssPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(CssPackage.eNS_URI, theCssPackage);

-		return theCssPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getStylesheet() {

-		return stylesheetEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getStylesheet_Charset() {

-		return (EAttribute)stylesheetEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getStylesheet_Imports() {

-		return (EReference)stylesheetEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getStylesheet_Contents() {

-		return (EReference)stylesheetEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getContent() {

-		return contentEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getImport() {

-		return importEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getImport_String() {

-		return (EAttribute)importEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getImport_Uri() {

-		return (EReference)importEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getImport_Media() {

-		return (EAttribute)importEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getMedia() {

-		return mediaEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getMedia_Media() {

-		return (EAttribute)mediaEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getMedia_Rules() {

-		return (EReference)mediaEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getPage() {

-		return pageEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getPage_Pseudo() {

-		return (EReference)pageEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getPage_Declarations() {

-		return (EReference)pageEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getPseudoPage() {

-		return pseudoPageEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getPseudoPage_Id() {

-		return (EAttribute)pseudoPageEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getRuleset() {

-		return rulesetEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getRuleset_Selectors() {

-		return (EReference)rulesetEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getRuleset_Properties() {

-		return (EReference)rulesetEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getSelector() {

-		return selectorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getCompositeSelector() {

-		return compositeSelectorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getCompositeSelector_Left() {

-		return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getCompositeSelector_Combinator() {

-		return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getCompositeSelector_Right() {

-		return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getSimpleSelector() {

-		return simpleSelectorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getSimpleSelector_ElementName() {

-		return (EAttribute)simpleSelectorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getSimpleSelector_Condition() {

-		return (EReference)simpleSelectorEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getSelectorCondition() {

-		return selectorConditionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getCombinator() {

-		return combinatorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getCombinator_Kind() {

-		return (EAttribute)combinatorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getDeclaration() {

-		return declarationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getDeclaration_Property() {

-		return (EAttribute)declarationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getDeclaration_Expression() {

-		return (EReference)declarationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getDeclaration_Important() {

-		return (EAttribute)declarationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getExpression() {

-		return expressionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getExpression_Terms() {

-		return (EReference)expressionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getExpression_Subterms() {

-		return (EReference)expressionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getSubterm() {

-		return subtermEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getSubterm_Operator() {

-		return (EAttribute)subtermEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getSubterm_Term() {

-		return (EReference)subtermEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTerm() {

-		return termEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getFunction() {

-		return functionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getFunction_Name() {

-		return (EAttribute)functionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getFunction_Args() {

-		return (EReference)functionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getName_() {

-		return nameEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getName_Value() {

-		return (EAttribute)nameEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getNumber() {

-		return numberEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getNumber_Op() {

-		return (EReference)numberEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getNumber_Value() {

-		return (EAttribute)numberEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getPercentage() {

-		return percentageEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getPercentage_Op() {

-		return (EReference)percentageEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getPercentage_Value() {

-		return (EAttribute)percentageEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getPercentage_Unit() {

-		return (EAttribute)percentageEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getLength() {

-		return lengthEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getLength_Op() {

-		return (EReference)lengthEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getLength_Value() {

-		return (EAttribute)lengthEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getLength_Unit() {

-		return (EAttribute)lengthEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getEms() {

-		return emsEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getEms_Op() {

-		return (EReference)emsEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getEms_Value() {

-		return (EAttribute)emsEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getEms_Unit() {

-		return (EAttribute)emsEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getExs() {

-		return exsEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getExs_Op() {

-		return (EReference)exsEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getExs_Value() {

-		return (EAttribute)exsEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getExs_Unit() {

-		return (EAttribute)exsEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getAngle() {

-		return angleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getAngle_Op() {

-		return (EReference)angleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getAngle_Value() {

-		return (EAttribute)angleEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getAngle_Unit() {

-		return (EAttribute)angleEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTime() {

-		return timeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTime_Op() {

-		return (EReference)timeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTime_Value() {

-		return (EAttribute)timeEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTime_Unit() {

-		return (EAttribute)timeEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getFrequency() {

-		return frequencyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getFrequency_Op() {

-		return (EReference)frequencyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getFrequency_Value() {

-		return (EAttribute)frequencyEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getFrequency_Unit() {

-		return (EAttribute)frequencyEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getUri() {

-		return uriEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getUri_Value() {

-		return (EAttribute)uriEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getStringValue() {

-		return stringValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getStringValue_Value() {

-		return (EAttribute)stringValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getHexColor() {

-		return hexColorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getHexColor_Value() {

-		return (EAttribute)hexColorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getClass_() {

-		return classEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getClass_Class() {

-		return (EAttribute)classEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getAttribute() {

-		return attributeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getAttribute_Name() {

-		return (EAttribute)attributeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getAttribute_Value() {

-		return (EReference)attributeEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getAttributeValue() {

-		return attributeValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getAttributeValue_Operator() {

-		return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getAttributeValue_Value() {

-		return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getPseudo() {

-		return pseudoEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getPseudo_Pseudo() {

-		return (EAttribute)pseudoEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getPseudo_Args() {

-		return (EAttribute)pseudoEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getCSSId() {

-		return cssIdEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getCSSId_Value() {

-		return (EAttribute)cssIdEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getUnaryOperator() {

-		return unaryOperatorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getUnaryOperator_Operator() {

-		return (EAttribute)unaryOperatorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EEnum getUNARY() {

-		return unaryEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EEnum getKIND() {

-		return kindEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EEnum getATTRIBUTE_OP() {

-		return attributE_OPEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public CssFactory getCssFactory() {

-		return (CssFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		stylesheetEClass = createEClass(STYLESHEET);

-		createEAttribute(stylesheetEClass, STYLESHEET__CHARSET);

-		createEReference(stylesheetEClass, STYLESHEET__IMPORTS);

-		createEReference(stylesheetEClass, STYLESHEET__CONTENTS);

-

-		contentEClass = createEClass(CONTENT);

-

-		importEClass = createEClass(IMPORT);

-		createEAttribute(importEClass, IMPORT__STRING);

-		createEReference(importEClass, IMPORT__URI);

-		createEAttribute(importEClass, IMPORT__MEDIA);

-

-		mediaEClass = createEClass(MEDIA);

-		createEAttribute(mediaEClass, MEDIA__MEDIA);

-		createEReference(mediaEClass, MEDIA__RULES);

-

-		pageEClass = createEClass(PAGE);

-		createEReference(pageEClass, PAGE__PSEUDO);

-		createEReference(pageEClass, PAGE__DECLARATIONS);

-

-		pseudoPageEClass = createEClass(PSEUDO_PAGE);

-		createEAttribute(pseudoPageEClass, PSEUDO_PAGE__ID);

-

-		rulesetEClass = createEClass(RULESET);

-		createEReference(rulesetEClass, RULESET__SELECTORS);

-		createEReference(rulesetEClass, RULESET__PROPERTIES);

-

-		selectorEClass = createEClass(SELECTOR);

-

-		compositeSelectorEClass = createEClass(COMPOSITE_SELECTOR);

-		createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__LEFT);

-		createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__COMBINATOR);

-		createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__RIGHT);

-

-		simpleSelectorEClass = createEClass(SIMPLE_SELECTOR);

-		createEAttribute(simpleSelectorEClass, SIMPLE_SELECTOR__ELEMENT_NAME);

-		createEReference(simpleSelectorEClass, SIMPLE_SELECTOR__CONDITION);

-

-		selectorConditionEClass = createEClass(SELECTOR_CONDITION);

-

-		combinatorEClass = createEClass(COMBINATOR);

-		createEAttribute(combinatorEClass, COMBINATOR__KIND);

-

-		declarationEClass = createEClass(DECLARATION);

-		createEAttribute(declarationEClass, DECLARATION__PROPERTY);

-		createEReference(declarationEClass, DECLARATION__EXPRESSION);

-		createEAttribute(declarationEClass, DECLARATION__IMPORTANT);

-

-		expressionEClass = createEClass(EXPRESSION);

-		createEReference(expressionEClass, EXPRESSION__TERMS);

-		createEReference(expressionEClass, EXPRESSION__SUBTERMS);

-

-		subtermEClass = createEClass(SUBTERM);

-		createEAttribute(subtermEClass, SUBTERM__OPERATOR);

-		createEReference(subtermEClass, SUBTERM__TERM);

-

-		termEClass = createEClass(TERM);

-

-		functionEClass = createEClass(FUNCTION);

-		createEAttribute(functionEClass, FUNCTION__NAME);

-		createEReference(functionEClass, FUNCTION__ARGS);

-

-		nameEClass = createEClass(NAME);

-		createEAttribute(nameEClass, NAME__VALUE);

-

-		numberEClass = createEClass(NUMBER);

-		createEReference(numberEClass, NUMBER__OP);

-		createEAttribute(numberEClass, NUMBER__VALUE);

-

-		percentageEClass = createEClass(PERCENTAGE);

-		createEReference(percentageEClass, PERCENTAGE__OP);

-		createEAttribute(percentageEClass, PERCENTAGE__VALUE);

-		createEAttribute(percentageEClass, PERCENTAGE__UNIT);

-

-		lengthEClass = createEClass(LENGTH);

-		createEReference(lengthEClass, LENGTH__OP);

-		createEAttribute(lengthEClass, LENGTH__VALUE);

-		createEAttribute(lengthEClass, LENGTH__UNIT);

-

-		emsEClass = createEClass(EMS);

-		createEReference(emsEClass, EMS__OP);

-		createEAttribute(emsEClass, EMS__VALUE);

-		createEAttribute(emsEClass, EMS__UNIT);

-

-		exsEClass = createEClass(EXS);

-		createEReference(exsEClass, EXS__OP);

-		createEAttribute(exsEClass, EXS__VALUE);

-		createEAttribute(exsEClass, EXS__UNIT);

-

-		angleEClass = createEClass(ANGLE);

-		createEReference(angleEClass, ANGLE__OP);

-		createEAttribute(angleEClass, ANGLE__VALUE);

-		createEAttribute(angleEClass, ANGLE__UNIT);

-

-		timeEClass = createEClass(TIME);

-		createEReference(timeEClass, TIME__OP);

-		createEAttribute(timeEClass, TIME__VALUE);

-		createEAttribute(timeEClass, TIME__UNIT);

-

-		frequencyEClass = createEClass(FREQUENCY);

-		createEReference(frequencyEClass, FREQUENCY__OP);

-		createEAttribute(frequencyEClass, FREQUENCY__VALUE);

-		createEAttribute(frequencyEClass, FREQUENCY__UNIT);

-

-		uriEClass = createEClass(URI);

-		createEAttribute(uriEClass, URI__VALUE);

-

-		stringValueEClass = createEClass(STRING_VALUE);

-		createEAttribute(stringValueEClass, STRING_VALUE__VALUE);

-

-		hexColorEClass = createEClass(HEX_COLOR);

-		createEAttribute(hexColorEClass, HEX_COLOR__VALUE);

-

-		classEClass = createEClass(CLASS);

-		createEAttribute(classEClass, CLASS__CLASS);

-

-		attributeEClass = createEClass(ATTRIBUTE);

-		createEAttribute(attributeEClass, ATTRIBUTE__NAME);

-		createEReference(attributeEClass, ATTRIBUTE__VALUE);

-

-		attributeValueEClass = createEClass(ATTRIBUTE_VALUE);

-		createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__OPERATOR);

-		createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__VALUE);

-

-		pseudoEClass = createEClass(PSEUDO);

-		createEAttribute(pseudoEClass, PSEUDO__PSEUDO);

-		createEAttribute(pseudoEClass, PSEUDO__ARGS);

-

-		cssIdEClass = createEClass(CSS_ID);

-		createEAttribute(cssIdEClass, CSS_ID__VALUE);

-

-		unaryOperatorEClass = createEClass(UNARY_OPERATOR);

-		createEAttribute(unaryOperatorEClass, UNARY_OPERATOR__OPERATOR);

-

-		// Create enums

-		unaryEEnum = createEEnum(UNARY);

-		kindEEnum = createEEnum(KIND);

-		attributE_OPEEnum = createEEnum(ATTRIBUTE_OP);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		mediaEClass.getESuperTypes().add(this.getContent());

-		pageEClass.getESuperTypes().add(this.getContent());

-		rulesetEClass.getESuperTypes().add(this.getContent());

-		compositeSelectorEClass.getESuperTypes().add(this.getSelector());

-		simpleSelectorEClass.getESuperTypes().add(this.getSelector());

-		functionEClass.getESuperTypes().add(this.getTerm());

-		nameEClass.getESuperTypes().add(this.getTerm());

-		numberEClass.getESuperTypes().add(this.getTerm());

-		percentageEClass.getESuperTypes().add(this.getTerm());

-		lengthEClass.getESuperTypes().add(this.getTerm());

-		emsEClass.getESuperTypes().add(this.getTerm());

-		exsEClass.getESuperTypes().add(this.getTerm());

-		angleEClass.getESuperTypes().add(this.getTerm());

-		timeEClass.getESuperTypes().add(this.getTerm());

-		frequencyEClass.getESuperTypes().add(this.getTerm());

-		uriEClass.getESuperTypes().add(this.getTerm());

-		stringValueEClass.getESuperTypes().add(this.getTerm());

-		hexColorEClass.getESuperTypes().add(this.getTerm());

-		classEClass.getESuperTypes().add(this.getSelectorCondition());

-		attributeEClass.getESuperTypes().add(this.getSelectorCondition());

-		pseudoEClass.getESuperTypes().add(this.getSelectorCondition());

-		cssIdEClass.getESuperTypes().add(this.getSelectorCondition());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(stylesheetEClass, Stylesheet.class, "Stylesheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getStylesheet_Charset(), ecorePackage.getEString(), "charset", null, 0, 1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getStylesheet_Imports(), this.getImport(), null, "imports", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getStylesheet_Contents(), this.getContent(), null, "contents", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(contentEClass, Content.class, "Content", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getImport_String(), ecorePackage.getEString(), "string", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getImport_Uri(), this.getUri(), null, "uri", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getImport_Media(), ecorePackage.getEString(), "media", null, 0, -1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(mediaEClass, Media.class, "Media", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getMedia_Media(), ecorePackage.getEString(), "media", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getMedia_Rules(), this.getRuleset(), null, "rules", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(pageEClass, Page.class, "Page", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPage_Pseudo(), this.getPseudoPage(), null, "pseudo", null, 0, 1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getPage_Declarations(), this.getDeclaration(), null, "declarations", null, 0, -1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(pseudoPageEClass, PseudoPage.class, "PseudoPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getPseudoPage_Id(), ecorePackage.getEString(), "id", null, 0, 1, PseudoPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(rulesetEClass, Ruleset.class, "Ruleset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRuleset_Selectors(), this.getSelector(), null, "selectors", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRuleset_Properties(), this.getDeclaration(), null, "properties", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(selectorEClass, Selector.class, "Selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(compositeSelectorEClass, CompositeSelector.class, "CompositeSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getCompositeSelector_Left(), this.getSimpleSelector(), null, "left", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getCompositeSelector_Combinator(), this.getCombinator(), null, "combinator", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getCompositeSelector_Right(), this.getSelector(), null, "right", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(simpleSelectorEClass, SimpleSelector.class, "SimpleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getSimpleSelector_ElementName(), ecorePackage.getEString(), "elementName", null, 0, 1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getSimpleSelector_Condition(), this.getSelectorCondition(), null, "condition", null, 0, -1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(selectorConditionEClass, SelectorCondition.class, "SelectorCondition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(combinatorEClass, Combinator.class, "Combinator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getCombinator_Kind(), this.getKIND(), "kind", null, 0, 1, Combinator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(declarationEClass, Declaration.class, "Declaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getDeclaration_Property(), ecorePackage.getEString(), "property", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getDeclaration_Expression(), this.getExpression(), null, "expression", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getDeclaration_Important(), ecorePackage.getEBoolean(), "important", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getExpression_Terms(), this.getTerm(), null, "terms", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getExpression_Subterms(), this.getSubterm(), null, "subterms", null, 0, -1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(subtermEClass, Subterm.class, "Subterm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getSubterm_Operator(), ecorePackage.getEString(), "operator", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getSubterm_Term(), this.getTerm(), null, "term", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(termEClass, Term.class, "Term", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getFunction_Args(), this.getExpression(), null, "args", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getName_Value(), ecorePackage.getEString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(numberEClass, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, "Number", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getNumber_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getNumber_Value(), ecorePackage.getEString(), "value", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(percentageEClass, Percentage.class, "Percentage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPercentage_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getPercentage_Value(), ecorePackage.getEString(), "value", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getPercentage_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(lengthEClass, Length.class, "Length", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getLength_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getLength_Value(), ecorePackage.getEString(), "value", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getLength_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(emsEClass, Ems.class, "Ems", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getEms_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getEms_Value(), ecorePackage.getEString(), "value", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getEms_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(exsEClass, Exs.class, "Exs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getExs_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getExs_Value(), ecorePackage.getEString(), "value", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getExs_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(angleEClass, Angle.class, "Angle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getAngle_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAngle_Value(), ecorePackage.getEString(), "value", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAngle_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+public class CssPackageImpl extends EPackageImpl implements CssPackage

+{

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass stylesheetEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass contentEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass importEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass mediaEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass pageEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass pseudoPageEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass rulesetEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass selectorEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass compositeSelectorEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass simpleSelectorEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass selectorConditionEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass combinatorEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass declarationEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass expressionEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass subtermEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass termEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass functionEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass nameEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass numberEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass percentageEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass lengthEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass emsEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass exsEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass angleEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass timeEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass frequencyEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass uriEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass stringValueEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass hexColorEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass classEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass attributeEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass attributeValueEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass pseudoEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass cssIdEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EClass unaryOperatorEClass = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EEnum unaryEEnum = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EEnum kindEEnum = null;

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private EEnum attributE_OPEEnum = null;

+

+  /**

+   * Creates an instance of the model <b>Package</b>, registered with

+   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+   * package URI value.

+   * <p>Note: the correct way to create the package is via the static

+   * factory method {@link #init init()}, which also performs

+   * initialization of the package, or returns the registered package,

+   * if one already exists.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @see org.eclipse.emf.ecore.EPackage.Registry

+   * @see org.eclipse.papyrus.infra.gmfdiag.css.CssPackage#eNS_URI

+   * @see #init()

+   * @generated

+   */

+  private CssPackageImpl()

+  {

+    super(eNS_URI, CssFactory.eINSTANCE);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private static boolean isInited = false;

+

+  /**

+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+   * 

+   * <p>This method is used to initialize {@link CssPackage#eINSTANCE} when that field is accessed.

+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @see #eNS_URI

+   * @see #createPackageContents()

+   * @see #initializePackageContents()

+   * @generated

+   */

+  public static CssPackage init()

+  {

+    if (isInited) return (CssPackage)EPackage.Registry.INSTANCE.getEPackage(CssPackage.eNS_URI);

+

+    // Obtain or create and register package

+    CssPackageImpl theCssPackage = (CssPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CssPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CssPackageImpl());

+

+    isInited = true;

+

+    // Create package meta-data objects

+    theCssPackage.createPackageContents();

+

+    // Initialize created meta-data

+    theCssPackage.initializePackageContents();

+

+    // Mark meta-data to indicate it can't be changed

+    theCssPackage.freeze();

+

+  

+    // Update the registry and return the package

+    EPackage.Registry.INSTANCE.put(CssPackage.eNS_URI, theCssPackage);

+    return theCssPackage;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getStylesheet()

+  {

+    return stylesheetEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getStylesheet_Charset()

+  {

+    return (EAttribute)stylesheetEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getStylesheet_Imports()

+  {

+    return (EReference)stylesheetEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getStylesheet_Contents()

+  {

+    return (EReference)stylesheetEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getContent()

+  {

+    return contentEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getImport()

+  {

+    return importEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getImport_String()

+  {

+    return (EAttribute)importEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getImport_Uri()

+  {

+    return (EReference)importEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getImport_Media()

+  {

+    return (EAttribute)importEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getMedia()

+  {

+    return mediaEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getMedia_Media()

+  {

+    return (EAttribute)mediaEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getMedia_Rules()

+  {

+    return (EReference)mediaEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getPage()

+  {

+    return pageEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getPage_Pseudo()

+  {

+    return (EReference)pageEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getPage_Declarations()

+  {

+    return (EReference)pageEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getPseudoPage()

+  {

+    return pseudoPageEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getPseudoPage_Id()

+  {

+    return (EAttribute)pseudoPageEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getRuleset()

+  {

+    return rulesetEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getRuleset_Selectors()

+  {

+    return (EReference)rulesetEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getRuleset_Properties()

+  {

+    return (EReference)rulesetEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getSelector()

+  {

+    return selectorEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getCompositeSelector()

+  {

+    return compositeSelectorEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getCompositeSelector_Left()

+  {

+    return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getCompositeSelector_Combinator()

+  {

+    return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getCompositeSelector_Right()

+  {

+    return (EReference)compositeSelectorEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getSimpleSelector()

+  {

+    return simpleSelectorEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getSimpleSelector_ElementName()

+  {

+    return (EAttribute)simpleSelectorEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getSimpleSelector_Condition()

+  {

+    return (EReference)simpleSelectorEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getSelectorCondition()

+  {

+    return selectorConditionEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getCombinator()

+  {

+    return combinatorEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getCombinator_Kind()

+  {

+    return (EAttribute)combinatorEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getDeclaration()

+  {

+    return declarationEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getDeclaration_Property()

+  {

+    return (EAttribute)declarationEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getDeclaration_Expression()

+  {

+    return (EReference)declarationEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getDeclaration_Important()

+  {

+    return (EAttribute)declarationEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getExpression()

+  {

+    return expressionEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getExpression_Terms()

+  {

+    return (EReference)expressionEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getExpression_Subterms()

+  {

+    return (EReference)expressionEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getSubterm()

+  {

+    return subtermEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getSubterm_Operator()

+  {

+    return (EAttribute)subtermEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getSubterm_Term()

+  {

+    return (EReference)subtermEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getTerm()

+  {

+    return termEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getFunction()

+  {

+    return functionEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getFunction_Name()

+  {

+    return (EAttribute)functionEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getFunction_Args()

+  {

+    return (EReference)functionEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getName_()

+  {

+    return nameEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getName_Value()

+  {

+    return (EAttribute)nameEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getNumber()

+  {

+    return numberEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getNumber_Op()

+  {

+    return (EReference)numberEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getNumber_Value()

+  {

+    return (EAttribute)numberEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getPercentage()

+  {

+    return percentageEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getPercentage_Op()

+  {

+    return (EReference)percentageEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getPercentage_Value()

+  {

+    return (EAttribute)percentageEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getPercentage_Unit()

+  {

+    return (EAttribute)percentageEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getLength()

+  {

+    return lengthEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getLength_Op()

+  {

+    return (EReference)lengthEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getLength_Value()

+  {

+    return (EAttribute)lengthEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getLength_Unit()

+  {

+    return (EAttribute)lengthEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getEms()

+  {

+    return emsEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getEms_Op()

+  {

+    return (EReference)emsEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getEms_Value()

+  {

+    return (EAttribute)emsEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getEms_Unit()

+  {

+    return (EAttribute)emsEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getExs()

+  {

+    return exsEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getExs_Op()

+  {

+    return (EReference)exsEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getExs_Value()

+  {

+    return (EAttribute)exsEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getExs_Unit()

+  {

+    return (EAttribute)exsEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getAngle()

+  {

+    return angleEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getAngle_Op()

+  {

+    return (EReference)angleEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getAngle_Value()

+  {

+    return (EAttribute)angleEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getAngle_Unit()

+  {

+    return (EAttribute)angleEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getTime()

+  {

+    return timeEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getTime_Op()

+  {

+    return (EReference)timeEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getTime_Value()

+  {

+    return (EAttribute)timeEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getTime_Unit()

+  {

+    return (EAttribute)timeEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getFrequency()

+  {

+    return frequencyEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getFrequency_Op()

+  {

+    return (EReference)frequencyEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getFrequency_Value()

+  {

+    return (EAttribute)frequencyEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getFrequency_Unit()

+  {

+    return (EAttribute)frequencyEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getUri()

+  {

+    return uriEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getUri_Value()

+  {

+    return (EAttribute)uriEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getStringValue()

+  {

+    return stringValueEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getStringValue_Value()

+  {

+    return (EAttribute)stringValueEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getHexColor()

+  {

+    return hexColorEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getHexColor_Value()

+  {

+    return (EAttribute)hexColorEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getClass_()

+  {

+    return classEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getClass_Class()

+  {

+    return (EAttribute)classEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getAttribute()

+  {

+    return attributeEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getAttribute_Name()

+  {

+    return (EAttribute)attributeEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EReference getAttribute_Value()

+  {

+    return (EReference)attributeEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getAttributeValue()

+  {

+    return attributeValueEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getAttributeValue_Operator()

+  {

+    return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getAttributeValue_Value()

+  {

+    return (EAttribute)attributeValueEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getPseudo()

+  {

+    return pseudoEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getPseudo_Pseudo()

+  {

+    return (EAttribute)pseudoEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getPseudo_Args()

+  {

+    return (EAttribute)pseudoEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getCSSId()

+  {

+    return cssIdEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getCSSId_Value()

+  {

+    return (EAttribute)cssIdEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EClass getUnaryOperator()

+  {

+    return unaryOperatorEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EAttribute getUnaryOperator_Operator()

+  {

+    return (EAttribute)unaryOperatorEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EEnum getUNARY()

+  {

+    return unaryEEnum;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EEnum getKIND()

+  {

+    return kindEEnum;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public EEnum getATTRIBUTE_OP()

+  {

+    return attributE_OPEEnum;

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public CssFactory getCssFactory()

+  {

+    return (CssFactory)getEFactoryInstance();

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private boolean isCreated = false;

+

+  /**

+   * Creates the meta-model objects for the package.  This method is

+   * guarded to have no affect on any invocation but its first.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public void createPackageContents()

+  {

+    if (isCreated) return;

+    isCreated = true;

+

+    // Create classes and their features

+    stylesheetEClass = createEClass(STYLESHEET);

+    createEAttribute(stylesheetEClass, STYLESHEET__CHARSET);

+    createEReference(stylesheetEClass, STYLESHEET__IMPORTS);

+    createEReference(stylesheetEClass, STYLESHEET__CONTENTS);

+

+    contentEClass = createEClass(CONTENT);

+

+    importEClass = createEClass(IMPORT);

+    createEAttribute(importEClass, IMPORT__STRING);

+    createEReference(importEClass, IMPORT__URI);

+    createEAttribute(importEClass, IMPORT__MEDIA);

+

+    mediaEClass = createEClass(MEDIA);

+    createEAttribute(mediaEClass, MEDIA__MEDIA);

+    createEReference(mediaEClass, MEDIA__RULES);

+

+    pageEClass = createEClass(PAGE);

+    createEReference(pageEClass, PAGE__PSEUDO);

+    createEReference(pageEClass, PAGE__DECLARATIONS);

+

+    pseudoPageEClass = createEClass(PSEUDO_PAGE);

+    createEAttribute(pseudoPageEClass, PSEUDO_PAGE__ID);

+

+    rulesetEClass = createEClass(RULESET);

+    createEReference(rulesetEClass, RULESET__SELECTORS);

+    createEReference(rulesetEClass, RULESET__PROPERTIES);

+

+    selectorEClass = createEClass(SELECTOR);

+

+    compositeSelectorEClass = createEClass(COMPOSITE_SELECTOR);

+    createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__LEFT);

+    createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__COMBINATOR);

+    createEReference(compositeSelectorEClass, COMPOSITE_SELECTOR__RIGHT);

+

+    simpleSelectorEClass = createEClass(SIMPLE_SELECTOR);

+    createEAttribute(simpleSelectorEClass, SIMPLE_SELECTOR__ELEMENT_NAME);

+    createEReference(simpleSelectorEClass, SIMPLE_SELECTOR__CONDITION);

+

+    selectorConditionEClass = createEClass(SELECTOR_CONDITION);

+

+    combinatorEClass = createEClass(COMBINATOR);

+    createEAttribute(combinatorEClass, COMBINATOR__KIND);

+

+    declarationEClass = createEClass(DECLARATION);

+    createEAttribute(declarationEClass, DECLARATION__PROPERTY);

+    createEReference(declarationEClass, DECLARATION__EXPRESSION);

+    createEAttribute(declarationEClass, DECLARATION__IMPORTANT);

+

+    expressionEClass = createEClass(EXPRESSION);

+    createEReference(expressionEClass, EXPRESSION__TERMS);

+    createEReference(expressionEClass, EXPRESSION__SUBTERMS);

+

+    subtermEClass = createEClass(SUBTERM);

+    createEAttribute(subtermEClass, SUBTERM__OPERATOR);

+    createEReference(subtermEClass, SUBTERM__TERM);

+

+    termEClass = createEClass(TERM);

+

+    functionEClass = createEClass(FUNCTION);

+    createEAttribute(functionEClass, FUNCTION__NAME);

+    createEReference(functionEClass, FUNCTION__ARGS);

+

+    nameEClass = createEClass(NAME);

+    createEAttribute(nameEClass, NAME__VALUE);

+

+    numberEClass = createEClass(NUMBER);

+    createEReference(numberEClass, NUMBER__OP);

+    createEAttribute(numberEClass, NUMBER__VALUE);

+

+    percentageEClass = createEClass(PERCENTAGE);

+    createEReference(percentageEClass, PERCENTAGE__OP);

+    createEAttribute(percentageEClass, PERCENTAGE__VALUE);

+    createEAttribute(percentageEClass, PERCENTAGE__UNIT);

+

+    lengthEClass = createEClass(LENGTH);

+    createEReference(lengthEClass, LENGTH__OP);

+    createEAttribute(lengthEClass, LENGTH__VALUE);

+    createEAttribute(lengthEClass, LENGTH__UNIT);

+

+    emsEClass = createEClass(EMS);

+    createEReference(emsEClass, EMS__OP);

+    createEAttribute(emsEClass, EMS__VALUE);

+    createEAttribute(emsEClass, EMS__UNIT);

+

+    exsEClass = createEClass(EXS);

+    createEReference(exsEClass, EXS__OP);

+    createEAttribute(exsEClass, EXS__VALUE);

+    createEAttribute(exsEClass, EXS__UNIT);

+

+    angleEClass = createEClass(ANGLE);

+    createEReference(angleEClass, ANGLE__OP);

+    createEAttribute(angleEClass, ANGLE__VALUE);

+    createEAttribute(angleEClass, ANGLE__UNIT);

+

+    timeEClass = createEClass(TIME);

+    createEReference(timeEClass, TIME__OP);

+    createEAttribute(timeEClass, TIME__VALUE);

+    createEAttribute(timeEClass, TIME__UNIT);

+

+    frequencyEClass = createEClass(FREQUENCY);

+    createEReference(frequencyEClass, FREQUENCY__OP);

+    createEAttribute(frequencyEClass, FREQUENCY__VALUE);

+    createEAttribute(frequencyEClass, FREQUENCY__UNIT);

+

+    uriEClass = createEClass(URI);

+    createEAttribute(uriEClass, URI__VALUE);

+

+    stringValueEClass = createEClass(STRING_VALUE);

+    createEAttribute(stringValueEClass, STRING_VALUE__VALUE);

+

+    hexColorEClass = createEClass(HEX_COLOR);

+    createEAttribute(hexColorEClass, HEX_COLOR__VALUE);

+

+    classEClass = createEClass(CLASS);

+    createEAttribute(classEClass, CLASS__CLASS);

+

+    attributeEClass = createEClass(ATTRIBUTE);

+    createEAttribute(attributeEClass, ATTRIBUTE__NAME);

+    createEReference(attributeEClass, ATTRIBUTE__VALUE);

+

+    attributeValueEClass = createEClass(ATTRIBUTE_VALUE);

+    createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__OPERATOR);

+    createEAttribute(attributeValueEClass, ATTRIBUTE_VALUE__VALUE);

+

+    pseudoEClass = createEClass(PSEUDO);

+    createEAttribute(pseudoEClass, PSEUDO__PSEUDO);

+    createEAttribute(pseudoEClass, PSEUDO__ARGS);

+

+    cssIdEClass = createEClass(CSS_ID);

+    createEAttribute(cssIdEClass, CSS_ID__VALUE);

+

+    unaryOperatorEClass = createEClass(UNARY_OPERATOR);

+    createEAttribute(unaryOperatorEClass, UNARY_OPERATOR__OPERATOR);

+

+    // Create enums

+    unaryEEnum = createEEnum(UNARY);

+    kindEEnum = createEEnum(KIND);

+    attributE_OPEEnum = createEEnum(ATTRIBUTE_OP);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  private boolean isInitialized = false;

+

+  /**

+   * Complete the initialization of the package and its meta-model.  This

+   * method is guarded to have no affect on any invocation but its first.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

+  public void initializePackageContents()

+  {

+    if (isInitialized) return;

+    isInitialized = true;

+

+    // Initialize package

+    setName(eNAME);

+    setNsPrefix(eNS_PREFIX);

+    setNsURI(eNS_URI);

+

+    // Create type parameters

+

+    // Set bounds for type parameters

+

+    // Add supertypes to classes

+    mediaEClass.getESuperTypes().add(this.getContent());

+    pageEClass.getESuperTypes().add(this.getContent());

+    rulesetEClass.getESuperTypes().add(this.getContent());

+    compositeSelectorEClass.getESuperTypes().add(this.getSelector());

+    simpleSelectorEClass.getESuperTypes().add(this.getSelector());

+    functionEClass.getESuperTypes().add(this.getTerm());

+    nameEClass.getESuperTypes().add(this.getTerm());

+    numberEClass.getESuperTypes().add(this.getTerm());

+    percentageEClass.getESuperTypes().add(this.getTerm());

+    lengthEClass.getESuperTypes().add(this.getTerm());

+    emsEClass.getESuperTypes().add(this.getTerm());

+    exsEClass.getESuperTypes().add(this.getTerm());

+    angleEClass.getESuperTypes().add(this.getTerm());

+    timeEClass.getESuperTypes().add(this.getTerm());

+    frequencyEClass.getESuperTypes().add(this.getTerm());

+    uriEClass.getESuperTypes().add(this.getTerm());

+    stringValueEClass.getESuperTypes().add(this.getTerm());

+    hexColorEClass.getESuperTypes().add(this.getTerm());

+    classEClass.getESuperTypes().add(this.getSelectorCondition());

+    attributeEClass.getESuperTypes().add(this.getSelectorCondition());

+    pseudoEClass.getESuperTypes().add(this.getSelectorCondition());

+    cssIdEClass.getESuperTypes().add(this.getSelectorCondition());

+

+    // Initialize classes and features; add operations and parameters

+    initEClass(stylesheetEClass, Stylesheet.class, "Stylesheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getStylesheet_Charset(), ecorePackage.getEString(), "charset", null, 0, 1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getStylesheet_Imports(), this.getImport(), null, "imports", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getStylesheet_Contents(), this.getContent(), null, "contents", null, 0, -1, Stylesheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(contentEClass, Content.class, "Content", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+    initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getImport_String(), ecorePackage.getEString(), "string", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getImport_Uri(), this.getUri(), null, "uri", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getImport_Media(), ecorePackage.getEString(), "media", null, 0, -1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(mediaEClass, Media.class, "Media", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getMedia_Media(), ecorePackage.getEString(), "media", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getMedia_Rules(), this.getRuleset(), null, "rules", null, 0, -1, Media.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(pageEClass, Page.class, "Page", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getPage_Pseudo(), this.getPseudoPage(), null, "pseudo", null, 0, 1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getPage_Declarations(), this.getDeclaration(), null, "declarations", null, 0, -1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(pseudoPageEClass, PseudoPage.class, "PseudoPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getPseudoPage_Id(), ecorePackage.getEString(), "id", null, 0, 1, PseudoPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(rulesetEClass, Ruleset.class, "Ruleset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getRuleset_Selectors(), this.getSelector(), null, "selectors", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getRuleset_Properties(), this.getDeclaration(), null, "properties", null, 0, -1, Ruleset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(selectorEClass, Selector.class, "Selector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+    initEClass(compositeSelectorEClass, CompositeSelector.class, "CompositeSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getCompositeSelector_Left(), this.getSimpleSelector(), null, "left", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getCompositeSelector_Combinator(), this.getCombinator(), null, "combinator", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getCompositeSelector_Right(), this.getSelector(), null, "right", null, 0, 1, CompositeSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(simpleSelectorEClass, SimpleSelector.class, "SimpleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getSimpleSelector_ElementName(), ecorePackage.getEString(), "elementName", null, 0, 1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getSimpleSelector_Condition(), this.getSelectorCondition(), null, "condition", null, 0, -1, SimpleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(selectorConditionEClass, SelectorCondition.class, "SelectorCondition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+    initEClass(combinatorEClass, Combinator.class, "Combinator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getCombinator_Kind(), this.getKIND(), "kind", null, 0, 1, Combinator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(declarationEClass, Declaration.class, "Declaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getDeclaration_Property(), ecorePackage.getEString(), "property", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getDeclaration_Expression(), this.getExpression(), null, "expression", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getDeclaration_Important(), ecorePackage.getEBoolean(), "important", null, 0, 1, Declaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getExpression_Terms(), this.getTerm(), null, "terms", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getExpression_Subterms(), this.getSubterm(), null, "subterms", null, 0, -1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(subtermEClass, Subterm.class, "Subterm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getSubterm_Operator(), ecorePackage.getEString(), "operator", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getSubterm_Term(), this.getTerm(), null, "term", null, 0, 1, Subterm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(termEClass, Term.class, "Term", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+    initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getFunction_Args(), this.getExpression(), null, "args", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getName_Value(), ecorePackage.getEString(), "value", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(numberEClass, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, "Number", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getNumber_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getNumber_Value(), ecorePackage.getEString(), "value", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Number.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(percentageEClass, Percentage.class, "Percentage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getPercentage_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getPercentage_Value(), ecorePackage.getEString(), "value", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getPercentage_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Percentage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(lengthEClass, Length.class, "Length", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getLength_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getLength_Value(), ecorePackage.getEString(), "value", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getLength_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Length.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(emsEClass, Ems.class, "Ems", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getEms_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getEms_Value(), ecorePackage.getEString(), "value", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getEms_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Ems.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(exsEClass, Exs.class, "Exs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getExs_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getExs_Value(), ecorePackage.getEString(), "value", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getExs_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Exs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(angleEClass, Angle.class, "Angle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getAngle_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getAngle_Value(), ecorePackage.getEString(), "value", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getAngle_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Angle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(timeEClass, Time.class, "Time", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getTime_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getTime_Value(), ecorePackage.getEString(), "value", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getTime_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(timeEClass, Time.class, "Time", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getTime_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getTime_Value(), ecorePackage.getEString(), "value", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getTime_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Time.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(frequencyEClass, Frequency.class, "Frequency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFrequency_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getFrequency_Value(), ecorePackage.getEString(), "value", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getFrequency_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(frequencyEClass, Frequency.class, "Frequency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getFrequency_Op(), this.getUnaryOperator(), null, "op", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getFrequency_Value(), ecorePackage.getEString(), "value", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getFrequency_Unit(), ecorePackage.getEString(), "unit", null, 0, 1, Frequency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(uriEClass, Uri.class, "Uri", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getUri_Value(), ecorePackage.getEString(), "value", null, 0, 1, Uri.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(uriEClass, Uri.class, "Uri", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getUri_Value(), ecorePackage.getEString(), "value", null, 0, 1, Uri.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getStringValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getStringValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(hexColorEClass, HexColor.class, "HexColor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getHexColor_Value(), ecorePackage.getEString(), "value", null, 0, 1, HexColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(hexColorEClass, HexColor.class, "HexColor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getHexColor_Value(), ecorePackage.getEString(), "value", null, 0, 1, HexColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(classEClass, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, "Class", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getClass_Class(), ecorePackage.getEString(), "class", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(classEClass, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, "Class", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getClass_Class(), ecorePackage.getEString(), "class", null, 0, 1, org.eclipse.papyrus.infra.gmfdiag.css.Class.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getAttribute_Value(), this.getAttributeValue(), null, "value", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getAttribute_Value(), this.getAttributeValue(), null, "value", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(attributeValueEClass, AttributeValue.class, "AttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getAttributeValue_Operator(), this.getATTRIBUTE_OP(), "operator", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAttributeValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(attributeValueEClass, AttributeValue.class, "AttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getAttributeValue_Operator(), this.getATTRIBUTE_OP(), "operator", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getAttributeValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, AttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(pseudoEClass, Pseudo.class, "Pseudo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getPseudo_Pseudo(), ecorePackage.getEString(), "pseudo", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getPseudo_Args(), ecorePackage.getEString(), "args", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(pseudoEClass, Pseudo.class, "Pseudo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getPseudo_Pseudo(), ecorePackage.getEString(), "pseudo", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getPseudo_Args(), ecorePackage.getEString(), "args", null, 0, 1, Pseudo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(cssIdEClass, CSSId.class, "CSSId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getCSSId_Value(), ecorePackage.getEString(), "value", null, 0, 1, CSSId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(cssIdEClass, CSSId.class, "CSSId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getCSSId_Value(), ecorePackage.getEString(), "value", null, 0, 1, CSSId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(unaryOperatorEClass, UnaryOperator.class, "UnaryOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getUnaryOperator_Operator(), this.getUNARY(), "operator", null, 0, 1, UnaryOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(unaryOperatorEClass, UnaryOperator.class, "UnaryOperator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getUnaryOperator_Operator(), this.getUNARY(), "operator", null, 0, 1, UnaryOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		// Initialize enums and add enum literals

-		initEEnum(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.class, "UNARY");

-		addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.NEG);

-		addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.PLUS);

+    // Initialize enums and add enum literals

+    initEEnum(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.class, "UNARY");

+    addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.NEG);

+    addEEnumLiteral(unaryEEnum, org.eclipse.papyrus.infra.gmfdiag.css.UNARY.PLUS);

 

-		initEEnum(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.class, "KIND");

-		addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.FIRST_CHILD);

-		addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.SIBLING);

+    initEEnum(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.class, "KIND");

+    addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.FIRST_CHILD);

+    addEEnumLiteral(kindEEnum, org.eclipse.papyrus.infra.gmfdiag.css.KIND.SIBLING);

 

-		initEEnum(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.class, "ATTRIBUTE_OP");

-		addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.EQUALS);

-		addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.CONTAINS);

-		addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.UNEQUALS);

+    initEEnum(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.class, "ATTRIBUTE_OP");

+    addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.EQUALS);

+    addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.CONTAINS);

+    addEEnumLiteral(attributE_OPEEnum, org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP.UNEQUALS);

 

-		// Create resource

-		createResource(eNS_URI);

-	}

+    // Create resource

+    createResource(eNS_URI);

+  }

 

 } //CssPackageImpl

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
index 701b2d609c4..1537b344b45 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/DeclarationImpl.java
@@ -4,10 +4,13 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

 import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
index ba6e6a61d57..89385d868d3 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/EmsImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Ems;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
index e14b7ed307b..d9d585bff1e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExpressionImpl.java
@@ -6,13 +6,18 @@ import java.util.Collection;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

 import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
index 5602dc9aaab..9a20e4db92c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ExsImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Exs;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
index cd68e9da78c..6df8d916760 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FrequencyImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Frequency;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
index a8ff07e1126..b56f34bd762 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/FunctionImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Expression;

 import org.eclipse.papyrus.infra.gmfdiag.css.Function;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
index 5ae7e8c6430..3804c1e0966 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/HexColorImpl.java
@@ -3,8 +3,11 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.HexColor;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
index b64e4a3ad5f..b8b8a949bc7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/ImportImpl.java
@@ -6,12 +6,17 @@ import java.util.Collection;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.emf.ecore.util.EDataTypeEList;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Import;

 import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
index 3ce7c80f197..acd356a021f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/LengthImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Length;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
index 32b770ea226..4d66900207b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/MediaImpl.java
@@ -5,12 +5,16 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 import java.util.Collection;

 

 import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

 import org.eclipse.emf.ecore.util.EDataTypeEList;

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Media;

 import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java
index 43f4c34de24..4d6381e8241 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NameImpl.java
@@ -3,8 +3,11 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Name;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
index cafd55c9fda..9be46a88e74 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/NumberImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
index 69410ff39f5..fe83bb0dc11 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PageImpl.java
@@ -6,12 +6,17 @@ import java.util.Collection;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

 import org.eclipse.papyrus.infra.gmfdiag.css.Page;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
index 2608281d08f..844badf90d2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PercentageImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Percentage;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
index 5007f6fa75c..f01a5184144 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoImpl.java
@@ -3,8 +3,11 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Pseudo;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java
index 014880af7d2..5343eb90382 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/PseudoPageImpl.java
@@ -3,9 +3,12 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.PseudoPage;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
index 6a3ca19de6c..a29424eb27e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/RulesetImpl.java
@@ -5,11 +5,15 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 import java.util.Collection;

 

 import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Declaration;

 import org.eclipse.papyrus.infra.gmfdiag.css.Ruleset;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
index b42e87d0b5b..5b08fac74be 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorConditionImpl.java
@@ -3,7 +3,9 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
index aaece96052f..229b1628b6a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SelectorImpl.java
@@ -3,7 +3,9 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Selector;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
index 43f26015872..4851e032e5b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SimpleSelectorImpl.java
@@ -6,12 +6,17 @@ import java.util.Collection;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;

 import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
index 1a98b5a5206..3b59eeaee09 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StringValueImpl.java
@@ -3,8 +3,11 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.StringValue;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
index 84e5febc997..c6432233e1e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/StylesheetImpl.java
@@ -6,13 +6,18 @@ import java.util.Collection;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Content;

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Import;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
index 25db0da44ef..7f7001e48cc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/SubtermImpl.java
@@ -4,10 +4,13 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Subterm;

 import org.eclipse.papyrus.infra.gmfdiag.css.Term;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
index 5325a1d77a0..9700f5aa874 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TermImpl.java
@@ -3,7 +3,9 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

 import org.eclipse.emf.ecore.EClass;

+

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Term;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
index e83f2900678..8f2c7c88153 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/TimeImpl.java
@@ -4,9 +4,12 @@ package org.eclipse.papyrus.infra.gmfdiag.css.impl;
 

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

 import org.eclipse.emf.common.notify.NotificationChain;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Time;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
index e41254cb82f..3fd5f7ef03f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UnaryOperatorImpl.java
@@ -3,9 +3,12 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.UNARY;

 import org.eclipse.papyrus.infra.gmfdiag.css.UnaryOperator;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java
index 4383d87dfe3..c6835752567 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/impl/UriImpl.java
@@ -3,8 +3,11 @@
 package org.eclipse.papyrus.infra.gmfdiag.css.impl;

 

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

+

 import org.eclipse.emf.ecore.EClass;

+

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

+

 import org.eclipse.papyrus.infra.gmfdiag.css.CssPackage;

 import org.eclipse.papyrus.infra.gmfdiag.css.Uri;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java
index 9aaa05194ae..f400f17f94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssAdapterFactory.java
@@ -4,8 +4,11 @@ package org.eclipse.papyrus.infra.gmfdiag.css.util;
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

+

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

 import org.eclipse.emf.ecore.EObject;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

 import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

 import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java
index 9dd262ecdeb..ca75dea3081 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/util/CssSwitch.java
@@ -4,7 +4,9 @@ package org.eclipse.papyrus.infra.gmfdiag.css.util;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

+

 import org.eclipse.emf.ecore.util.Switch;

+

 import org.eclipse.papyrus.infra.gmfdiag.css.Angle;

 import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;

 import org.eclipse.papyrus.infra.gmfdiag.css.AttributeValue;

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
index bad22803dab..c2dcdf45f4f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSAntlrTokenFileProvider.java
@@ -4,7 +4,6 @@
 package org.eclipse.papyrus.infra.gmfdiag.parser.antlr;
 
 import java.io.InputStream;
-
 import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
 
 public class CSSAntlrTokenFileProvider implements IAntlrTokenFileProvider {
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
index f62972d4dad..3b459a022d0 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/CSSParser.java
@@ -3,11 +3,11 @@
 */
 package org.eclipse.papyrus.infra.gmfdiag.parser.antlr;
 
-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-
 import com.google.inject.Inject;
 
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
+
 public class CSSParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
 	
 	@Inject
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
index 79c5e0c854d..cb56e470c58 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g
@@ -2777,7 +2777,7 @@ RULE_FREQ_UNIT : ('hz'|'mhz');
 
 RULE_T_NUM : (('0'..'9')+|('0'..'9')* '.' ('0'..'9')+);
 
-RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+RULE_ID : '-'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'-')*;
 
 RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
 
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
index 0d39d2da69e..33a0cd7cc5c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSLexer.java
@@ -2,17 +2,14 @@ package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal;
 

 // Hack: Use our own Lexer superclass by means of import. 

 // Currently there is no other way to specify the superclass for the lexer.

-import org.antlr.runtime.BaseRecognizer;

-import org.antlr.runtime.CharStream;

-import org.antlr.runtime.DFA;

-import org.antlr.runtime.EarlyExitException;

-import org.antlr.runtime.IntStream;

-import org.antlr.runtime.MismatchedSetException;

-import org.antlr.runtime.NoViableAltException;

-import org.antlr.runtime.RecognitionException;

-import org.antlr.runtime.RecognizerSharedState;

 import org.eclipse.xtext.parser.antlr.Lexer;

 

+

+import org.antlr.runtime.*;

+import java.util.Stack;

+import java.util.List;

+import java.util.ArrayList;

+

 @SuppressWarnings("all")
 public class InternalCSSLexer extends Lexer {

     public static final int RULE_ID=8;

@@ -1112,9 +1109,27 @@ public class InternalCSSLexer extends Lexer {
         try {

             int _type = RULE_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )

-            // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

+            // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:9: ( ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )* )

+            // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( '-' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*

             {

+            // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: ( '-' )?

+            int alt10=2;

+            int LA10_0 = input.LA(1);

+

+            if ( (LA10_0=='-') ) {

+                alt10=1;

+            }

+            switch (alt10) {

+                case 1 :

+                    // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:11: '-'

+                    {

+                    match('-'); 

+

+                    }

+                    break;

+

+            }

+

             if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {

                 input.consume();

 

@@ -1124,22 +1139,22 @@ public class InternalCSSLexer extends Lexer {
                 recover(mse);

                 throw mse;}

 

-            // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

-            loop10:

+            // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2780:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '-' )*

+            loop11:

             do {

-                int alt10=2;

-                int LA10_0 = input.LA(1);

+                int alt11=2;

+                int LA11_0 = input.LA(1);

 

-                if ( ((LA10_0>='0' && LA10_0<='9')||(LA10_0>='A' && LA10_0<='Z')||LA10_0=='_'||(LA10_0>='a' && LA10_0<='z')) ) {

-                    alt10=1;

+                if ( (LA11_0=='-'||(LA11_0>='0' && LA11_0<='9')||(LA11_0>='A' && LA11_0<='Z')||LA11_0=='_'||(LA11_0>='a' && LA11_0<='z')) ) {

+                    alt11=1;

                 }

 

 

-                switch (alt10) {

+                switch (alt11) {

             	case 1 :

             	    // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:

             	    {

-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {

+            	    if ( input.LA(1)=='-'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {

             	        input.consume();

 

             	    }

@@ -1153,7 +1168,7 @@ public class InternalCSSLexer extends Lexer {
             	    break;

 

             	default :

-            	    break loop10;

+            	    break loop11;

                 }

             } while (true);

 

@@ -1177,41 +1192,41 @@ public class InternalCSSLexer extends Lexer {
             // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

             {

             // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

-            int alt13=2;

-            int LA13_0 = input.LA(1);

+            int alt14=2;

+            int LA14_0 = input.LA(1);

 

-            if ( (LA13_0=='\"') ) {

-                alt13=1;

+            if ( (LA14_0=='\"') ) {

+                alt14=1;

             }

-            else if ( (LA13_0=='\'') ) {

-                alt13=2;

+            else if ( (LA14_0=='\'') ) {

+                alt14=2;

             }

             else {

                 NoViableAltException nvae =

-                    new NoViableAltException("", 13, 0, input);

+                    new NoViableAltException("", 14, 0, input);

 

                 throw nvae;

             }

-            switch (alt13) {

+            switch (alt14) {

                 case 1 :

                     // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

                     {

                     match('\"'); 

                     // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

-                    loop11:

+                    loop12:

                     do {

-                        int alt11=3;

-                        int LA11_0 = input.LA(1);

+                        int alt12=3;

+                        int LA12_0 = input.LA(1);

 

-                        if ( (LA11_0=='\\') ) {

-                            alt11=1;

+                        if ( (LA12_0=='\\') ) {

+                            alt12=1;

                         }

-                        else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA11_0>=']' && LA11_0<='\uFFFF')) ) {

-                            alt11=2;

+                        else if ( ((LA12_0>='\u0000' && LA12_0<='!')||(LA12_0>='#' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {

+                            alt12=2;

                         }

 

 

-                        switch (alt11) {

+                        switch (alt12) {

                     	case 1 :

                     	    // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )

                     	    {

@@ -1245,7 +1260,7 @@ public class InternalCSSLexer extends Lexer {
                     	    break;

 

                     	default :

-                    	    break loop11;

+                    	    break loop12;

                         }

                     } while (true);

 

@@ -1258,20 +1273,20 @@ public class InternalCSSLexer extends Lexer {
                     {

                     match('\''); 

                     // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*

-                    loop12:

+                    loop13:

                     do {

-                        int alt12=3;

-                        int LA12_0 = input.LA(1);

+                        int alt13=3;

+                        int LA13_0 = input.LA(1);

 

-                        if ( (LA12_0=='\\') ) {

-                            alt12=1;

+                        if ( (LA13_0=='\\') ) {

+                            alt13=1;

                         }

-                        else if ( ((LA12_0>='\u0000' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='[')||(LA12_0>=']' && LA12_0<='\uFFFF')) ) {

-                            alt12=2;

+                        else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA13_0>=']' && LA13_0<='\uFFFF')) ) {

+                            alt13=2;

                         }

 

 

-                        switch (alt12) {

+                        switch (alt13) {

                     	case 1 :

                     	    // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2782:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )

                     	    {

@@ -1305,7 +1320,7 @@ public class InternalCSSLexer extends Lexer {
                     	    break;

 

                     	default :

-                    	    break loop12;

+                    	    break loop13;

                         }

                     } while (true);

 

@@ -1380,29 +1395,29 @@ public class InternalCSSLexer extends Lexer {
             match("/*"); 

 

             // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:24: ( options {greedy=false; } : . )*

-            loop14:

+            loop15:

             do {

-                int alt14=2;

-                int LA14_0 = input.LA(1);

+                int alt15=2;

+                int LA15_0 = input.LA(1);

 

-                if ( (LA14_0=='*') ) {

-                    int LA14_1 = input.LA(2);

+                if ( (LA15_0=='*') ) {

+                    int LA15_1 = input.LA(2);

 

-                    if ( (LA14_1=='/') ) {

-                        alt14=2;

+                    if ( (LA15_1=='/') ) {

+                        alt15=2;

                     }

-                    else if ( ((LA14_1>='\u0000' && LA14_1<='.')||(LA14_1>='0' && LA14_1<='\uFFFF')) ) {

-                        alt14=1;

+                    else if ( ((LA15_1>='\u0000' && LA15_1<='.')||(LA15_1>='0' && LA15_1<='\uFFFF')) ) {

+                        alt15=1;

                     }

 

 

                 }

-                else if ( ((LA14_0>='\u0000' && LA14_0<=')')||(LA14_0>='+' && LA14_0<='\uFFFF')) ) {

-                    alt14=1;

+                else if ( ((LA15_0>='\u0000' && LA15_0<=')')||(LA15_0>='+' && LA15_0<='\uFFFF')) ) {

+                    alt15=1;

                 }

 

 

-                switch (alt14) {

+                switch (alt15) {

             	case 1 :

             	    // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2788:52: .

             	    {

@@ -1412,7 +1427,7 @@ public class InternalCSSLexer extends Lexer {
             	    break;

 

             	default :

-            	    break loop14;

+            	    break loop15;

                 }

             } while (true);

 

@@ -1438,18 +1453,18 @@ public class InternalCSSLexer extends Lexer {
             // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

             {

             // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:2790:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-            int cnt15=0;

-            loop15:

+            int cnt16=0;

+            loop16:

             do {

-                int alt15=2;

-                int LA15_0 = input.LA(1);

+                int alt16=2;

+                int LA16_0 = input.LA(1);

 

-                if ( ((LA15_0>='\t' && LA15_0<='\n')||LA15_0=='\r'||LA15_0==' ') ) {

-                    alt15=1;

+                if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {

+                    alt16=1;

                 }

 

 

-                switch (alt15) {

+                switch (alt16) {

             	case 1 :

             	    // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:

             	    {

@@ -1467,12 +1482,12 @@ public class InternalCSSLexer extends Lexer {
             	    break;

 

             	default :

-            	    if ( cnt15 >= 1 ) break loop15;

+            	    if ( cnt16 >= 1 ) break loop16;

                         EarlyExitException eee =

-                            new EarlyExitException(15, input);

+                            new EarlyExitException(16, input);

                         throw eee;

                 }

-                cnt15++;

+                cnt16++;

             } while (true);

 

 

@@ -1508,9 +1523,9 @@ public class InternalCSSLexer extends Lexer {
 

     public void mTokens() throws RecognitionException {

         // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:8: ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )

-        int alt16=40;

-        alt16 = dfa16.predict(input);

-        switch (alt16) {

+        int alt17=40;

+        alt17 = dfa17.predict(input);

+        switch (alt17) {

             case 1 :

                 // ../org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSS.g:1:10: T__22

                 {

@@ -1798,7 +1813,7 @@ public class InternalCSSLexer extends Lexer {
 

 

     protected DFA9 dfa9 = new DFA9(this);

-    protected DFA16 dfa16 = new DFA16(this);

+    protected DFA17 dfa17 = new DFA17(this);

     static final String DFA9_eotS =

         "\1\uffff\1\3\2\uffff";

     static final String DFA9_eofS =

@@ -1851,35 +1866,35 @@ public class InternalCSSLexer extends Lexer {
             return "2778:14: ( ( '0' .. '9' )+ | ( '0' .. '9' )* '.' ( '0' .. '9' )+ )";

         }

     }

-    static final String DFA16_eotS =

+    static final String DFA17_eotS =

         "\1\uffff\1\47\10\uffff\1\65\1\67\2\uffff\1\73\3\uffff\4\47\1\uffff"+

         "\10\65\1\123\1\65\2\uffff\3\47\16\uffff\1\65\21\uffff\5\131\1\123"+

         "\1\65\1\131\1\133\1\134\3\65\1\uffff\1\140\3\uffff\1\65\1\uffff"+

         "\1\140\2\uffff\2\142\1\65\3\uffff\1\142";

-    static final String DFA16_eofS =

+    static final String DFA17_eofS =

         "\144\uffff";

-    static final String DFA16_minS =

-        "\1\0\1\143\10\uffff\1\162\1\52\2\uffff\1\55\3\uffff\2\75\2\60\1"+

-        "\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162\1\60\1\172"+

-        "\2\uffff\2\0\1\41\16\uffff\1\154\21\uffff\6\60\1\172\3\60\1\147"+

-        "\1\144\1\141\1\uffff\1\60\3\uffff\1\50\1\uffff\1\60\2\uffff\2\60"+

-        "\1\144\3\uffff\1\60";

-    static final String DFA16_maxS =

-        "\1\uffff\1\160\10\uffff\1\162\1\52\2\uffff\1\55\3\uffff\1\75\1"+

+    static final String DFA17_minS =

+        "\1\0\1\143\10\uffff\1\162\1\52\2\uffff\1\55\3\uffff\2\75\1\60\1"+

+        "\55\1\uffff\1\143\1\155\1\150\1\156\1\155\1\145\1\141\1\162\1\55"+

+        "\1\172\2\uffff\2\0\1\41\16\uffff\1\154\21\uffff\6\55\1\172\3\55"+

+        "\1\147\1\144\1\141\1\uffff\1\55\3\uffff\1\50\1\uffff\1\55\2\uffff"+

+        "\2\55\1\144\3\uffff\1\55";

+    static final String DFA17_maxS =

+        "\1\uffff\1\160\10\uffff\1\162\1\52\2\uffff\1\172\3\uffff\1\75\1"+

         "\151\2\172\1\uffff\1\170\1\155\1\163\1\156\1\170\1\145\1\141\1\162"+

         "\2\172\2\uffff\2\uffff\1\41\16\uffff\1\154\21\uffff\12\172\1\147"+

         "\1\144\1\141\1\uffff\1\172\3\uffff\1\50\1\uffff\1\172\2\uffff\2"+

         "\172\1\144\3\uffff\1\172";

-    static final String DFA16_acceptS =

+    static final String DFA17_acceptS =

         "\2\uffff\1\2\1\4\1\6\1\7\1\11\1\12\1\13\1\14\2\uffff\1\17\1\20"+

         "\1\uffff\1\22\1\23\1\24\4\uffff\1\32\12\uffff\1\41\1\42\3\uffff"+

         "\1\47\1\50\1\1\1\3\1\5\1\10\1\2\1\4\1\6\1\7\1\11\1\12\1\13\1\14"+

         "\1\uffff\1\42\1\46\1\16\1\17\1\20\1\45\1\21\1\22\1\23\1\24\1\25"+

         "\1\26\1\31\1\27\1\41\1\30\1\32\15\uffff\1\37\1\uffff\1\43\1\44\1"+

         "\47\1\uffff\1\33\1\uffff\1\34\1\35\3\uffff\1\40\1\15\1\36\1\uffff";

-    static final String DFA16_specialS =

-        "\1\2\42\uffff\1\1\1\0\77\uffff}>";

-    static final String[] DFA16_transitionS = {

+    static final String DFA17_specialS =

+        "\1\1\42\uffff\1\2\1\0\77\uffff}>";

+    static final String[] DFA17_transitionS = {

             "\11\47\2\46\2\47\1\46\22\47\1\46\1\23\1\43\1\24\1\47\1\26\1"+

             "\47\1\44\1\10\1\11\1\7\1\17\1\3\1\16\1\25\1\13\12\41\1\6\1\2"+

             "\1\45\1\21\1\20\1\47\1\1\32\42\1\14\1\47\1\15\1\47\1\42\1\47"+

@@ -1898,14 +1913,15 @@ public class InternalCSSLexer extends Lexer {
             "\1\66",

             "",

             "",

-            "\1\72",

+            "\1\72\23\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

             "",

             "",

             "",

             "\1\77",

             "\1\100\53\uffff\1\101",

             "\12\102\7\uffff\32\102\6\uffff\32\102",

-            "\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff\32\104",

+            "\1\104\2\uffff\12\103\7\uffff\32\104\4\uffff\1\104\1\uffff"+

+            "\32\104",

             "",

             "\1\110\20\uffff\1\107\3\uffff\1\106",

             "\1\111",

@@ -1915,7 +1931,8 @@ public class InternalCSSLexer extends Lexer {
             "\1\120",

             "\1\121",

             "\1\122",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

             "\1\124",

             "",

             "",

@@ -1954,66 +1971,80 @@ public class InternalCSSLexer extends Lexer {
             "",

             "",

             "",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

             "\1\132",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

             "\1\135",

             "\1\136",

             "\1\137",

             "",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

             "",

             "",

             "",

             "\1\141",

             "",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

             "",

             "",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65",

             "\1\143",

             "",

             "",

             "",

-            "\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65"

+            "\1\65\2\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+

+            "\65"

     };

 

-    static final short[] DFA16_eot = DFA.unpackEncodedString(DFA16_eotS);

-    static final short[] DFA16_eof = DFA.unpackEncodedString(DFA16_eofS);

-    static final char[] DFA16_min = DFA.unpackEncodedStringToUnsignedChars(DFA16_minS);

-    static final char[] DFA16_max = DFA.unpackEncodedStringToUnsignedChars(DFA16_maxS);

-    static final short[] DFA16_accept = DFA.unpackEncodedString(DFA16_acceptS);

-    static final short[] DFA16_special = DFA.unpackEncodedString(DFA16_specialS);

-    static final short[][] DFA16_transition;

+    static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);

+    static final short[] DFA17_eof = DFA.unpackEncodedString(DFA17_eofS);

+    static final char[] DFA17_min = DFA.unpackEncodedStringToUnsignedChars(DFA17_minS);

+    static final char[] DFA17_max = DFA.unpackEncodedStringToUnsignedChars(DFA17_maxS);

+    static final short[] DFA17_accept = DFA.unpackEncodedString(DFA17_acceptS);

+    static final short[] DFA17_special = DFA.unpackEncodedString(DFA17_specialS);

+    static final short[][] DFA17_transition;

 

     static {

-        int numStates = DFA16_transitionS.length;

-        DFA16_transition = new short[numStates][];

+        int numStates = DFA17_transitionS.length;

+        DFA17_transition = new short[numStates][];

         for (int i=0; i<numStates; i++) {

-            DFA16_transition[i] = DFA.unpackEncodedString(DFA16_transitionS[i]);

+            DFA17_transition[i] = DFA.unpackEncodedString(DFA17_transitionS[i]);

         }

     }

 

-    class DFA16 extends DFA {

+    class DFA17 extends DFA {

 

-        public DFA16(BaseRecognizer recognizer) {

+        public DFA17(BaseRecognizer recognizer) {

             this.recognizer = recognizer;

-            this.decisionNumber = 16;

-            this.eot = DFA16_eot;

-            this.eof = DFA16_eof;

-            this.min = DFA16_min;

-            this.max = DFA16_max;

-            this.accept = DFA16_accept;

-            this.special = DFA16_special;

-            this.transition = DFA16_transition;

+            this.decisionNumber = 17;

+            this.eot = DFA17_eot;

+            this.eof = DFA17_eof;

+            this.min = DFA17_min;

+            this.max = DFA17_max;

+            this.accept = DFA17_accept;

+            this.special = DFA17_special;

+            this.transition = DFA17_transition;

         }

         public String getDescription() {

             return "1:1: Tokens : ( T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_HASH | RULE_T_CLASS | RULE_T_IMPORTANT | RULE_PC_UNIT | RULE_LEN_UNIT | RULE_EM_UNIT | RULE_EX_UNIT | RULE_ANGLE_UNIT | RULE_TIME_UNIT | RULE_FREQ_UNIT | RULE_T_NUM | RULE_ID | RULE_STRING | RULE_CDO | RULE_CDC | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER );";

@@ -2023,112 +2054,112 @@ public class InternalCSSLexer extends Lexer {
         	int _s = s;

             switch ( s ) {

                     case 0 : 

-                        int LA16_36 = input.LA(1);

+                        int LA17_36 = input.LA(1);

 

                         s = -1;

-                        if ( ((LA16_36>='\u0000' && LA16_36<='\uFFFF')) ) {s = 85;}

+                        if ( ((LA17_36>='\u0000' && LA17_36<='\uFFFF')) ) {s = 85;}

 

                         else s = 39;

 

                         if ( s>=0 ) return s;

                         break;

                     case 1 : 

-                        int LA16_35 = input.LA(1);

+                        int LA17_0 = input.LA(1);

 

                         s = -1;

-                        if ( ((LA16_35>='\u0000' && LA16_35<='\uFFFF')) ) {s = 85;}

+                        if ( (LA17_0=='@') ) {s = 1;}

 

-                        else s = 39;

+                        else if ( (LA17_0==';') ) {s = 2;}

 

-                        if ( s>=0 ) return s;

-                        break;

-                    case 2 : 

-                        int LA16_0 = input.LA(1);

+                        else if ( (LA17_0==',') ) {s = 3;}

 

-                        s = -1;

-                        if ( (LA16_0=='@') ) {s = 1;}

+                        else if ( (LA17_0=='{') ) {s = 4;}

 

-                        else if ( (LA16_0==';') ) {s = 2;}

+                        else if ( (LA17_0=='}') ) {s = 5;}

 

-                        else if ( (LA16_0==',') ) {s = 3;}

+                        else if ( (LA17_0==':') ) {s = 6;}

 

-                        else if ( (LA16_0=='{') ) {s = 4;}

+                        else if ( (LA17_0=='*') ) {s = 7;}

 

-                        else if ( (LA16_0=='}') ) {s = 5;}

+                        else if ( (LA17_0=='(') ) {s = 8;}

 

-                        else if ( (LA16_0==':') ) {s = 6;}

+                        else if ( (LA17_0==')') ) {s = 9;}

 

-                        else if ( (LA16_0=='*') ) {s = 7;}

+                        else if ( (LA17_0=='u') ) {s = 10;}

 

-                        else if ( (LA16_0=='(') ) {s = 8;}

+                        else if ( (LA17_0=='/') ) {s = 11;}

 

-                        else if ( (LA16_0==')') ) {s = 9;}

+                        else if ( (LA17_0=='[') ) {s = 12;}

 

-                        else if ( (LA16_0=='u') ) {s = 10;}

+                        else if ( (LA17_0==']') ) {s = 13;}

 

-                        else if ( (LA16_0=='/') ) {s = 11;}

+                        else if ( (LA17_0=='-') ) {s = 14;}

 

-                        else if ( (LA16_0=='[') ) {s = 12;}

+                        else if ( (LA17_0=='+') ) {s = 15;}

 

-                        else if ( (LA16_0==']') ) {s = 13;}

+                        else if ( (LA17_0=='>') ) {s = 16;}

 

-                        else if ( (LA16_0=='-') ) {s = 14;}

+                        else if ( (LA17_0=='=') ) {s = 17;}

 

-                        else if ( (LA16_0=='+') ) {s = 15;}

+                        else if ( (LA17_0=='~') ) {s = 18;}

 

-                        else if ( (LA16_0=='>') ) {s = 16;}

+                        else if ( (LA17_0=='!') ) {s = 19;}

 

-                        else if ( (LA16_0=='=') ) {s = 17;}

+                        else if ( (LA17_0=='#') ) {s = 20;}

 

-                        else if ( (LA16_0=='~') ) {s = 18;}

+                        else if ( (LA17_0=='.') ) {s = 21;}

 

-                        else if ( (LA16_0=='!') ) {s = 19;}

+                        else if ( (LA17_0=='%') ) {s = 22;}

 

-                        else if ( (LA16_0=='#') ) {s = 20;}

+                        else if ( (LA17_0=='p') ) {s = 23;}

 

-                        else if ( (LA16_0=='.') ) {s = 21;}

+                        else if ( (LA17_0=='c') ) {s = 24;}

 

-                        else if ( (LA16_0=='%') ) {s = 22;}

+                        else if ( (LA17_0=='m') ) {s = 25;}

 

-                        else if ( (LA16_0=='p') ) {s = 23;}

+                        else if ( (LA17_0=='i') ) {s = 26;}

 

-                        else if ( (LA16_0=='c') ) {s = 24;}

+                        else if ( (LA17_0=='e') ) {s = 27;}

 

-                        else if ( (LA16_0=='m') ) {s = 25;}

+                        else if ( (LA17_0=='d') ) {s = 28;}

 

-                        else if ( (LA16_0=='i') ) {s = 26;}

+                        else if ( (LA17_0=='r') ) {s = 29;}

 

-                        else if ( (LA16_0=='e') ) {s = 27;}

+                        else if ( (LA17_0=='g') ) {s = 30;}

 

-                        else if ( (LA16_0=='d') ) {s = 28;}

+                        else if ( (LA17_0=='s') ) {s = 31;}

 

-                        else if ( (LA16_0=='r') ) {s = 29;}

+                        else if ( (LA17_0=='h') ) {s = 32;}

 

-                        else if ( (LA16_0=='g') ) {s = 30;}

+                        else if ( ((LA17_0>='0' && LA17_0<='9')) ) {s = 33;}

 

-                        else if ( (LA16_0=='s') ) {s = 31;}

+                        else if ( ((LA17_0>='A' && LA17_0<='Z')||LA17_0=='_'||(LA17_0>='a' && LA17_0<='b')||LA17_0=='f'||(LA17_0>='j' && LA17_0<='l')||(LA17_0>='n' && LA17_0<='o')||LA17_0=='q'||LA17_0=='t'||(LA17_0>='v' && LA17_0<='z')) ) {s = 34;}

 

-                        else if ( (LA16_0=='h') ) {s = 32;}

+                        else if ( (LA17_0=='\"') ) {s = 35;}

 

-                        else if ( ((LA16_0>='0' && LA16_0<='9')) ) {s = 33;}

+                        else if ( (LA17_0=='\'') ) {s = 36;}

 

-                        else if ( ((LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='b')||LA16_0=='f'||(LA16_0>='j' && LA16_0<='l')||(LA16_0>='n' && LA16_0<='o')||LA16_0=='q'||LA16_0=='t'||(LA16_0>='v' && LA16_0<='z')) ) {s = 34;}

+                        else if ( (LA17_0=='<') ) {s = 37;}

 

-                        else if ( (LA16_0=='\"') ) {s = 35;}

+                        else if ( ((LA17_0>='\t' && LA17_0<='\n')||LA17_0=='\r'||LA17_0==' ') ) {s = 38;}

 

-                        else if ( (LA16_0=='\'') ) {s = 36;}

+                        else if ( ((LA17_0>='\u0000' && LA17_0<='\b')||(LA17_0>='\u000B' && LA17_0<='\f')||(LA17_0>='\u000E' && LA17_0<='\u001F')||LA17_0=='$'||LA17_0=='&'||LA17_0=='?'||LA17_0=='\\'||LA17_0=='^'||LA17_0=='`'||LA17_0=='|'||(LA17_0>='\u007F' && LA17_0<='\uFFFF')) ) {s = 39;}

 

-                        else if ( (LA16_0=='<') ) {s = 37;}

+                        if ( s>=0 ) return s;

+                        break;

+                    case 2 : 

+                        int LA17_35 = input.LA(1);

 

-                        else if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {s = 38;}

+                        s = -1;

+                        if ( ((LA17_35>='\u0000' && LA17_35<='\uFFFF')) ) {s = 85;}

 

-                        else if ( ((LA16_0>='\u0000' && LA16_0<='\b')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\u001F')||LA16_0=='$'||LA16_0=='&'||LA16_0=='?'||LA16_0=='\\'||LA16_0=='^'||LA16_0=='`'||LA16_0=='|'||(LA16_0>='\u007F' && LA16_0<='\uFFFF')) ) {s = 39;}

+                        else s = 39;

 

                         if ( s>=0 ) return s;

                         break;

             }

             NoViableAltException nvae =

-                new NoViableAltException(getDescription(), 16, _s, input);

+                new NoViableAltException(getDescription(), 17, _s, input);

             error(nvae);

             throw nvae;

         }

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
index d464a5bb1e8..bb03ab75419 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/parser/antlr/internal/InternalCSSParser.java
@@ -1,19 +1,23 @@
 package org.eclipse.papyrus.infra.gmfdiag.parser.antlr.internal; 

 

-import org.antlr.runtime.BaseRecognizer;

-import org.antlr.runtime.BitSet;

-import org.antlr.runtime.DFA;

-import org.antlr.runtime.EarlyExitException;

-import org.antlr.runtime.NoViableAltException;

-import org.antlr.runtime.RecognitionException;

-import org.antlr.runtime.RecognizerSharedState;

-import org.antlr.runtime.Token;

-import org.antlr.runtime.TokenStream;

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

+import org.eclipse.xtext.*;

+import org.eclipse.xtext.parser.*;

+import org.eclipse.xtext.parser.impl.*;

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

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;

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

 import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream;

+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;

 import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;

+import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;

+

+

+

+import org.antlr.runtime.*;

+import java.util.Stack;

+import java.util.List;

+import java.util.ArrayList;

 

 @SuppressWarnings("all")
 public class InternalCSSParser extends AbstractInternalAntlrParser {

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSemanticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java
index 30c9bc82ff1..af598b77ac2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSemanticSequencer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSemanticSequencer.java
@@ -1,5 +1,7 @@
 package org.eclipse.papyrus.infra.gmfdiag.serializer;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.infra.gmfdiag.css.Angle;
 import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
@@ -36,41 +38,18 @@ import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
 import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
 import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.AbstractSemanticSequencer;
+import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
 import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
 import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
 import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-@SuppressWarnings("restriction")

-public class AbstractCSSSemanticSequencer extends AbstractSemanticSequencer {

+@SuppressWarnings("all")

+public class CSSSemanticSequencer extends AbstractDelegatingSemanticSequencer {

 

 	@Inject

-	protected CSSGrammarAccess grammarAccess;

-	

-	@Inject

-	protected ISemanticSequencerDiagnosticProvider diagnosticProvider;

-	

-	@Inject

-	protected ITransientValueService transientValues;

-	

-	@Inject

-	@GenericSequencer

-	protected Provider<ISemanticSequencer> genericSequencerProvider;

-	

-	protected ISemanticSequencer genericSequencer;

-	

-	

-	@Override

-	public void init(ISemanticSequencer sequencer, ISemanticSequenceAcceptor sequenceAcceptor, Acceptor errorAcceptor) {

-		super.init(sequencer, sequenceAcceptor, errorAcceptor);

-		this.genericSequencer = genericSequencerProvider.get();

-		this.genericSequencer.init(sequencer, sequenceAcceptor, errorAcceptor);

-	}

+	private CSSGrammarAccess grammarAccess;

 	

 	public void createSequence(EObject context, EObject semanticObject) {

 		if(semanticObject.eClass().getEPackage() == CssPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSyntacticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java
index 1cf682b829e..2d2978841b6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/AbstractCSSSyntacticSequencer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/serializer/CSSSyntacticSequencer.java
@@ -1,7 +1,7 @@
 package org.eclipse.papyrus.infra.gmfdiag.serializer;
 
+import com.google.inject.Inject;
 import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.infra.gmfdiag.services.CSSGrammarAccess;
 import org.eclipse.xtext.IGrammarAccess;
@@ -15,10 +15,8 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn
 import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
 import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
 
-import com.google.inject.Inject;
-
-@SuppressWarnings("restriction")

-public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {

+@SuppressWarnings("all")

+public class CSSSyntacticSequencer extends AbstractSyntacticSequencer {

 

 	protected CSSGrammarAccess grammarAccess;

 	protected AbstractElementAlias match_AttributeValue_WSTerminalRuleCall_1_a;

@@ -115,21 +113,47 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
 			return getCDCToken(semanticObject, ruleCall, node);

 		else if(ruleCall.getRule() == grammarAccess.getCDORule())

 			return getCDOToken(semanticObject, ruleCall, node);

+		else if(ruleCall.getRule() == grammarAccess.getT_IMPORTANTRule())

+			return getT_IMPORTANTToken(semanticObject, ruleCall, node);

 		else if(ruleCall.getRule() == grammarAccess.getWSRule())

 			return getWSToken(semanticObject, ruleCall, node);

 		return "";

 	}

 	

+	/**

+	 * terminal CDC:

+	 * 	'-->';

+	 */

 	protected String getCDCToken(EObject semanticObject, RuleCall ruleCall, INode node) {

 		if (node != null)

 			return getTokenText(node);

 		return "-->";

 	}

+	

+	/**

+	 * terminal CDO:

+	 * 	'<!--';

+	 */

 	protected String getCDOToken(EObject semanticObject, RuleCall ruleCall, INode node) {

 		if (node != null)

 			return getTokenText(node);

 		return "<!--";

 	}

+	

+	/**

+	 * terminal T_IMPORTANT:

+	 * 	'!important';

+	 */

+	protected String getT_IMPORTANTToken(EObject semanticObject, RuleCall ruleCall, INode node) {

+		if (node != null)

+			return getTokenText(node);

+		return "!important";

+	}

+	

+	/**

+	 * terminal WS:

+	 * 	(' ' | '\t' | '\r' | '\n')+;

+	 */

 	protected String getWSToken(EObject semanticObject, RuleCall ruleCall, INode node) {

 		if (node != null)

 			return getTokenText(node);

@@ -502,7 +526,7 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
 	

 	/**

 	 * Syntax:

-	 *     (CDC | WS | CDO)*

+	 *     (WS | CDC | CDO)*

 	 */

 	protected void emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

 		acceptNodes(transition, nodes);

@@ -510,7 +534,7 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
 	

 	/**

 	 * Syntax:

-	 *     (CDC | CDO | WS)+

+	 *     (WS | CDC | CDO)+

 	 */

 	protected void emit_Stylesheet___CDCTerminalRuleCall_1_2_or_CDOTerminalRuleCall_1_1_or_WSTerminalRuleCall_1_0__p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

 		acceptNodes(transition, nodes);

@@ -518,7 +542,7 @@ public class AbstractCSSSyntacticSequencer extends AbstractSyntacticSequencer {
 	

 	/**

 	 * Syntax:

-	 *     ((CDO WS*) | (CDC WS*))*

+	 *     ((CDC WS*) | (CDO WS*))*

 	 */

 	protected void emit_Stylesheet_____CDCTerminalRuleCall_2_1_1_0_WSTerminalRuleCall_2_1_1_1_a___or___CDOTerminalRuleCall_2_1_0_0_WSTerminalRuleCall_2_1_0_1_a____a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

 		acceptNodes(transition, nodes);

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
index e479440f10b..758e79f7640 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/services/CSSGrammarAccess.java
@@ -4,23 +4,14 @@
 
 package org.eclipse.papyrus.infra.gmfdiag.services;
 
-import org.eclipse.xtext.Action;
-import org.eclipse.xtext.Alternatives;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.EnumLiteralDeclaration;
-import org.eclipse.xtext.EnumRule;
-import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.GrammarUtil;
-import org.eclipse.xtext.Group;
-import org.eclipse.xtext.Keyword;
-import org.eclipse.xtext.ParserRule;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.TerminalRule;
-import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
-import org.eclipse.xtext.service.GrammarProvider;
-
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import com.google.inject.Inject;
+
+import java.util.List;
+
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.service.GrammarProvider;
+import org.eclipse.xtext.service.AbstractElementFinder.*;
 
 
 @Singleton
@@ -60,12 +51,19 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cCDCTerminalRuleCall_3_1_1_0 = (RuleCall)cGroup_3_1_1.eContents().get(0);
 		private final RuleCall cWSTerminalRuleCall_3_1_1_1 = (RuleCall)cGroup_3_1_1.eContents().get(1);
 		
-		//Stylesheet:
+		////Do not create a Stylesheet for WS* (This seems to cause a serialization problem when editing an EMF Model from an Empty file)
+		//
+		//
+		////Do not ignore WS as @charset must be followed by exactly one Space.
+		// Stylesheet:
+		//
 		//	("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO
+		//
 		//	WS* | CDC WS*)*)*;
 		public ParserRule getRule() { return rule; }
 
 		//("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO WS*
+		//
 		//| CDC WS*)*)*
 		public Group getGroup() { return cGroup; }
 
@@ -165,6 +163,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cPageParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
 		
 		//Content:
+		//
 		//	Ruleset | Media | Page;
 		public ParserRule getRule() { return rule; }
 
@@ -208,6 +207,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_5 = (RuleCall)cGroup.eContents().get(5);
 		
 		//Import:
+		//
 		//	"@import" (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* ("," WS* media+=ID)*)? ";" WS*;
 		public ParserRule getRule() { return rule; }
 
@@ -302,6 +302,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_9 = (RuleCall)cGroup.eContents().get(9);
 		
 		//Media:
+		//
 		//	"@media" WS media+=ID WS* ("," WS* media+=ID)* "{" WS* rules+=Ruleset* "}" WS*;
 		public ParserRule getRule() { return rule; }
 
@@ -378,7 +379,9 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_9 = (RuleCall)cGroup.eContents().get(9);
 		
 		//Page:
+		//
 		//	{Page} "@page" WS* pseudo=PseudoPage? "{" WS* declarations+=Declaration? (";" WS* declarations+=Declaration?)* "}"
+		//
 		//	WS*;
 		public ParserRule getRule() { return rule; }
 
@@ -443,6 +446,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2);
 		
 		//PseudoPage:
+		//
 		//	":" id=ID WS*;
 		public ParserRule getRule() { return rule; }
 
@@ -485,11 +489,14 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_7 = (RuleCall)cGroup.eContents().get(7);
 		
 		//Ruleset:
+		//
 		//	selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS*
+		//
 		//	properties+=Declaration?)* "}" WS*;
 		public ParserRule getRule() { return rule; }
 
 		//selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS* properties+=Declaration?)*
+		//
 		//"}" WS*
 		public Group getGroup() { return cGroup; }
 
@@ -557,6 +564,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cCompositeSelectorParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		//Selector:
+		//
 		//	SimpleSelector WS* | CompositeSelector;
 		public ParserRule getRule() { return rule; }
 
@@ -591,7 +599,10 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cRightSelectorParserRuleCall_2_0 = (RuleCall)cRightAssignment_2.eContents().get(0);
 		
 		////left=SimpleSelector (combinator=Combinator right=Selector | WS+ (combinator=Combinator? right=Selector)?)?;
+		//
+		//
 		//CompositeSelector:
+		//
 		//	left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector;
 		public ParserRule getRule() { return rule; }
 
@@ -643,6 +654,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cConditionSelectorConditionParserRuleCall_1_0 = (RuleCall)cConditionAssignment_1.eContents().get(0);
 		
 		//SimpleSelector:
+		//
 		//	elementName=(ID | "*") condition+=SelectorCondition* | condition+=SelectorCondition+;
 		public ParserRule getRule() { return rule; }
 
@@ -686,6 +698,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cPseudoParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
 		
 		//SelectorCondition:
+		//
 		//	CSSId | Class | Attribute | Pseudo;
 		public ParserRule getRule() { return rule; }
 
@@ -713,6 +726,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
 		
 		//Combinator:
+		//
 		//	kind=KIND WS*;
 		public ParserRule getRule() { return rule; }
 
@@ -745,6 +759,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_5_1 = (RuleCall)cGroup_5.eContents().get(1);
 		
 		//Declaration:
+		//
 		//	property=ID WS* ":" WS* expression=Expression (important?=T_IMPORTANT WS*)?;
 		public ParserRule getRule() { return rule; }
 
@@ -794,6 +809,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cSubtermsSubtermParserRuleCall_1_0 = (RuleCall)cSubtermsAssignment_1.eContents().get(0);
 		
 		//Expression:
+		//
 		//	terms=Term subterms+=Subterm*;
 		public ParserRule getRule() { return rule; }
 
@@ -822,6 +838,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cTermTermParserRuleCall_1_0 = (RuleCall)cTermAssignment_1.eContents().get(0);
 		
 		//Subterm:
+		//
 		//	operator=Operator? term=Term;
 		public ParserRule getRule() { return rule; }
 
@@ -861,11 +878,14 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
 		
 		//Term:
-		//	(Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
-		//	WS*;
+		//
+		//	(Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor |
+		//
+		//	Function) WS*;
 		public ParserRule getRule() { return rule; }
 
 		//(Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
+		//
 		//WS*
 		public Group getGroup() { return cGroup; }
 
@@ -927,6 +947,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//Function:
+		//
 		//	name=ID "(" WS* args=Expression ")";
 		public ParserRule getRule() { return rule; }
 
@@ -961,6 +982,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValueIDTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
 		
 		//Name:
+		//
 		//	value=ID;
 		public ParserRule getRule() { return rule; }
 
@@ -980,7 +1002,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValueT_NUMTerminalRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
 		
 		////Terms  
-		//Number:
+		// Number:
+		//
 		//	op=UnaryOperator? value=T_NUM;
 		public ParserRule getRule() { return rule; }
 
@@ -1011,6 +1034,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cUnitPC_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		
 		//Percentage:
+		//
 		//	op=UnaryOperator? value=T_NUM unit=PC_UNIT;
 		public ParserRule getRule() { return rule; }
 
@@ -1047,6 +1071,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cUnitLEN_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		
 		//Length:
+		//
 		//	op=UnaryOperator? value=T_NUM unit=LEN_UNIT;
 		public ParserRule getRule() { return rule; }
 
@@ -1083,6 +1108,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cUnitEM_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		
 		//Ems:
+		//
 		//	op=UnaryOperator? value=T_NUM unit=EM_UNIT;
 		public ParserRule getRule() { return rule; }
 
@@ -1119,6 +1145,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cUnitEX_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		
 		//Exs:
+		//
 		//	op=UnaryOperator? value=T_NUM unit=EX_UNIT;
 		public ParserRule getRule() { return rule; }
 
@@ -1155,6 +1182,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cUnitANGLE_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		
 		//Angle:
+		//
 		//	op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT;
 		public ParserRule getRule() { return rule; }
 
@@ -1191,6 +1219,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cUnitTIME_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		
 		//Time:
+		//
 		//	op=UnaryOperator? value=T_NUM unit=TIME_UNIT;
 		public ParserRule getRule() { return rule; }
 
@@ -1227,6 +1256,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cUnitFREQ_UNITTerminalRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		
 		//Frequency:
+		//
 		//	op=UnaryOperator? value=T_NUM unit=FREQ_UNIT;
 		public ParserRule getRule() { return rule; }
 
@@ -1263,7 +1293,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		/// * | 'url(' WS? url=URL WS? ')' * / //TODO
-		//Uri:
+		// Uri:
+		//
 		//	"url(" WS? value=STRING WS? ")";
 		public ParserRule getRule() { return rule; }
 
@@ -1295,6 +1326,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValueSTRINGTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
 		
 		//StringValue:
+		//
 		//	value=STRING;
 		public ParserRule getRule() { return rule; }
 
@@ -1311,16 +1343,23 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValueHASHTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
 		
 		////terminal URL:
-		////	(('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII  |  ESCAPE * /)*;
+		// //	(('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII  |  ESCAPE * /)*;
+		//
+		//
 		////terminal NON_ASCII:
-		////	(\0240..\0377) //Chars 160 to 255
-		////;
-		////terminal UNICODE:
+		// //	(\0240..\0377) //Chars 160 to 255
+		// //;
+		// //terminal UNICODE:
+		//
+		//
 		////	'\\' HEXA (HEXA (HEXA (HEXA (HEXA (HEXA)?)?)?)?)? ('\r\n' | ' ' | '\t' | '\r' | '\n')?;
-		////
-		////terminal ESCAPE:
+		// //
+		// //terminal ESCAPE:
+		//
+		//
 		////	UNICODE | ('\\' !('\r' | '\n' | '0'..'9' | 'a'..'f' | 'A'..'F'));
-		//HexColor:
+		// HexColor:
+		//
 		//	value=HASH;
 		public ParserRule getRule() { return rule; }
 
@@ -1342,6 +1381,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
 		
 		//Operator:
+		//
 		//	"/" WS* | "," WS*;
 		public ParserRule getRule() { return rule; }
 
@@ -1373,6 +1413,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cClassT_CLASSTerminalRuleCall_0 = (RuleCall)cClassAssignment.eContents().get(0);
 		
 		//Class:
+		//
 		//	class=T_CLASS;
 		public ParserRule getRule() { return rule; }
 
@@ -1396,6 +1437,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//Attribute:
+		//
 		//	"[" WS* name=ID WS* value=AttributeValue? "]";
 		public ParserRule getRule() { return rule; }
 
@@ -1440,6 +1482,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cWSTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
 		
 		//AttributeValue:
+		//
 		//	operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*;
 		public ParserRule getRule() { return rule; }
 
@@ -1490,6 +1533,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cRightParenthesisKeyword_1_1_4 = (Keyword)cGroup_1_1.eContents().get(4);
 		
 		//Pseudo:
+		//
 		//	":" (pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")");
 		public ParserRule getRule() { return rule; }
 
@@ -1545,6 +1589,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cValueHASHTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
 		
 		//CSSId:
+		//
 		//	value=HASH;
 		public ParserRule getRule() { return rule; }
 
@@ -1561,6 +1606,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cOperatorUNARYEnumRuleCall_0 = (RuleCall)cOperatorAssignment.eContents().get(0);
 		
 		//UnaryOperator:
+		//
 		//	operator=UNARY;
 		public ParserRule getRule() { return rule; }
 
@@ -1581,6 +1627,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cPLUSPlusSignKeyword_1_0 = (Keyword)cPLUSEnumLiteralDeclaration_1.eContents().get(0);
 		
 		//enum UNARY:
+		//
 		//	NEG="-" | PLUS="+";
 		public EnumRule getRule() { return rule; }
 
@@ -1609,6 +1656,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cSIBLINGPlusSignKeyword_1_0 = (Keyword)cSIBLINGEnumLiteralDeclaration_1.eContents().get(0);
 		
 		//enum KIND:
+		//
 		//	FIRST_CHILD=">" | SIBLING="+";
 		public EnumRule getRule() { return rule; }
 
@@ -1639,6 +1687,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cUNEQUALSExclamationMarkEqualsSignKeyword_2_0 = (Keyword)cUNEQUALSEnumLiteralDeclaration_2.eContents().get(0);
 		
 		//enum ATTRIBUTE_OP:
+		//
 		//	EQUALS="=" | CONTAINS="~=" | UNEQUALS="!=";
 		public EnumRule getRule() { return rule; }
 
@@ -1722,21 +1771,44 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	private TerminalRule tWS;
 	private TerminalRule tANY_OTHER;
 	
-	private final GrammarProvider grammarProvider;
+	private final Grammar grammar;
 
 	@Inject
 	public CSSGrammarAccess(GrammarProvider grammarProvider) {
-		this.grammarProvider = grammarProvider;
+		this.grammar = internalFindGrammar(grammarProvider);
+	}
+	
+	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
+		Grammar grammar = grammarProvider.getGrammar(this);
+		while (grammar != null) {
+			if ("org.eclipse.papyrus.infra.gmfdiag.CSS".equals(grammar.getName())) {
+				return grammar;
+			}
+			List<Grammar> grammars = grammar.getUsedGrammars();
+			if (!grammars.isEmpty()) {
+				grammar = grammars.iterator().next();
+			} else {
+				return null;
+			}
+		}
+		return grammar;
 	}
 	
-	public Grammar getGrammar() {	
-		return grammarProvider.getGrammar(this);
+	
+	public Grammar getGrammar() {
+		return grammar;
 	}
 	
 
 	
-	//Stylesheet:
+	////Do not create a Stylesheet for WS* (This seems to cause a serialization problem when editing an EMF Model from an Empty file)
+	//
+	//
+	////Do not ignore WS as @charset must be followed by exactly one Space.
+	// Stylesheet:
+	//
 	//	("@charset " charset=STRING ";")? (WS | CDO | CDC)* (imports+=Import (CDO WS* | CDC WS*)*)* (contents+=Content (CDO
+	//
 	//	WS* | CDC WS*)*)*;
 	public StylesheetElements getStylesheetAccess() {
 		return (pStylesheet != null) ? pStylesheet : (pStylesheet = new StylesheetElements());
@@ -1747,6 +1819,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Content:
+	//
 	//	Ruleset | Media | Page;
 	public ContentElements getContentAccess() {
 		return (pContent != null) ? pContent : (pContent = new ContentElements());
@@ -1757,6 +1830,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Import:
+	//
 	//	"@import" (WS* string=STRING | WS uri=Uri) WS* (media+=ID WS* ("," WS* media+=ID)*)? ";" WS*;
 	public ImportElements getImportAccess() {
 		return (pImport != null) ? pImport : (pImport = new ImportElements());
@@ -1767,6 +1841,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Media:
+	//
 	//	"@media" WS media+=ID WS* ("," WS* media+=ID)* "{" WS* rules+=Ruleset* "}" WS*;
 	public MediaElements getMediaAccess() {
 		return (pMedia != null) ? pMedia : (pMedia = new MediaElements());
@@ -1777,7 +1852,9 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Page:
+	//
 	//	{Page} "@page" WS* pseudo=PseudoPage? "{" WS* declarations+=Declaration? (";" WS* declarations+=Declaration?)* "}"
+	//
 	//	WS*;
 	public PageElements getPageAccess() {
 		return (pPage != null) ? pPage : (pPage = new PageElements());
@@ -1788,6 +1865,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//PseudoPage:
+	//
 	//	":" id=ID WS*;
 	public PseudoPageElements getPseudoPageAccess() {
 		return (pPseudoPage != null) ? pPseudoPage : (pPseudoPage = new PseudoPageElements());
@@ -1798,7 +1876,9 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Ruleset:
+	//
 	//	selectors+=Selector ("," WS* selectors+=Selector)* "{" WS* properties+=Declaration? (";" WS*
+	//
 	//	properties+=Declaration?)* "}" WS*;
 	public RulesetElements getRulesetAccess() {
 		return (pRuleset != null) ? pRuleset : (pRuleset = new RulesetElements());
@@ -1809,6 +1889,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Selector:
+	//
 	//	SimpleSelector WS* | CompositeSelector;
 	public SelectorElements getSelectorAccess() {
 		return (pSelector != null) ? pSelector : (pSelector = new SelectorElements());
@@ -1819,7 +1900,10 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	////left=SimpleSelector (combinator=Combinator right=Selector | WS+ (combinator=Combinator? right=Selector)?)?;
+	//
+	//
 	//CompositeSelector:
+	//
 	//	left=SimpleSelector (WS+ | WS* combinator=Combinator) right=Selector;
 	public CompositeSelectorElements getCompositeSelectorAccess() {
 		return (pCompositeSelector != null) ? pCompositeSelector : (pCompositeSelector = new CompositeSelectorElements());
@@ -1830,6 +1914,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SimpleSelector:
+	//
 	//	elementName=(ID | "*") condition+=SelectorCondition* | condition+=SelectorCondition+;
 	public SimpleSelectorElements getSimpleSelectorAccess() {
 		return (pSimpleSelector != null) ? pSimpleSelector : (pSimpleSelector = new SimpleSelectorElements());
@@ -1840,6 +1925,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//SelectorCondition:
+	//
 	//	CSSId | Class | Attribute | Pseudo;
 	public SelectorConditionElements getSelectorConditionAccess() {
 		return (pSelectorCondition != null) ? pSelectorCondition : (pSelectorCondition = new SelectorConditionElements());
@@ -1850,6 +1936,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Combinator:
+	//
 	//	kind=KIND WS*;
 	public CombinatorElements getCombinatorAccess() {
 		return (pCombinator != null) ? pCombinator : (pCombinator = new CombinatorElements());
@@ -1860,6 +1947,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Declaration:
+	//
 	//	property=ID WS* ":" WS* expression=Expression (important?=T_IMPORTANT WS*)?;
 	public DeclarationElements getDeclarationAccess() {
 		return (pDeclaration != null) ? pDeclaration : (pDeclaration = new DeclarationElements());
@@ -1870,6 +1958,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Expression:
+	//
 	//	terms=Term subterms+=Subterm*;
 	public ExpressionElements getExpressionAccess() {
 		return (pExpression != null) ? pExpression : (pExpression = new ExpressionElements());
@@ -1880,6 +1969,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Subterm:
+	//
 	//	operator=Operator? term=Term;
 	public SubtermElements getSubtermAccess() {
 		return (pSubterm != null) ? pSubterm : (pSubterm = new SubtermElements());
@@ -1890,8 +1980,10 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Term:
-	//	(Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor | Function)
-	//	WS*;
+	//
+	//	(Number | Percentage | Length | Ems | Exs | Angle | Time | Frequency | Name | StringValue | Uri | HexColor |
+	//
+	//	Function) WS*;
 	public TermElements getTermAccess() {
 		return (pTerm != null) ? pTerm : (pTerm = new TermElements());
 	}
@@ -1901,6 +1993,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Function:
+	//
 	//	name=ID "(" WS* args=Expression ")";
 	public FunctionElements getFunctionAccess() {
 		return (pFunction != null) ? pFunction : (pFunction = new FunctionElements());
@@ -1911,6 +2004,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Name:
+	//
 	//	value=ID;
 	public NameElements getNameAccess() {
 		return (pName != null) ? pName : (pName = new NameElements());
@@ -1921,7 +2015,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	////Terms  
-	//Number:
+	// Number:
+	//
 	//	op=UnaryOperator? value=T_NUM;
 	public NumberElements getNumberAccess() {
 		return (pNumber != null) ? pNumber : (pNumber = new NumberElements());
@@ -1932,6 +2027,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Percentage:
+	//
 	//	op=UnaryOperator? value=T_NUM unit=PC_UNIT;
 	public PercentageElements getPercentageAccess() {
 		return (pPercentage != null) ? pPercentage : (pPercentage = new PercentageElements());
@@ -1942,6 +2038,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Length:
+	//
 	//	op=UnaryOperator? value=T_NUM unit=LEN_UNIT;
 	public LengthElements getLengthAccess() {
 		return (pLength != null) ? pLength : (pLength = new LengthElements());
@@ -1952,6 +2049,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Ems:
+	//
 	//	op=UnaryOperator? value=T_NUM unit=EM_UNIT;
 	public EmsElements getEmsAccess() {
 		return (pEms != null) ? pEms : (pEms = new EmsElements());
@@ -1962,6 +2060,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Exs:
+	//
 	//	op=UnaryOperator? value=T_NUM unit=EX_UNIT;
 	public ExsElements getExsAccess() {
 		return (pExs != null) ? pExs : (pExs = new ExsElements());
@@ -1972,6 +2071,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Angle:
+	//
 	//	op=UnaryOperator? value=T_NUM unit=ANGLE_UNIT;
 	public AngleElements getAngleAccess() {
 		return (pAngle != null) ? pAngle : (pAngle = new AngleElements());
@@ -1982,6 +2082,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Time:
+	//
 	//	op=UnaryOperator? value=T_NUM unit=TIME_UNIT;
 	public TimeElements getTimeAccess() {
 		return (pTime != null) ? pTime : (pTime = new TimeElements());
@@ -1992,6 +2093,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Frequency:
+	//
 	//	op=UnaryOperator? value=T_NUM unit=FREQ_UNIT;
 	public FrequencyElements getFrequencyAccess() {
 		return (pFrequency != null) ? pFrequency : (pFrequency = new FrequencyElements());
@@ -2002,7 +2104,8 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	/// * | 'url(' WS? url=URL WS? ')' * / //TODO
-	//Uri:
+	// Uri:
+	//
 	//	"url(" WS? value=STRING WS? ")";
 	public UriElements getUriAccess() {
 		return (pUri != null) ? pUri : (pUri = new UriElements());
@@ -2013,6 +2116,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//StringValue:
+	//
 	//	value=STRING;
 	public StringValueElements getStringValueAccess() {
 		return (pStringValue != null) ? pStringValue : (pStringValue = new StringValueElements());
@@ -2023,16 +2127,23 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	////terminal URL:
-	////	(('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII  |  ESCAPE * /)*;
+	// //	(('!' | '#' | '$' | '%' | '&' | '*' | '-' | '~') / * | NON_ASCII  |  ESCAPE * /)*;
+	//
+	//
 	////terminal NON_ASCII:
-	////	(\0240..\0377) //Chars 160 to 255
-	////;
-	////terminal UNICODE:
+	// //	(\0240..\0377) //Chars 160 to 255
+	// //;
+	// //terminal UNICODE:
+	//
+	//
 	////	'\\' HEXA (HEXA (HEXA (HEXA (HEXA (HEXA)?)?)?)?)? ('\r\n' | ' ' | '\t' | '\r' | '\n')?;
-	////
-	////terminal ESCAPE:
+	// //
+	// //terminal ESCAPE:
+	//
+	//
 	////	UNICODE | ('\\' !('\r' | '\n' | '0'..'9' | 'a'..'f' | 'A'..'F'));
-	//HexColor:
+	// HexColor:
+	//
 	//	value=HASH;
 	public HexColorElements getHexColorAccess() {
 		return (pHexColor != null) ? pHexColor : (pHexColor = new HexColorElements());
@@ -2043,6 +2154,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Operator:
+	//
 	//	"/" WS* | "," WS*;
 	public OperatorElements getOperatorAccess() {
 		return (pOperator != null) ? pOperator : (pOperator = new OperatorElements());
@@ -2053,6 +2165,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Class:
+	//
 	//	class=T_CLASS;
 	public ClassElements getClassAccess() {
 		return (pClass != null) ? pClass : (pClass = new ClassElements());
@@ -2063,6 +2176,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Attribute:
+	//
 	//	"[" WS* name=ID WS* value=AttributeValue? "]";
 	public AttributeElements getAttributeAccess() {
 		return (pAttribute != null) ? pAttribute : (pAttribute = new AttributeElements());
@@ -2073,6 +2187,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//AttributeValue:
+	//
 	//	operator=ATTRIBUTE_OP WS* value=(ID | STRING) WS*;
 	public AttributeValueElements getAttributeValueAccess() {
 		return (pAttributeValue != null) ? pAttributeValue : (pAttributeValue = new AttributeValueElements());
@@ -2083,6 +2198,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//Pseudo:
+	//
 	//	":" (pseudo=ID | pseudo=ID "(" WS* (args=ID WS*)? ")");
 	public PseudoElements getPseudoAccess() {
 		return (pPseudo != null) ? pPseudo : (pPseudo = new PseudoElements());
@@ -2093,6 +2209,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//CSSId:
+	//
 	//	value=HASH;
 	public CSSIdElements getCSSIdAccess() {
 		return (pCSSId != null) ? pCSSId : (pCSSId = new CSSIdElements());
@@ -2103,6 +2220,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//UnaryOperator:
+	//
 	//	operator=UNARY;
 	public UnaryOperatorElements getUnaryOperatorAccess() {
 		return (pUnaryOperator != null) ? pUnaryOperator : (pUnaryOperator = new UnaryOperatorElements());
@@ -2113,6 +2231,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum UNARY:
+	//
 	//	NEG="-" | PLUS="+";
 	public UNARYElements getUNARYAccess() {
 		return (unknownRuleUNARY != null) ? unknownRuleUNARY : (unknownRuleUNARY = new UNARYElements());
@@ -2123,6 +2242,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum KIND:
+	//
 	//	FIRST_CHILD=">" | SIBLING="+";
 	public KINDElements getKINDAccess() {
 		return (unknownRuleKIND != null) ? unknownRuleKIND : (unknownRuleKIND = new KINDElements());
@@ -2133,6 +2253,7 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum ATTRIBUTE_OP:
+	//
 	//	EQUALS="=" | CONTAINS="~=" | UNEQUALS="!=";
 	public ATTRIBUTE_OPElements getATTRIBUTE_OPAccess() {
 		return (unknownRuleATTRIBUTE_OP != null) ? unknownRuleATTRIBUTE_OP : (unknownRuleATTRIBUTE_OP = new ATTRIBUTE_OPElements());
@@ -2143,111 +2264,132 @@ public class CSSGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//terminal HASH:
+	//
 	//	"#" ("A".."Z" | "a".."z" | "0".."9")+;
 	public TerminalRule getHASHRule() {
 		return (tHASH != null) ? tHASH : (tHASH = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HASH"));
 	} 
 
 	//terminal T_CLASS:
+	//
 	//	"." ID;
 	public TerminalRule getT_CLASSRule() {
 		return (tT_CLASS != null) ? tT_CLASS : (tT_CLASS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_CLASS"));
 	} 
 
 	////This is not the exact CSS Grammar
-	//terminal T_IMPORTANT:
+	// terminal T_IMPORTANT:
+	//
 	//	"!important";
 	public TerminalRule getT_IMPORTANTRule() {
 		return (tT_IMPORTANT != null) ? tT_IMPORTANT : (tT_IMPORTANT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_IMPORTANT"));
 	} 
 
 	//terminal PC_UNIT:
+	//
 	//	"%";
 	public TerminalRule getPC_UNITRule() {
 		return (tPC_UNIT != null) ? tPC_UNIT : (tPC_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "PC_UNIT"));
 	} 
 
 	//terminal LEN_UNIT:
+	//
 	//	"px" | "cm" | "mm" | "in" | "pt" | "pc";
 	public TerminalRule getLEN_UNITRule() {
 		return (tLEN_UNIT != null) ? tLEN_UNIT : (tLEN_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "LEN_UNIT"));
 	} 
 
 	//terminal EM_UNIT:
+	//
 	//	"em";
 	public TerminalRule getEM_UNITRule() {
 		return (tEM_UNIT != null) ? tEM_UNIT : (tEM_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "EM_UNIT"));
 	} 
 
 	//terminal EX_UNIT:
+	//
 	//	"ex";
 	public TerminalRule getEX_UNITRule() {
 		return (tEX_UNIT != null) ? tEX_UNIT : (tEX_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "EX_UNIT"));
 	} 
 
 	//terminal ANGLE_UNIT:
+	//
 	//	"deg" | "rad" | "grad";
 	public TerminalRule getANGLE_UNITRule() {
 		return (tANGLE_UNIT != null) ? tANGLE_UNIT : (tANGLE_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANGLE_UNIT"));
 	} 
 
 	//terminal TIME_UNIT:
+	//
 	//	"s" | "ms";
 	public TerminalRule getTIME_UNITRule() {
 		return (tTIME_UNIT != null) ? tTIME_UNIT : (tTIME_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "TIME_UNIT"));
 	} 
 
 	//terminal FREQ_UNIT:
+	//
 	//	"hz" | "mhz";
 	public TerminalRule getFREQ_UNITRule() {
 		return (tFREQ_UNIT != null) ? tFREQ_UNIT : (tFREQ_UNIT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "FREQ_UNIT"));
 	} 
 
 	//terminal T_NUM:
+	//
 	//	"0".."9"+ | "0".."9"* "." "0".."9"+;
 	public TerminalRule getT_NUMRule() {
 		return (tT_NUM != null) ? tT_NUM : (tT_NUM = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "T_NUM"));
 	} 
 
 	//terminal ID:
-	//	("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//
+	//	"-"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9" | "-")*;
 	public TerminalRule getIDRule() {
 		return (tID != null) ? tID : (tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ID"));
 	} 
 
 	//terminal STRING:
+	//
 	//	"\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
+	//
 	//	"n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
 	public TerminalRule getSTRINGRule() {
 		return (tSTRING != null) ? tSTRING : (tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "STRING"));
 	} 
 
 	//terminal CDO:
+	//
 	//	"<!--";
 	public TerminalRule getCDORule() {
 		return (tCDO != null) ? tCDO : (tCDO = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "CDO"));
 	} 
 
 	//terminal CDC:
+	//
 	//	"-->";
 	public TerminalRule getCDCRule() {
 		return (tCDC != null) ? tCDC : (tCDC = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "CDC"));
 	} 
 
 	////Doesn't exactly match CSS Comments... * / can be protected by \ : \* / doesn't close the comment in XText, while it does in CSS 
+	//
+	//
 	//terminal ML_COMMENT:
+	//
 	//	"/ *"->"* /";
 	public TerminalRule getML_COMMENTRule() {
 		return (tML_COMMENT != null) ? tML_COMMENT : (tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ML_COMMENT"));
 	} 
 
 	//terminal WS:
+	//
 	//	(" " | "\t" | "\r" | "\n")+;
 	public TerminalRule getWSRule() {
 		return (tWS != null) ? tWS : (tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "WS"));
 	} 
 
 	//terminal ANY_OTHER:
+	//
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
 		return (tANY_OTHER != null) ? tANY_OTHER : (tANY_OTHER = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "ANY_OTHER"));
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
index 2d9c3b9c2df..005d09ed8c0 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/src/org/eclipse/papyrus/infra/gmfdiag/CSS.xtext
@@ -186,7 +186,7 @@ terminal T_NUM:
 	('0'..'9')+ | ('0'..'9')* "." ('0'..'9')+;
 
 terminal ID:
-	('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
+	'-'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9' | '-')*;
 
 terminal STRING:
 	'"' ('\\' ('b' | 't' | 'n' | 'f' | 'r' | 'u' | '"' | "'" | '\\') | !('\\' | '"'))* '"' |