Manifests beautified, regenerated all languages

25 files changed, 737 insertions, 683 deletions

diff --git a/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF b/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF
index ebcaa3b..a4b89a3 100644
--- a/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF
+++ b/devtools/org.eclipse.xtext.reference.ui/META-INF/MANIFEST.MF
@@ -13,4 +13,3 @@ Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Bundle-ActivationPolicy: lazy

 Bundle-Activator: org.eclipse.xtext.reference.ui.Activator

-

diff --git a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
index bda490d..ef87432 100644
--- a/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
+++ b/devtools/org.eclipse.xtext.reference/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Xtext Reference (Incubation)

-Bundle-SymbolicName: org.eclipse.xtext.reference;singleton:=true

-Bundle-Vendor: Eclipse.org

-Bundle-Version: 0.7.0.qualifier

-Eclipse-RegisterBuddy: org.eclipse.xtext.log4j

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Bundle-ActivationPolicy: lazy

-Export-Package: ReferenceModel,

- ReferenceModel.util,

- org.eclipse.xtext.reference,

- org.eclipse.xtext.reference.parseTreeConstruction,

- org.eclipse.xtext.reference.parser.packrat,

- org.eclipse.xtext.reference.parser.packrat.consumers,

- org.eclipse.xtext.reference.referenceGrammar,

- org.eclipse.xtext.reference.referenceGrammar.util,

- org.eclipse.xtext.reference.services,

- org.eclipse.xtext.reference.parser.antlr

-Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15",

- org.eclipse.xtext,

- org.eclipse.xtext.generator,

- de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,

- org.eclipse.emf.mwe.core;bundle-version="0.7.0",

- org.eclipse.xtext.ui.generator,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.eclipse.xtend,

- org.eclipse.xtend.typesystem.emf,

- org.antlr.runtime

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Reference (Incubation)
+Bundle-SymbolicName: org.eclipse.xtext.reference;singleton:=true
+Bundle-Vendor: Eclipse.org
+Bundle-Version: 0.7.0.qualifier
+Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: ReferenceModel,
+ ReferenceModel.util,
+ org.eclipse.xtext.reference,
+ org.eclipse.xtext.reference.parseTreeConstruction,
+ org.eclipse.xtext.reference.parser.packrat,
+ org.eclipse.xtext.reference.parser.packrat.consumers,
+ org.eclipse.xtext.reference.referenceGrammar,
+ org.eclipse.xtext.reference.referenceGrammar.util,
+ org.eclipse.xtext.reference.services,
+ org.eclipse.xtext.reference.parser.antlr
+Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ org.eclipse.xtext,
+ org.eclipse.xtext.generator,
+ de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator,
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime
+
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
index b9b8646..4e2840d 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.common.service.DefaultUIModule;
 public abstract class AbstractDomainmodelUiModule extends DefaultUIModule {
 	
 
-	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
-		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
-	}
-
 	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.example.DomainmodelProposals.class;
 	}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
index 2b5f18b..1ef69d3 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
@@ -20,5 +20,15 @@ Require-Bundle: org.eclipse.xtext.log4j;bundle-version="1.2.15",
  org.eclipse.emf.ecore,

  org.eclipse.emf.common,

  org.antlr.runtime

-Export-Package: org.eclipse.xtext.example,org.eclipse.xtext.example.domainmodel,org.eclipse.xtext.example.domainmodel.impl,org.eclipse.xtext.example.domainmodel.util,org.eclipse.xtext.example.parseTreeConstruction,org.eclipse.xtext.example.parser.antlr,org.eclipse.xtext.example.parser.antlr.internal,org.eclipse.xtext.example.parser.packrat,org.eclipse.xtext.example.parser.packrat.consumers,org.eclipse.xtext.example.services,xtext.example

+Export-Package: org.eclipse.xtext.example,

+ org.eclipse.xtext.example.domainmodel,

+ org.eclipse.xtext.example.domainmodel.impl,

+ org.eclipse.xtext.example.domainmodel.util,

+ org.eclipse.xtext.example.parseTreeConstruction,

+ org.eclipse.xtext.example.parser.antlr,

+ org.eclipse.xtext.example.parser.antlr.internal,

+ org.eclipse.xtext.example.parser.packrat,

+ org.eclipse.xtext.example.parser.packrat.consumers,

+ org.eclipse.xtext.example.services,

+ xtext.example

 

diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java
index 395f5a7..27ae3ed 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java
@@ -38,16 +38,16 @@ public abstract class AbstractDomainmodelRuntimeModule extends DefaultRuntimeMod
 		return org.eclipse.xtext.example.parser.antlr.internal.InternalDomainmodelLexer.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.example.parser.antlr.DomainmodelAntlrTokenFileProvider.class;
+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
+		return org.eclipse.xtext.example.parser.antlr.DomainmodelParser.class;
 	}
 
 	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
 		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
-		return org.eclipse.xtext.example.parser.antlr.DomainmodelParser.class;
+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.example.parser.antlr.DomainmodelAntlrTokenFileProvider.class;
 	}
 
 	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens
index ace18c0..825904e 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.tokens
@@ -1,23 +1,23 @@
+RULE_ML_COMMENT=7
 RULE_ID=5
+RULE_WS=9
+RULE_INT=6
 RULE_STRING=4
 RULE_ANY_OTHER=10
-RULE_INT=6
-RULE_WS=9
 RULE_SL_COMMENT=8
-RULE_ML_COMMENT=7
-'}'=14
-'op'=22
-'extends'=17
-'{'=13
-'package'=12
-'datatype'=15
-'attr'=18
-'entity'=16
 'opposite'=21
-':'=19
-'ref'=20
-'('=23
-','=24
-'.'=26
 ')'=25
+'datatype'=15
+'package'=12
 'import'=11
+'{'=13
+','=24
+'('=23
+':'=19
+'op'=22
+'attr'=18
+'.'=26
+'extends'=17
+'ref'=20
+'}'=14
+'entity'=16
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
index 05e2c8a..66ac974 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java
@@ -11,30 +11,30 @@ import java.util.List;
 import java.util.ArrayList;
 
 public class InternalDomainmodelLexer extends Lexer {
-    public static final int RULE_ID=5;
-    public static final int RULE_ANY_OTHER=10;
-    public static final int T26=26;
-    public static final int T25=25;
-    public static final int Tokens=27;
-    public static final int T24=24;
-    public static final int EOF=-1;
-    public static final int RULE_SL_COMMENT=8;
-    public static final int T23=23;
-    public static final int T22=22;
     public static final int T21=21;
-    public static final int T20=20;
     public static final int RULE_ML_COMMENT=7;
-    public static final int RULE_STRING=4;
-    public static final int RULE_INT=6;
+    public static final int T14=14;
+    public static final int RULE_ID=5;
+    public static final int T22=22;
     public static final int T11=11;
+    public static final int RULE_STRING=4;
     public static final int T12=12;
+    public static final int T23=23;
     public static final int T13=13;
-    public static final int T14=14;
+    public static final int T20=20;
+    public static final int T25=25;
+    public static final int T18=18;
     public static final int RULE_WS=9;
+    public static final int T26=26;
     public static final int T15=15;
-    public static final int T16=16;
+    public static final int RULE_INT=6;
+    public static final int EOF=-1;
     public static final int T17=17;
-    public static final int T18=18;
+    public static final int Tokens=27;
+    public static final int RULE_ANY_OTHER=10;
+    public static final int T16=16;
+    public static final int RULE_SL_COMMENT=8;
+    public static final int T24=24;
     public static final int T19=19;
     public InternalDomainmodelLexer() {;} 
     public InternalDomainmodelLexer(CharStream input) {
@@ -995,27 +995,33 @@ public class InternalDomainmodelLexer extends Lexer {
         }
         else if ( (LA12_0=='e') ) {
             switch ( input.LA(2) ) {
-            case 'n':
+            case 'x':
                 {
                 int LA12_29 = input.LA(3);
 
                 if ( (LA12_29=='t') ) {
                     int LA12_47 = input.LA(4);
 
-                    if ( (LA12_47=='i') ) {
+                    if ( (LA12_47=='e') ) {
                         int LA12_56 = input.LA(5);
 
-                        if ( (LA12_56=='t') ) {
+                        if ( (LA12_56=='n') ) {
                             int LA12_64 = input.LA(6);
 
-                            if ( (LA12_64=='y') ) {
+                            if ( (LA12_64=='d') ) {
                                 int LA12_71 = input.LA(7);
 
-                                if ( ((LA12_71>='0' && LA12_71<='9')||(LA12_71>='A' && LA12_71<='Z')||LA12_71=='_'||(LA12_71>='a' && LA12_71<='z')) ) {
-                                    alt12=17;
+                                if ( (LA12_71=='s') ) {
+                                    int LA12_77 = input.LA(8);
+
+                                    if ( ((LA12_77>='0' && LA12_77<='9')||(LA12_77>='A' && LA12_77<='Z')||LA12_77=='_'||(LA12_77>='a' && LA12_77<='z')) ) {
+                                        alt12=17;
+                                    }
+                                    else {
+                                        alt12=7;}
                                 }
                                 else {
-                                    alt12=6;}
+                                    alt12=17;}
                             }
                             else {
                                 alt12=17;}
@@ -1030,33 +1036,27 @@ public class InternalDomainmodelLexer extends Lexer {
                     alt12=17;}
                 }
                 break;
-            case 'x':
+            case 'n':
                 {
                 int LA12_30 = input.LA(3);
 
                 if ( (LA12_30=='t') ) {
                     int LA12_48 = input.LA(4);
 
-                    if ( (LA12_48=='e') ) {
+                    if ( (LA12_48=='i') ) {
                         int LA12_57 = input.LA(5);
 
-                        if ( (LA12_57=='n') ) {
+                        if ( (LA12_57=='t') ) {
                             int LA12_65 = input.LA(6);
 
-                            if ( (LA12_65=='d') ) {
+                            if ( (LA12_65=='y') ) {
                                 int LA12_72 = input.LA(7);
 
-                                if ( (LA12_72=='s') ) {
-                                    int LA12_78 = input.LA(8);
-
-                                    if ( ((LA12_78>='0' && LA12_78<='9')||(LA12_78>='A' && LA12_78<='Z')||LA12_78=='_'||(LA12_78>='a' && LA12_78<='z')) ) {
-                                        alt12=17;
-                                    }
-                                    else {
-                                        alt12=7;}
+                                if ( ((LA12_72>='0' && LA12_72<='9')||(LA12_72>='A' && LA12_72<='Z')||LA12_72=='_'||(LA12_72>='a' && LA12_72<='z')) ) {
+                                    alt12=17;
                                 }
                                 else {
-                                    alt12=17;}
+                                    alt12=6;}
                             }
                             else {
                                 alt12=17;}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
index b8564ac..79e17b0 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
@@ -25,14 +25,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'import'", "'package'", "'{'", "'}'", "'datatype'", "'entity'", "'extends'", "'attr'", "':'", "'ref'", "'opposite'", "'op'", "'('", "','", "')'", "'.'"
     };
+    public static final int RULE_ML_COMMENT=7;
     public static final int RULE_ID=5;
+    public static final int RULE_WS=9;
+    public static final int EOF=-1;
+    public static final int RULE_INT=6;
     public static final int RULE_STRING=4;
     public static final int RULE_ANY_OTHER=10;
-    public static final int RULE_INT=6;
-    public static final int RULE_WS=9;
     public static final int RULE_SL_COMMENT=8;
-    public static final int EOF=-1;
-    public static final int RULE_ML_COMMENT=7;
 
         public InternalDomainmodelParser(TokenStream input) {
             super(input);
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF
index 5f9c056..df19bb6 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EcoreDsl UI Plug-in
-Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl.ui;singleton:=true
-Bundle-Version: 0.0.1
-Require-Bundle: org.eclipse.xtext.ui.core,
- org.eclipse.xtext.ui.common,
- org.eclipse.ui.editors;bundle-version="3.4.0",
- org.eclipse.ui,
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.jdt.core;bundle-version="3.4.0",
- org.eclipse.emf.ecore.edit;bundle-version="2.4.0",
- org.eclipse.xtext.example.ecoredsl;bundle-version="0.7.0"
-Bundle-Vendor: mycompany.com
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.xtext.example.EcoreDslActivator
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: EcoreDsl UI Plug-in

+Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl.ui;singleton:=true

+Bundle-Version: 0.0.1

+Require-Bundle: org.eclipse.xtext.ui.core,

+ org.eclipse.xtext.ui.common,

+ org.eclipse.ui.editors;bundle-version="3.4.0",

+ org.eclipse.ui,

+ org.eclipse.core.expressions;bundle-version="3.4.0",

+ org.eclipse.jdt.core;bundle-version="3.4.0",

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

+ org.eclipse.xtext.example.ecoredsl;bundle-version="0.7.0"

+Bundle-Vendor: mycompany.com

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-ActivationPolicy: lazy

+Bundle-Activator: org.eclipse.xtext.example.EcoreDslActivator

diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
index 2a870f7..b7adfe3 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/AbstractEcoreDslUiModule.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.common.service.DefaultUIModule;
 public abstract class AbstractEcoreDslUiModule extends DefaultUIModule {
 	
 
-	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
-		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
-	}
-
 	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
 	}
 
+	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.example.EcoreDslProposals.class;
 	}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
index b4ce68b..1c5151f 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.ecoredsl/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Xtext Ecore DSL Example (Incubation)

-Bundle-Vendor: Eclipse.org

-Bundle-Version: 0.7.0.qualifier

-Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl;singleton:=true

-Eclipse-RegisterBuddy: org.eclipse.xtext.log4j

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Bundle-ActivationPolicy: lazy

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator,

- org.eclipse.xtext.log4j;bundle-version="1.2.15",

- de.itemis.xtext.antlr;resolution:=optional,

- org.eclipse.emf.mwe.core;bundle-version="0.7.0",

- org.eclipse.xtend;bundle-version="0.7.0",

- org.eclipse.xtext.ui.generator,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.eclipse.xtend.typesystem.emf,

- org.antlr.runtime

-Export-Package: org.eclipse.xtext.example,

- org.eclipse.xtext.example.ecoredsl,

- org.eclipse.xtext.example.parseTreeConstruction,

- org.eclipse.xtext.example.parser.antlr,

- org.eclipse.xtext.example.parser.packrat,

- org.eclipse.xtext.example.services,

- org.eclipse.xtext.example.parser.packrat.consumers

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Ecore DSL Example (Incubation)
+Bundle-Vendor: Eclipse.org
+Bundle-Version: 0.7.0.qualifier
+Bundle-SymbolicName: org.eclipse.xtext.example.ecoredsl;singleton:=true
+Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ de.itemis.xtext.antlr;resolution:=optional,
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtend;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator,
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime
+Export-Package: org.eclipse.xtext.example,
+ org.eclipse.xtext.example.ecoredsl,
+ org.eclipse.xtext.example.parseTreeConstruction,
+ org.eclipse.xtext.example.parser.antlr,
+ org.eclipse.xtext.example.parser.packrat,
+ org.eclipse.xtext.example.services,
+ org.eclipse.xtext.example.parser.packrat.consumers
+
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java
index 9e4bf5f..b4dff54 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/AbstractEcoreDslRuntimeModule.java
@@ -38,16 +38,16 @@ public abstract class AbstractEcoreDslRuntimeModule extends DefaultRuntimeModule
 		return org.eclipse.xtext.example.parser.antlr.internal.InternalEcoreDslLexer.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
-		return org.eclipse.xtext.example.parser.antlr.EcoreDslAntlrTokenFileProvider.class;
+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
+		return org.eclipse.xtext.example.parser.antlr.EcoreDslParser.class;
 	}
 
 	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
 		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
-		return org.eclipse.xtext.example.parser.antlr.EcoreDslParser.class;
+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.example.parser.antlr.EcoreDslAntlrTokenFileProvider.class;
 	}
 
 	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens
index 76cdfa1..f681c81 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.tokens
@@ -1,53 +1,53 @@
+RULE_ML_COMMENT=7
 RULE_ID=4
+RULE_WS=9
+RULE_INT=6
 RULE_STRING=5
 RULE_ANY_OTHER=10
-RULE_INT=6
-RULE_WS=9
 RULE_SL_COMMENT=8
-RULE_ML_COMMENT=7
-'enum'=48
+'<'=29
+'readonly'=35
 '..'=42
-'transient'=37
-'nsURI'=15
-'#'=47
-'class'=28
-'val'=45
-'throws'=53
+'interface'=27
 '>'=30
-'datatype'=20
-'volatile'=36
-'nsPrefix'=16
+'$'=55
+'val'=45
+'package'=14
+'-'=56
 ';'=13
+'?'=49
+']'=43
+','=24
+'nsURI'=15
+'op'=51
+'ID'=32
+'ref'=46
 '='=12
-'@'=22
+'['=41
+'derived'=39
+'volatile'=36
+'enum'=48
 'unsettable'=38
-'.'=54
+'local'=44
 ')'=25
 'super'=50
-'import'=11
-'$'=55
-'}'=18
-'op'=51
-'abstract'=26
+'random'=34
+'datatype'=20
+'@'=22
 '!serializable'=19
-'extends'=31
-'readonly'=35
 '{'=17
-'package'=14
-'bag'=33
+'import'=11
 'void'=52
-'?'=49
-'attr'=40
-'<'=29
-'ref'=46
 '('=23
+'throws'=53
+'transient'=37
+'nsPrefix'=16
 ':'=21
-'-'=56
-'['=41
-'derived'=39
-'local'=44
-','=24
-'random'=34
-']'=43
-'ID'=32
-'interface'=27
+'#'=47
+'attr'=40
+'.'=54
+'extends'=31
+'bag'=33
+'class'=28
+'}'=18
+'abstract'=26
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
index 516a391..bf5676d 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
@@ -11,61 +11,61 @@ import java.util.List;
 import java.util.ArrayList;
 
 public class InternalEcoreDslLexer extends Lexer {
-    public static final int RULE_ID=4;
-    public static final int RULE_ANY_OTHER=10;
+    public static final int T14=14;
     public static final int T29=29;
-    public static final int T28=28;
-    public static final int T27=27;
-    public static final int T26=26;
-    public static final int T25=25;
-    public static final int EOF=-1;
-    public static final int T24=24;
-    public static final int T23=23;
-    public static final int T22=22;
-    public static final int T21=21;
+    public static final int T36=36;
+    public static final int RULE_STRING=5;
+    public static final int T35=35;
+    public static final int T45=45;
     public static final int T20=20;
+    public static final int T34=34;
+    public static final int T25=25;
+    public static final int T18=18;
+    public static final int T37=37;
+    public static final int T26=26;
     public static final int RULE_INT=6;
+    public static final int T32=32;
+    public static final int T17=17;
+    public static final int T51=51;
+    public static final int T46=46;
+    public static final int T16=16;
     public static final int T38=38;
-    public static final int T37=37;
+    public static final int T41=41;
+    public static final int T24=24;
+    public static final int T19=19;
     public static final int T39=39;
-    public static final int T34=34;
+    public static final int T21=21;
+    public static final int T44=44;
+    public static final int T55=55;
+    public static final int RULE_ML_COMMENT=7;
+    public static final int RULE_ID=4;
     public static final int T33=33;
-    public static final int T36=36;
-    public static final int T35=35;
-    public static final int T30=30;
-    public static final int T32=32;
-    public static final int T31=31;
-    public static final int T49=49;
-    public static final int T48=48;
+    public static final int T11=11;
+    public static final int T22=22;
+    public static final int T50=50;
     public static final int T43=43;
-    public static final int Tokens=57;
-    public static final int RULE_SL_COMMENT=8;
+    public static final int T12=12;
+    public static final int T23=23;
+    public static final int T28=28;
     public static final int T42=42;
-    public static final int T41=41;
     public static final int T40=40;
-    public static final int T47=47;
-    public static final int T46=46;
-    public static final int T45=45;
-    public static final int RULE_ML_COMMENT=7;
-    public static final int T44=44;
-    public static final int RULE_STRING=5;
-    public static final int T50=50;
-    public static final int T11=11;
-    public static final int T12=12;
     public static final int T13=13;
-    public static final int T14=14;
-    public static final int T52=52;
-    public static final int T15=15;
+    public static final int T56=56;
     public static final int RULE_WS=9;
-    public static final int T51=51;
-    public static final int T16=16;
+    public static final int T48=48;
+    public static final int T15=15;
     public static final int T54=54;
-    public static final int T17=17;
+    public static final int EOF=-1;
+    public static final int T47=47;
+    public static final int Tokens=57;
     public static final int T53=53;
-    public static final int T18=18;
-    public static final int T56=56;
-    public static final int T19=19;
-    public static final int T55=55;
+    public static final int RULE_ANY_OTHER=10;
+    public static final int T31=31;
+    public static final int T49=49;
+    public static final int RULE_SL_COMMENT=8;
+    public static final int T27=27;
+    public static final int T52=52;
+    public static final int T30=30;
     public InternalEcoreDslLexer() {;} 
     public InternalEcoreDslLexer(CharStream input) {
         super(input);
@@ -1443,27 +1443,45 @@ public class InternalEcoreDslLexer extends Lexer {
 
         if ( (LA12_0=='i') ) {
             switch ( input.LA(2) ) {
-            case 'm':
+            case 'n':
                 {
                 int LA12_44 = input.LA(3);
 
-                if ( (LA12_44=='p') ) {
+                if ( (LA12_44=='t') ) {
                     int LA12_93 = input.LA(4);
 
-                    if ( (LA12_93=='o') ) {
+                    if ( (LA12_93=='e') ) {
                         int LA12_119 = input.LA(5);
 
                         if ( (LA12_119=='r') ) {
                             int LA12_143 = input.LA(6);
 
-                            if ( (LA12_143=='t') ) {
+                            if ( (LA12_143=='f') ) {
                                 int LA12_164 = input.LA(7);
 
-                                if ( ((LA12_164>='0' && LA12_164<='9')||(LA12_164>='A' && LA12_164<='Z')||LA12_164=='_'||(LA12_164>='a' && LA12_164<='z')) ) {
-                                    alt12=47;
+                                if ( (LA12_164=='a') ) {
+                                    int LA12_182 = input.LA(8);
+
+                                    if ( (LA12_182=='c') ) {
+                                        int LA12_196 = input.LA(9);
+
+                                        if ( (LA12_196=='e') ) {
+                                            int LA12_207 = input.LA(10);
+
+                                            if ( ((LA12_207>='0' && LA12_207<='9')||(LA12_207>='A' && LA12_207<='Z')||LA12_207=='_'||(LA12_207>='a' && LA12_207<='z')) ) {
+                                                alt12=47;
+                                            }
+                                            else {
+                                                alt12=17;}
+                                        }
+                                        else {
+                                            alt12=47;}
+                                    }
+                                    else {
+                                        alt12=47;}
                                 }
                                 else {
-                                    alt12=1;}
+                                    alt12=47;}
                             }
                             else {
                                 alt12=47;}
@@ -1478,45 +1496,27 @@ public class InternalEcoreDslLexer extends Lexer {
                     alt12=47;}
                 }
                 break;
-            case 'n':
+            case 'm':
                 {
                 int LA12_45 = input.LA(3);
 
-                if ( (LA12_45=='t') ) {
+                if ( (LA12_45=='p') ) {
                     int LA12_94 = input.LA(4);
 
-                    if ( (LA12_94=='e') ) {
+                    if ( (LA12_94=='o') ) {
                         int LA12_120 = input.LA(5);
 
                         if ( (LA12_120=='r') ) {
                             int LA12_144 = input.LA(6);
 
-                            if ( (LA12_144=='f') ) {
+                            if ( (LA12_144=='t') ) {
                                 int LA12_165 = input.LA(7);
 
-                                if ( (LA12_165=='a') ) {
-                                    int LA12_183 = input.LA(8);
-
-                                    if ( (LA12_183=='c') ) {
-                                        int LA12_196 = input.LA(9);
-
-                                        if ( (LA12_196=='e') ) {
-                                            int LA12_207 = input.LA(10);
-
-                                            if ( ((LA12_207>='0' && LA12_207<='9')||(LA12_207>='A' && LA12_207<='Z')||LA12_207=='_'||(LA12_207>='a' && LA12_207<='z')) ) {
-                                                alt12=47;
-                                            }
-                                            else {
-                                                alt12=17;}
-                                        }
-                                        else {
-                                            alt12=47;}
-                                    }
-                                    else {
-                                        alt12=47;}
+                                if ( ((LA12_165>='0' && LA12_165<='9')||(LA12_165>='A' && LA12_165<='Z')||LA12_165=='_'||(LA12_165>='a' && LA12_165<='z')) ) {
+                                    alt12=47;
                                 }
                                 else {
-                                    alt12=47;}
+                                    alt12=1;}
                             }
                             else {
                                 alt12=47;}
@@ -1591,20 +1591,43 @@ public class InternalEcoreDslLexer extends Lexer {
 
             if ( (LA12_5=='s') ) {
                 switch ( input.LA(3) ) {
-                case 'P':
+                case 'U':
                     {
                     int LA12_96 = input.LA(4);
 
-                    if ( (LA12_96=='r') ) {
+                    if ( (LA12_96=='R') ) {
                         int LA12_122 = input.LA(5);
 
-                        if ( (LA12_122=='e') ) {
+                        if ( (LA12_122=='I') ) {
                             int LA12_146 = input.LA(6);
 
-                            if ( (LA12_146=='f') ) {
-                                int LA12_167 = input.LA(7);
+                            if ( ((LA12_146>='0' && LA12_146<='9')||(LA12_146>='A' && LA12_146<='Z')||LA12_146=='_'||(LA12_146>='a' && LA12_146<='z')) ) {
+                                alt12=47;
+                            }
+                            else {
+                                alt12=5;}
+                        }
+                        else {
+                            alt12=47;}
+                    }
+                    else {
+                        alt12=47;}
+                    }
+                    break;
+                case 'P':
+                    {
+                    int LA12_97 = input.LA(4);
+
+                    if ( (LA12_97=='r') ) {
+                        int LA12_123 = input.LA(5);
+
+                        if ( (LA12_123=='e') ) {
+                            int LA12_147 = input.LA(6);
+
+                            if ( (LA12_147=='f') ) {
+                                int LA12_168 = input.LA(7);
 
-                                if ( (LA12_167=='i') ) {
+                                if ( (LA12_168=='i') ) {
                                     int LA12_185 = input.LA(8);
 
                                     if ( (LA12_185=='x') ) {
@@ -1632,29 +1655,6 @@ public class InternalEcoreDslLexer extends Lexer {
                         alt12=47;}
                     }
                     break;
-                case 'U':
-                    {
-                    int LA12_97 = input.LA(4);
-
-                    if ( (LA12_97=='R') ) {
-                        int LA12_123 = input.LA(5);
-
-                        if ( (LA12_123=='I') ) {
-                            int LA12_147 = input.LA(6);
-
-                            if ( ((LA12_147>='0' && LA12_147<='9')||(LA12_147>='A' && LA12_147<='Z')||LA12_147=='_'||(LA12_147>='a' && LA12_147<='z')) ) {
-                                alt12=47;
-                            }
-                            else {
-                                alt12=5;}
-                        }
-                        else {
-                            alt12=47;}
-                    }
-                    else {
-                        alt12=47;}
-                    }
-                    break;
                 default:
                     alt12=47;}
 
@@ -1903,20 +1903,43 @@ public class InternalEcoreDslLexer extends Lexer {
         }
         else if ( (LA12_0=='e') ) {
             switch ( input.LA(2) ) {
-            case 'x':
+            case 'n':
                 {
                 int LA12_66 = input.LA(3);
 
-                if ( (LA12_66=='t') ) {
+                if ( (LA12_66=='u') ) {
                     int LA12_103 = input.LA(4);
 
-                    if ( (LA12_103=='e') ) {
+                    if ( (LA12_103=='m') ) {
                         int LA12_129 = input.LA(5);
 
-                        if ( (LA12_129=='n') ) {
-                            int LA12_153 = input.LA(6);
+                        if ( ((LA12_129>='0' && LA12_129<='9')||(LA12_129>='A' && LA12_129<='Z')||LA12_129=='_'||(LA12_129>='a' && LA12_129<='z')) ) {
+                            alt12=47;
+                        }
+                        else {
+                            alt12=38;}
+                    }
+                    else {
+                        alt12=47;}
+                }
+                else {
+                    alt12=47;}
+                }
+                break;
+            case 'x':
+                {
+                int LA12_67 = input.LA(3);
+
+                if ( (LA12_67=='t') ) {
+                    int LA12_104 = input.LA(4);
+
+                    if ( (LA12_104=='e') ) {
+                        int LA12_130 = input.LA(5);
 
-                            if ( (LA12_153=='d') ) {
+                        if ( (LA12_130=='n') ) {
+                            int LA12_154 = input.LA(6);
+
+                            if ( (LA12_154=='d') ) {
                                 int LA12_173 = input.LA(7);
 
                                 if ( (LA12_173=='s') ) {
@@ -1944,29 +1967,6 @@ public class InternalEcoreDslLexer extends Lexer {
                     alt12=47;}
                 }
                 break;
-            case 'n':
-                {
-                int LA12_67 = input.LA(3);
-
-                if ( (LA12_67=='u') ) {
-                    int LA12_104 = input.LA(4);
-
-                    if ( (LA12_104=='m') ) {
-                        int LA12_130 = input.LA(5);
-
-                        if ( ((LA12_130>='0' && LA12_130<='9')||(LA12_130>='A' && LA12_130<='Z')||LA12_130=='_'||(LA12_130>='a' && LA12_130<='z')) ) {
-                            alt12=47;
-                        }
-                        else {
-                            alt12=38;}
-                    }
-                    else {
-                        alt12=47;}
-                }
-                else {
-                    alt12=47;}
-                }
-                break;
             default:
                 alt12=47;}
 
@@ -2110,17 +2110,34 @@ public class InternalEcoreDslLexer extends Lexer {
         }
         else if ( (LA12_0=='v') ) {
             switch ( input.LA(2) ) {
+            case 'a':
+                {
+                int LA12_72 = input.LA(3);
+
+                if ( (LA12_72=='l') ) {
+                    int LA12_110 = input.LA(4);
+
+                    if ( ((LA12_110>='0' && LA12_110<='9')||(LA12_110>='A' && LA12_110<='Z')||LA12_110=='_'||(LA12_110>='a' && LA12_110<='z')) ) {
+                        alt12=47;
+                    }
+                    else {
+                        alt12=35;}
+                }
+                else {
+                    alt12=47;}
+                }
+                break;
             case 'o':
                 {
                 switch ( input.LA(3) ) {
                 case 'i':
                     {
-                    int LA12_110 = input.LA(4);
+                    int LA12_111 = input.LA(4);
 
-                    if ( (LA12_110=='d') ) {
-                        int LA12_135 = input.LA(5);
+                    if ( (LA12_111=='d') ) {
+                        int LA12_136 = input.LA(5);
 
-                        if ( ((LA12_135>='0' && LA12_135<='9')||(LA12_135>='A' && LA12_135<='Z')||LA12_135=='_'||(LA12_135>='a' && LA12_135<='z')) ) {
+                        if ( ((LA12_136>='0' && LA12_136<='9')||(LA12_136>='A' && LA12_136<='Z')||LA12_136=='_'||(LA12_136>='a' && LA12_136<='z')) ) {
                             alt12=47;
                         }
                         else {
@@ -2132,12 +2149,12 @@ public class InternalEcoreDslLexer extends Lexer {
                     break;
                 case 'l':
                     {
-                    int LA12_111 = input.LA(4);
+                    int LA12_112 = input.LA(4);
 
-                    if ( (LA12_111=='a') ) {
-                        int LA12_136 = input.LA(5);
+                    if ( (LA12_112=='a') ) {
+                        int LA12_137 = input.LA(5);
 
-                        if ( (LA12_136=='t') ) {
+                        if ( (LA12_137=='t') ) {
                             int LA12_158 = input.LA(6);
 
                             if ( (LA12_158=='i') ) {
@@ -2176,23 +2193,6 @@ public class InternalEcoreDslLexer extends Lexer {
 
                 }
                 break;
-            case 'a':
-                {
-                int LA12_73 = input.LA(3);
-
-                if ( (LA12_73=='l') ) {
-                    int LA12_112 = input.LA(4);
-
-                    if ( ((LA12_112>='0' && LA12_112<='9')||(LA12_112>='A' && LA12_112<='Z')||LA12_112=='_'||(LA12_112>='a' && LA12_112<='z')) ) {
-                        alt12=47;
-                    }
-                    else {
-                        alt12=35;}
-                }
-                else {
-                    alt12=47;}
-                }
-                break;
             default:
                 alt12=47;}
 
@@ -2497,14 +2497,14 @@ public class InternalEcoreDslLexer extends Lexer {
         }
         else if ( (LA12_0=='/') ) {
             switch ( input.LA(2) ) {
-            case '*':
+            case '/':
                 {
-                alt12=50;
+                alt12=51;
                 }
                 break;
-            case '/':
+            case '*':
                 {
-                alt12=51;
+                alt12=50;
                 }
                 break;
             default:
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
index e8d9a42..0d971e6 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
@@ -25,14 +25,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'import'", "'='", "';'", "'package'", "'nsURI'", "'nsPrefix'", "'{'", "'}'", "'!serializable'", "'datatype'", "':'", "'@'", "'('", "','", "')'", "'abstract'", "'interface'", "'class'", "'<'", "'>'", "'extends'", "'ID'", "'bag'", "'random'", "'readonly'", "'volatile'", "'transient'", "'unsettable'", "'derived'", "'attr'", "'['", "'..'", "']'", "'local'", "'val'", "'ref'", "'#'", "'enum'", "'?'", "'super'", "'op'", "'void'", "'throws'", "'.'", "'$'", "'-'"
     };
+    public static final int RULE_ML_COMMENT=7;
     public static final int RULE_ID=4;
+    public static final int RULE_WS=9;
+    public static final int EOF=-1;
+    public static final int RULE_INT=6;
     public static final int RULE_STRING=5;
     public static final int RULE_ANY_OTHER=10;
-    public static final int RULE_INT=6;
-    public static final int RULE_WS=9;
     public static final int RULE_SL_COMMENT=8;
-    public static final int EOF=-1;
-    public static final int RULE_ML_COMMENT=7;
 
         public InternalEcoreDslParser(TokenStream input) {
             super(input);
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
index 40fede4..f113ce7 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Xtext DSL Example UI (Incubation)

-Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ui;singleton:=true

-Bundle-Vendor: Eclipse.org

-Bundle-Version: 0.7.0.qualifier

-Eclipse-RegisterBuddy: org.eclipse.xtext.log4j,org.eclipse.xtext.service.ui,org.eclipse.xtext.service

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.xtext.example

-Require-Bundle: org.eclipse.xtext.example.fowlerdsl,

- org.eclipse.xtext.ui.core,

- org.eclipse.xtext.ui.common,

- org.eclipse.xtext.xtend;bundle-version="0.7.0";resolution:=optional,

- org.eclipse.ui.editors,

- org.eclipse.ui

-Bundle-Activator: org.eclipse.xtext.example.FowlerDslActivator

-Bundle-ActivationPolicy: lazy

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext DSL Example UI (Incubation)
+Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ui;singleton:=true
+Bundle-Vendor: Eclipse.org
+Bundle-Version: 0.7.0.qualifier
+Eclipse-RegisterBuddy: org.eclipse.xtext.log4j,org.eclipse.xtext.service.ui,org.eclipse.xtext.service
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.xtext.example
+Require-Bundle: org.eclipse.xtext.example.fowlerdsl,
+ org.eclipse.xtext.ui.core,
+ org.eclipse.xtext.ui.common,
+ org.eclipse.xtext.xtend;bundle-version="0.7.0";resolution:=optional,
+ org.eclipse.ui.editors,
+ org.eclipse.ui
+Bundle-Activator: org.eclipse.xtext.example.FowlerDslActivator
+Bundle-ActivationPolicy: lazy
+
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF b/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
index 219055a..4b731c7 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
@@ -19,5 +19,14 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtend,

  org.eclipse.xtend.typesystem.emf,

  org.antlr.runtime

-Export-Package: org.eclipse.xtext.example,org.eclipse.xtext.example.fowlerdsl,org.eclipse.xtext.example.fowlerdsl.impl,org.eclipse.xtext.example.fowlerdsl.util,org.eclipse.xtext.example.parseTreeConstruction,org.eclipse.xtext.example.parser.antlr,org.eclipse.xtext.example.parser.antlr.internal,org.eclipse.xtext.example.parser.packrat,org.eclipse.xtext.example.parser.packrat.consumers,org.eclipse.xtext.example.services

+Export-Package: org.eclipse.xtext.example,

+ org.eclipse.xtext.example.fowlerdsl,

+ org.eclipse.xtext.example.fowlerdsl.impl,

+ org.eclipse.xtext.example.fowlerdsl.util,

+ org.eclipse.xtext.example.parseTreeConstruction,

+ org.eclipse.xtext.example.parser.antlr,

+ org.eclipse.xtext.example.parser.antlr.internal,

+ org.eclipse.xtext.example.parser.packrat,

+ org.eclipse.xtext.example.parser.packrat.consumers,

+ org.eclipse.xtext.example.services

 

diff --git a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
index 1b67afc..c792ac6 100644
--- a/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.generator.tests/META-INF/MANIFEST.MF
@@ -1,143 +1,143 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Xtext Generator Tests (Incubation)

-Bundle-SymbolicName: org.eclipse.xtext.generator.tests;singleton:=true

-Bundle-Version: 0.7.0.qualifier

-Bundle-Vendor: Eclipse.org

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator,

- org.junit,

- org.eclipse.emf.compare,

- org.eclipse.emf.compare.diff,

- org.eclipse.emf.compare.match,

- org.eclipse.xtext.log4j;bundle-version="1.2.15",

- org.eclipse.xtend,

- org.eclipse.xtend.typesystem.emf,

- org.eclipse.xtend.util.stdlib,

- de.itemis.xtext.antlr;resolution:=optional,

- org.easymock;bundle-version="2.3.0",

- org.eclipse.xtext.junit;bundle-version="0.7.0",

- org.eclipse.emf.mwe.utils;bundle-version="0.7.0",

- org.eclipse.emf.index;bundle-version="1.0.0",

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime

-Bundle-ClassPath: lib/simple.jar,.

-Export-Package: org.eclipse.xtext,

- org.eclipse.xtext.grammarinheritance,

- org.eclipse.xtext.grammarinheritance.ametamodel,

- org.eclipse.xtext.parser.keywords,

- org.eclipse.xtext.testlanguages,

- org.eclipse.xtext.xtextTest,

- org.eclipse.xtext.parser.packrat,

- org.eclipse.xtext.parser.packrat.consumers,

- org.eclipse.xtext.parseTreeConstruction,

- org.eclipse.xtext.parser.antlr,

- org.eclipse.xtext.crossrefs,

- org.eclipse.xtext.crossrefs.importedURI,

- org.eclipse.xtext.crossrefs.parser.packrat,

- org.eclipse.xtext.crossrefs.parser.packrat.consumers,

- org.eclipse.xtext.crossrefs.parseTreeConstruction,

- org.eclipse.xtext.crossrefs.parser.antlr,

- org.eclipse.xtext.crossrefs.langATestLanguage,

- org.eclipse.xtext.dummy,

- org.eclipse.xtext.dummy.dummyLang,

- org.eclipse.xtext.dummy.parser.packrat,

- org.eclipse.xtext.dummy.parser.packrat.consumers,

- org.eclipse.xtext.dummy.parseTreeConstruction,

- org.eclipse.xtext.dummy.parser.antlr,

- org.eclipse.xtext.generator,

- org.eclipse.xtext.generator.lowerCaseNamedTestLanguage,

- org.eclipse.xtext.generator.parser.packrat,

- org.eclipse.xtext.generator.parser.packrat.consumers,

- org.eclipse.xtext.generator.parseTreeConstruction,

- org.eclipse.xtext.generator.parser.antlr,

- org.eclipse.xtext.grammarinheritance.parser.packrat,

- org.eclipse.xtext.grammarinheritance.parser.packrat.consumers,

- org.eclipse.xtext.grammarinheritance.parseTreeConstruction,

- org.eclipse.xtext.grammarinheritance.baseInheritanceTest,

- org.eclipse.xtext.grammarinheritance.parser.antlr,

- org.eclipse.xtext.grammarinheritance.foo,

- org.eclipse.xtext.grammarinheritance.inheritanceTest,

- org.eclipse.xtext.metamodelreferencing.tests,

- org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest,

- org.eclipse.xtext.metamodelreferencing.tests.parser.packrat,

- org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers,

- org.eclipse.xtext.metamodelreferencing.tests.parseTreeConstruction,

- org.eclipse.xtext.metamodelreferencing.tests.parser.antlr,

- org.eclipse.xtext.metamodelreferencing.tests.simpleTest,

- org.eclipse.xtext.metamodelreferencing.tests.otherTest,

- org.eclipse.xtext.parser.datatyperules,

- org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage,

- org.eclipse.xtext.parser.datatyperules.parser.packrat,

- org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers,

- org.eclipse.xtext.parser.datatyperules.parseTreeConstruction,

- org.eclipse.xtext.parser.datatyperules.parser.antlr,

- org.eclipse.xtext.parser.epatch,

- org.eclipse.xtext.parser.epatch.epatchTestLanguage,

- org.eclipse.xtext.parser.epatch.parser.packrat,

- org.eclipse.xtext.parser.epatch.parser.packrat.consumers,

- org.eclipse.xtext.parser.epatch.parseTreeConstruction,

- org.eclipse.xtext.parser.epatch.parser.antlr,

- org.eclipse.xtext.parser.keywords.keywordsTestLanguage,

- org.eclipse.xtext.parser.keywords.parser.packrat,

- org.eclipse.xtext.parser.keywords.parser.packrat.consumers,

- org.eclipse.xtext.parser.keywords.parseTreeConstruction,

- org.eclipse.xtext.parser.keywords.parser.antlr,

- org.eclipse.xtext.parser.terminalrules,

- org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage,

- org.eclipse.xtext.parser.terminalrules.parser.packrat,

- org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers,

- org.eclipse.xtext.parser.terminalrules.parseTreeConstruction,

- org.eclipse.xtext.parser.terminalrules.parser.antlr,

- org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage,

- org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage,

- org.eclipse.xtext.parsetree.formatter,

- org.eclipse.xtext.parsetree.formatter.formattertestlanguage,

- org.eclipse.xtext.parsetree.formatter.parser.packrat,

- org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers,

- org.eclipse.xtext.parsetree.formatter.parseTreeConstruction,

- org.eclipse.xtext.parsetree.formatter.parser.antlr,

- org.eclipse.xtext.parsetree.reconstr,

- org.eclipse.xtext.parsetree.reconstr.complexrewritetest,

- org.eclipse.xtext.parsetree.reconstr.parser.packrat,

- org.eclipse.xtext.parsetree.reconstr.parser.packrat.consumers,

- org.eclipse.xtext.parsetree.reconstr.parseTreeConstruction,

- org.eclipse.xtext.parsetree.reconstr.parser.antlr,

- org.eclipse.xtext.parsetree.reconstr.simplerewritetest,

- org.eclipse.xtext.parsetree.transientvalues,

- org.eclipse.xtext.parsetree.transientvalues.transientvaluestest,

- org.eclipse.xtext.parsetree.transientvalues.parser.packrat,

- org.eclipse.xtext.parsetree.transientvalues.parser.packrat.consumers,

- org.eclipse.xtext.parsetree.transientvalues.parseTreeConstruction,

- org.eclipse.xtext.parsetree.transientvalues.parser.antlr,

- org.eclipse.xtext.resource.metamodel,

- org.eclipse.xtext.resource.metamodel.multiValueFeatureTestLanguage,

- org.eclipse.xtext.resource.metamodel.parser.packrat,

- org.eclipse.xtext.resource.metamodel.parser.packrat.consumers,

- org.eclipse.xtext.resource.metamodel.parseTreeConstruction,

- org.eclipse.xtext.resource.metamodel.parser.antlr,

- org.eclipse.xtext.testlanguages.actionLang,

- org.eclipse.xtext.testlanguages.parser.packrat,

- org.eclipse.xtext.testlanguages.parser.packrat.consumers,

- org.eclipse.xtext.testlanguages.parseTreeConstruction,

- org.eclipse.xtext.testlanguages.parser.antlr,

- org.eclipse.xtext.testlanguages.contentAssistTestLanguage,

- org.eclipse.xtext.testlanguages.fowlerdsl,

- org.eclipse.xtext.testlanguages.lexerLang,

- org.eclipse.xtext.testlanguages.lookaheadLang,

- org.eclipse.xtext.testlanguages.optionalEmpty,

- org.eclipse.xtext.testlanguages.partialParserTestLanguage,

- org.eclipse.xtext.testlanguages.referenceGrammar,

- org.eclipse.xtext.testlanguages.simpleExpressions,

- org.eclipse.xtext.testlanguages.testLang,

- org.eclipse.xtext.testlanguages.treeTestLanguage,

- org.eclipse.xtext.valueconverter,

- org.eclipse.xtext.valueconverter.bug250313,

- org.eclipse.xtext.valueconverter.parser.packrat,

- org.eclipse.xtext.valueconverter.parser.packrat.consumers,

- org.eclipse.xtext.valueconverter.parseTreeConstruction,

- org.eclipse.xtext.valueconverter.parser.antlr

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Generator Tests (Incubation)
+Bundle-SymbolicName: org.eclipse.xtext.generator.tests;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: Eclipse.org
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.generator,
+ org.junit,
+ org.eclipse.emf.compare,
+ org.eclipse.emf.compare.diff,
+ org.eclipse.emf.compare.match,
+ org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.eclipse.xtend.util.stdlib,
+ de.itemis.xtext.antlr;resolution:=optional,
+ org.easymock;bundle-version="2.3.0",
+ org.eclipse.xtext.junit;bundle-version="0.7.0",
+ org.eclipse.emf.mwe.utils;bundle-version="0.7.0",
+ org.eclipse.emf.index;bundle-version="1.0.0",
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.antlr.runtime
+Bundle-ClassPath: lib/simple.jar,.
+Export-Package: org.eclipse.xtext,
+ org.eclipse.xtext.grammarinheritance,
+ org.eclipse.xtext.grammarinheritance.ametamodel,
+ org.eclipse.xtext.parser.keywords,
+ org.eclipse.xtext.testlanguages,
+ org.eclipse.xtext.xtextTest,
+ org.eclipse.xtext.parser.packrat,
+ org.eclipse.xtext.parser.packrat.consumers,
+ org.eclipse.xtext.parseTreeConstruction,
+ org.eclipse.xtext.parser.antlr,
+ org.eclipse.xtext.crossrefs,
+ org.eclipse.xtext.crossrefs.importedURI,
+ org.eclipse.xtext.crossrefs.parser.packrat,
+ org.eclipse.xtext.crossrefs.parser.packrat.consumers,
+ org.eclipse.xtext.crossrefs.parseTreeConstruction,
+ org.eclipse.xtext.crossrefs.parser.antlr,
+ org.eclipse.xtext.crossrefs.langATestLanguage,
+ org.eclipse.xtext.dummy,
+ org.eclipse.xtext.dummy.dummyLang,
+ org.eclipse.xtext.dummy.parser.packrat,
+ org.eclipse.xtext.dummy.parser.packrat.consumers,
+ org.eclipse.xtext.dummy.parseTreeConstruction,
+ org.eclipse.xtext.dummy.parser.antlr,
+ org.eclipse.xtext.generator,
+ org.eclipse.xtext.generator.lowerCaseNamedTestLanguage,
+ org.eclipse.xtext.generator.parser.packrat,
+ org.eclipse.xtext.generator.parser.packrat.consumers,
+ org.eclipse.xtext.generator.parseTreeConstruction,
+ org.eclipse.xtext.generator.parser.antlr,
+ org.eclipse.xtext.grammarinheritance.parser.packrat,
+ org.eclipse.xtext.grammarinheritance.parser.packrat.consumers,
+ org.eclipse.xtext.grammarinheritance.parseTreeConstruction,
+ org.eclipse.xtext.grammarinheritance.baseInheritanceTest,
+ org.eclipse.xtext.grammarinheritance.parser.antlr,
+ org.eclipse.xtext.grammarinheritance.foo,
+ org.eclipse.xtext.grammarinheritance.inheritanceTest,
+ org.eclipse.xtext.metamodelreferencing.tests,
+ org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest,
+ org.eclipse.xtext.metamodelreferencing.tests.parser.packrat,
+ org.eclipse.xtext.metamodelreferencing.tests.parser.packrat.consumers,
+ org.eclipse.xtext.metamodelreferencing.tests.parseTreeConstruction,
+ org.eclipse.xtext.metamodelreferencing.tests.parser.antlr,
+ org.eclipse.xtext.metamodelreferencing.tests.simpleTest,
+ org.eclipse.xtext.metamodelreferencing.tests.otherTest,
+ org.eclipse.xtext.parser.datatyperules,
+ org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage,
+ org.eclipse.xtext.parser.datatyperules.parser.packrat,
+ org.eclipse.xtext.parser.datatyperules.parser.packrat.consumers,
+ org.eclipse.xtext.parser.datatyperules.parseTreeConstruction,
+ org.eclipse.xtext.parser.datatyperules.parser.antlr,
+ org.eclipse.xtext.parser.epatch,
+ org.eclipse.xtext.parser.epatch.epatchTestLanguage,
+ org.eclipse.xtext.parser.epatch.parser.packrat,
+ org.eclipse.xtext.parser.epatch.parser.packrat.consumers,
+ org.eclipse.xtext.parser.epatch.parseTreeConstruction,
+ org.eclipse.xtext.parser.epatch.parser.antlr,
+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage,
+ org.eclipse.xtext.parser.keywords.parser.packrat,
+ org.eclipse.xtext.parser.keywords.parser.packrat.consumers,
+ org.eclipse.xtext.parser.keywords.parseTreeConstruction,
+ org.eclipse.xtext.parser.keywords.parser.antlr,
+ org.eclipse.xtext.parser.terminalrules,
+ org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage,
+ org.eclipse.xtext.parser.terminalrules.parser.packrat,
+ org.eclipse.xtext.parser.terminalrules.parser.packrat.consumers,
+ org.eclipse.xtext.parser.terminalrules.parseTreeConstruction,
+ org.eclipse.xtext.parser.terminalrules.parser.antlr,
+ org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage,
+ org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage,
+ org.eclipse.xtext.parsetree.formatter,
+ org.eclipse.xtext.parsetree.formatter.formattertestlanguage,
+ org.eclipse.xtext.parsetree.formatter.parser.packrat,
+ org.eclipse.xtext.parsetree.formatter.parser.packrat.consumers,
+ org.eclipse.xtext.parsetree.formatter.parseTreeConstruction,
+ org.eclipse.xtext.parsetree.formatter.parser.antlr,
+ org.eclipse.xtext.parsetree.reconstr,
+ org.eclipse.xtext.parsetree.reconstr.complexrewritetest,
+ org.eclipse.xtext.parsetree.reconstr.parser.packrat,
+ org.eclipse.xtext.parsetree.reconstr.parser.packrat.consumers,
+ org.eclipse.xtext.parsetree.reconstr.parseTreeConstruction,
+ org.eclipse.xtext.parsetree.reconstr.parser.antlr,
+ org.eclipse.xtext.parsetree.reconstr.simplerewritetest,
+ org.eclipse.xtext.parsetree.transientvalues,
+ org.eclipse.xtext.parsetree.transientvalues.transientvaluestest,
+ org.eclipse.xtext.parsetree.transientvalues.parser.packrat,
+ org.eclipse.xtext.parsetree.transientvalues.parser.packrat.consumers,
+ org.eclipse.xtext.parsetree.transientvalues.parseTreeConstruction,
+ org.eclipse.xtext.parsetree.transientvalues.parser.antlr,
+ org.eclipse.xtext.resource.metamodel,
+ org.eclipse.xtext.resource.metamodel.multiValueFeatureTestLanguage,
+ org.eclipse.xtext.resource.metamodel.parser.packrat,
+ org.eclipse.xtext.resource.metamodel.parser.packrat.consumers,
+ org.eclipse.xtext.resource.metamodel.parseTreeConstruction,
+ org.eclipse.xtext.resource.metamodel.parser.antlr,
+ org.eclipse.xtext.testlanguages.actionLang,
+ org.eclipse.xtext.testlanguages.parser.packrat,
+ org.eclipse.xtext.testlanguages.parser.packrat.consumers,
+ org.eclipse.xtext.testlanguages.parseTreeConstruction,
+ org.eclipse.xtext.testlanguages.parser.antlr,
+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage,
+ org.eclipse.xtext.testlanguages.fowlerdsl,
+ org.eclipse.xtext.testlanguages.lexerLang,
+ org.eclipse.xtext.testlanguages.lookaheadLang,
+ org.eclipse.xtext.testlanguages.optionalEmpty,
+ org.eclipse.xtext.testlanguages.partialParserTestLanguage,
+ org.eclipse.xtext.testlanguages.referenceGrammar,
+ org.eclipse.xtext.testlanguages.simpleExpressions,
+ org.eclipse.xtext.testlanguages.testLang,
+ org.eclipse.xtext.testlanguages.treeTestLanguage,
+ org.eclipse.xtext.valueconverter,
+ org.eclipse.xtext.valueconverter.bug250313,
+ org.eclipse.xtext.valueconverter.parser.packrat,
+ org.eclipse.xtext.valueconverter.parser.packrat.consumers,
+ org.eclipse.xtext.valueconverter.parseTreeConstruction,
+ org.eclipse.xtext.valueconverter.parser.antlr
+
diff --git a/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF
index adc32a1..3170f48 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.ui.common.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,68 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtext Common UI Tests (Incubation)
-Bundle-SymbolicName: org.eclipse.xtext.ui.common.tests;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.xtext.ui.common.tests.Activator
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext.ui.core.tests;bundle-version="0.7.0",
- org.junit;bundle-version="3.8.2",
- org.eclipse.ui.views;bundle-version="3.3.0",
- org.eclipse.xtext;bundle-version="0.7.0",
- org.eclipse.xtext.ui.common;bundle-version="0.7.0",
- org.easymock;bundle-version="2.3.0",
- org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.xtext.ui.core;bundle-version="0.7.0",
- org.eclipse.xtext.xtext.ui,
- org.eclipse.xtext.xtend;bundle-version="0.7.0",
- org.eclipse.xtext.example.domainmodel;bundle-version="0.7.0",
- org.eclipse.xtext.example.domainmodel.ui;bundle-version="0.7.0",
- org.eclipse.xtext.example.fowlerdsl;bundle-version="0.7.0",
- org.eclipse.xtext.example.fowlerdsl.ui;bundle-version="0.7.0",
- de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.xtend;bundle-version="0.7.0",
- org.eclipse.xtext.junit;bundle-version="0.7.0",
- org.eclipse.xtext.ui.generator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.xtext.ui.common,
- org.eclipse.xtext.ui.common.editor.contentassist.impl
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Xtext Common UI Tests (Incubation)

+Bundle-SymbolicName: org.eclipse.xtext.ui.common.tests;singleton:=true

+Bundle-Version: 0.7.0.qualifier

+Bundle-Activator: org.eclipse.xtext.ui.common.tests.Activator

+Bundle-Vendor: Eclipse.org

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.xtext.ui.core.tests;bundle-version="0.7.0",

+ org.junit;bundle-version="3.8.2",

+ org.eclipse.ui.views;bundle-version="3.3.0",

+ org.eclipse.xtext.generator.tests;bundle-version="0.7.0",

+ org.eclipse.xtext;bundle-version="0.7.0",

+ org.eclipse.xtext.ui.common;bundle-version="0.7.0",

+ org.easymock;bundle-version="2.3.0",

+ org.eclipse.jface.text;bundle-version="3.4.0",

+ org.eclipse.xtext.ui.core;bundle-version="0.7.0",

+ org.eclipse.xtext.xtext.ui,

+ org.eclipse.xtext.xtend;bundle-version="0.7.0",

+ org.eclipse.xtext.example.domainmodel;bundle-version="0.7.0",

+ org.eclipse.xtext.example.domainmodel.ui;bundle-version="0.7.0",

+ org.eclipse.xtext.example.fowlerdsl;bundle-version="0.7.0",

+ org.eclipse.xtext.example.fowlerdsl.ui;bundle-version="0.7.0",

+ de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,

+ org.eclipse.xtend;bundle-version="0.7.0",

+ org.eclipse.xtext.junit;bundle-version="0.7.0",

+ org.eclipse.xtext.ui.generator,

+ org.eclipse.xtext.util,

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.common,

+ org.eclipse.xtend.typesystem.emf,

+ org.antlr.runtime,

+ org.eclipse.ui.editors

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-ActivationPolicy: lazy

+Export-Package: org.eclipse.xtext.ui.common,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl,

+ org.eclipse.xtext.xtextTest,

+ org.eclipse.xtext,

+ org.eclipse.xtext.parser.packrat,

+ org.eclipse.xtext.parser.packrat.consumers,

+ org.eclipse.xtext.parseTreeConstruction,

+ org.eclipse.xtext.parser.antlr,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl.twoContexts,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.packrat.consumers,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl.parseTreeConstruction,

+ org.eclipse.xtext.ui.common.editor.contentassist.impl.parser.antlr,

+ org.eclipse.xtext.grammarinheritance,

+ org.eclipse.xtext.grammarinheritance.parser.packrat,

+ org.eclipse.xtext.grammarinheritance.parser.packrat.consumers,

+ org.eclipse.xtext.grammarinheritance.parseTreeConstruction,

+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage,

+ org.eclipse.xtext.parser.keywords,

+ org.eclipse.xtext.parser.keywords.parser.packrat,

+ org.eclipse.xtext.parser.keywords.parser.packrat.consumers,

+ org.eclipse.xtext.parser.keywords.parseTreeConstruction,

+ org.eclipse.xtext.parser.keywords.parser.antlr,

+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage,

+ org.eclipse.xtext.testlanguages,

+ org.eclipse.xtext.testlanguages.parser.packrat,

+ org.eclipse.xtext.testlanguages.parser.packrat.consumers,

+ org.eclipse.xtext.testlanguages.parseTreeConstruction,

+ org.eclipse.xtext.testlanguages.parser.antlr,

+ org.eclipse.xtext.testlanguages.referenceGrammar,

+ org.eclipse.xtext.testlanguages.treeTestLanguage

+

diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
index b7d2163..6898be3 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
@@ -17,40 +17,34 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
-List[IScopedElement] scope_usedGrammars(Grammar this):
-	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_usedGrammars(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
-List[IScopedElement] scope_metamodel(TypeRef this):
-	allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_rule(RuleCall this):
+	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_metamodel(emf::EObject this) :
+List[IScopedElement] scope_rule(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_classifier(TypeRef this):
-	allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_hiddenTokens(ParserRule this):
+	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_classifier(emf::EObject this) :
+List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_hiddenTokens(ParserRule this):
+List[IScopedElement] scope_hiddenTokens(Grammar this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
 List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_rule(RuleCall this):
-	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_classifier(TypeRef this):
+	allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_rule(emf::EObject this) :
+List[IScopedElement] scope_classifier(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_hiddenTokens(Grammar this):
-	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_metamodel(TypeRef this):
+	allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
+List[IScopedElement] scope_metamodel(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
@@ -59,3 +53,9 @@ List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
 List[IScopedElement] scope_ePackage(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
+List[IScopedElement] scope_usedGrammars(Grammar this):
+	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_usedGrammars(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
index 7948696..ba1f41a 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
@@ -16,6 +16,12 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
+List[IScopedElement] scope_vater(Familie this):
+	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_vater(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
 List[IScopedElement] scope_mutter(Familie this):
 	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
 	
@@ -28,9 +34,3 @@ List[IScopedElement] scope_kinder(Familie this):
 List[IScopedElement] scope_kinder(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_vater(Familie this):
-	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_vater(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
index 1f537c3..02fa5ba 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.ui.integration.tests/META-INF/MANIFEST.MF
@@ -1,40 +1,40 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Xtext Integration Tests Plug-in

-Bundle-SymbolicName: org.eclipse.xtext.ui.integration.tests;singleton:=true

-Bundle-Version: 0.7.0.qualifier

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.xtext.ui.core.util,

- org.eclipse.xtext.ui.integration,

- org.eclipse.xtext.ui.integration.editor,

- org.eclipse.xtext.ui.integration.workbench,

- org.eclipse.xtext.ui.integration.foo,

- org.eclipse.xtext.ui.integration.parser.packrat,

- org.eclipse.xtext.ui.integration.parser.packrat.consumers,

- org.eclipse.xtext.ui.integration.parseTreeConstruction,

- org.eclipse.xtext.ui.integration.parser.antlr

-Require-Bundle: org.eclipse.xtext.generator;bundle-version="0.7.0",

- org.eclipse.xtext.log4j;bundle-version="1.2.15",

- org.eclipse.xtext;bundle-version="0.7.0",

- org.eclipse.xtext.ui.common;bundle-version="0.7.0",

- org.eclipse.xtext.ui.core;bundle-version="0.7.0",

- org.eclipse.ui.ide;bundle-version="3.4.0",

- org.junit;bundle-version="3.8.2",

- org.eclipse.jdt.core;bundle-version="3.4.0",

- org.eclipse.jdt.launching;bundle-version="3.4.0",

- de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,

- org.eclipse.xtext.reference.ui;bundle-version="0.7.0",

- org.eclipse.xtext.generator.tests;bundle-version="0.7.0",

- org.eclipse.xtext.ui.generator;bundle-version="0.7.0",

- org.eclipse.emf.mwe.core;bundle-version="0.7.0",

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.eclipse.xtend,

- org.eclipse.xtend.typesystem.emf,

- org.antlr.runtime,

- org.eclipse.ui.editors,

- org.eclipse.ui

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.xtext.ui.integration.XtextUIIntegrationTestsPlugin

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtext Integration Tests Plug-in
+Bundle-SymbolicName: org.eclipse.xtext.ui.integration.tests;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.xtext.ui.core.util,
+ org.eclipse.xtext.ui.integration,
+ org.eclipse.xtext.ui.integration.editor,
+ org.eclipse.xtext.ui.integration.workbench,
+ org.eclipse.xtext.ui.integration.foo,
+ org.eclipse.xtext.ui.integration.parser.packrat,
+ org.eclipse.xtext.ui.integration.parser.packrat.consumers,
+ org.eclipse.xtext.ui.integration.parseTreeConstruction,
+ org.eclipse.xtext.ui.integration.parser.antlr
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="0.7.0",
+ org.eclipse.xtext.log4j;bundle-version="1.2.15",
+ org.eclipse.xtext;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.common;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.core;bundle-version="0.7.0",
+ org.eclipse.ui.ide;bundle-version="3.4.0",
+ org.junit;bundle-version="3.8.2",
+ org.eclipse.jdt.core;bundle-version="3.4.0",
+ org.eclipse.jdt.launching;bundle-version="3.4.0",
+ de.itemis.xtext.antlr;bundle-version="1.0.0";resolution:=optional,
+ org.eclipse.xtext.reference.ui;bundle-version="0.7.0",
+ org.eclipse.xtext.generator.tests;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator;bundle-version="0.7.0",
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime,
+ org.eclipse.ui.editors,
+ org.eclipse.ui
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.xtext.ui.integration.XtextUIIntegrationTestsPlugin
+
diff --git a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
index 78cccfe..900ca31 100644
--- a/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtext.xtend.tests/META-INF/MANIFEST.MF
@@ -1,50 +1,49 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Xtend API Tests Plug-in

-Bundle-SymbolicName: org.eclipse.xtext.xtend.tests;singleton:=true

-Bundle-Version: 0.7.0.qualifier

-Bundle-Vendor: Eclipse Modeling

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.xtext;bundle-version="0.7.0",

- org.eclipse.xtext.ui.common;bundle-version="0.7.0",

- org.eclipse.xtext.ui.common.tests;bundle-version="0.7.0",

- org.eclipse.xtext.ui.core;bundle-version="0.7.0",

- org.eclipse.xtext.xtend;bundle-version="0.7.0",

- org.junit,

- org.eclipse.xtext.junit;bundle-version="0.7.0",

- org.eclipse.xtext.reference;bundle-version="0.7.0",

- org.eclipse.xtext.generator.tests;bundle-version="0.7.0",

- org.eclipse.xtext.ui.generator;bundle-version="0.7.0",

- org.eclipse.emf.mwe.core;bundle-version="0.7.0",

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.eclipse.xtend,

- org.eclipse.xtend.typesystem.emf,

- org.antlr.runtime,

- org.eclipse.ui.editors,

- org.eclipse.ui,

- org.eclipse.xpand

-Export-Package: org.eclipse.xtext,

- org.eclipse.xtext.xtend.crossref,

- org.eclipse.xtext.xtend.tests,

- org.eclipse.xtext.xtextTest,

- org.eclipse.xtext.parser.packrat,

- org.eclipse.xtext.parser.packrat.consumers,

- org.eclipse.xtext.parseTreeConstruction,

- org.eclipse.xtext.parser.antlr,

- org.eclipse.xtext.parser.keywords.keywordsTestLanguage,

- org.eclipse.xtext.parser.keywords,

- org.eclipse.xtext.parser.keywords.parser.packrat,

- org.eclipse.xtext.parser.keywords.parser.packrat.consumers,

- org.eclipse.xtext.parser.keywords.parseTreeConstruction,

- org.eclipse.xtext.parser.keywords.parser.antlr,

- org.eclipse.xtext.testlanguages.contentAssistTestLanguage,

- org.eclipse.xtext.testlanguages,

- org.eclipse.xtext.testlanguages.parser.packrat,

- org.eclipse.xtext.testlanguages.parser.packrat.consumers,

- org.eclipse.xtext.testlanguages.parseTreeConstruction,

- org.eclipse.xtext.testlanguages.parser.antlr,

- org.eclipse.xtext.testlanguages.referenceGrammar,

- org.eclipse.xtext.testlanguages.treeTestLanguage

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Xtend API Tests Plug-in
+Bundle-SymbolicName: org.eclipse.xtext.xtend.tests;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: Eclipse Modeling
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.xtext;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.common;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.common.tests;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.core;bundle-version="0.7.0",
+ org.eclipse.xtext.xtend;bundle-version="0.7.0",
+ org.junit,
+ org.eclipse.xtext.junit;bundle-version="0.7.0",
+ org.eclipse.xtext.reference;bundle-version="0.7.0",
+ org.eclipse.xtext.generator.tests;bundle-version="0.7.0",
+ org.eclipse.xtext.ui.generator;bundle-version="0.7.0",
+ org.eclipse.emf.mwe.core;bundle-version="0.7.0",
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
+ org.antlr.runtime,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.eclipse.xpand
+Export-Package: org.eclipse.xtext,
+ org.eclipse.xtext.xtend.crossref,
+ org.eclipse.xtext.xtend.tests,
+ org.eclipse.xtext.xtextTest,
+ org.eclipse.xtext.parser.packrat,
+ org.eclipse.xtext.parser.packrat.consumers,
+ org.eclipse.xtext.parseTreeConstruction,
+ org.eclipse.xtext.parser.antlr,
+ org.eclipse.xtext.parser.keywords.keywordsTestLanguage,
+ org.eclipse.xtext.parser.keywords,
+ org.eclipse.xtext.parser.keywords.parser.packrat,
+ org.eclipse.xtext.parser.keywords.parser.packrat.consumers,
+ org.eclipse.xtext.parser.keywords.parseTreeConstruction,
+ org.eclipse.xtext.parser.keywords.parser.antlr,
+ org.eclipse.xtext.testlanguages.contentAssistTestLanguage,
+ org.eclipse.xtext.testlanguages,
+ org.eclipse.xtext.testlanguages.parser.packrat,
+ org.eclipse.xtext.testlanguages.parser.packrat.consumers,
+ org.eclipse.xtext.testlanguages.parseTreeConstruction,
+ org.eclipse.xtext.testlanguages.parser.antlr,
+ org.eclipse.xtext.testlanguages.referenceGrammar,
+ org.eclipse.xtext.testlanguages.treeTestLanguage
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
index 99c1c0c..c38564c 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
@@ -17,22 +17,22 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
-List[IScopedElement] scope_hiddenTokens(Grammar this):
-	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
-	
-List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
 List[IScopedElement] scope_classifier(TypeRef this):
 	allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
 	
 List[IScopedElement] scope_classifier(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_rule(RuleCall this):
+List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
+	allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_ePackage(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
+List[IScopedElement] scope_hiddenTokens(Grammar this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_rule(emf::EObject this) :
+List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_hiddenTokens(ParserRule this):
@@ -41,21 +41,21 @@ List[IScopedElement] scope_hiddenTokens(ParserRule this):
 List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_usedGrammars(Grammar this):
-	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_metamodel(TypeRef this):
+	allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_usedGrammars(emf::EObject this) :
+List[IScopedElement] scope_metamodel(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
-	allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_usedGrammars(Grammar this):
+	allElements().typeSelect(Grammar).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_ePackage(emf::EObject this) :
+List[IScopedElement] scope_usedGrammars(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_metamodel(TypeRef this):
-	allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
+List[IScopedElement] scope_rule(RuleCall this):
+	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_metamodel(emf::EObject this) :
+List[IScopedElement] scope_rule(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
index 7948696..30e5c87 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
@@ -16,10 +16,10 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
-List[IScopedElement] scope_mutter(Familie this):
+List[IScopedElement] scope_vater(Familie this):
 	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_mutter(emf::EObject this) :
+List[IScopedElement] scope_vater(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_kinder(Familie this):
@@ -28,9 +28,9 @@ List[IScopedElement] scope_kinder(Familie this):
 List[IScopedElement] scope_kinder(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_vater(Familie this):
+List[IScopedElement] scope_mutter(Familie this):
 	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
 	
-List[IScopedElement] scope_vater(emf::EObject this) :
+List[IScopedElement] scope_mutter(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));