summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpschonbac2008-07-16 10:27:32 (EDT)
committer sefftinge2008-07-16 10:27:32 (EDT)
commita66039065eeaa09cf788a50ef68a62b467cc3a1c (patch)
tree939ded11c9a57ed6593502587aee560195804ad8
parent6d8d4f42b435ec20276709f4649926bf53c0055d (diff)
downloadorg.eclipse.xtext-a66039065eeaa09cf788a50ef68a62b467cc3a1c.zip
org.eclipse.xtext-a66039065eeaa09cf788a50ef68a62b467cc3a1c.tar.gz
org.eclipse.xtext-a66039065eeaa09cf788a50ef68a62b467cc3a1c.tar.bz2
Regeneration of generated code
-rw-r--r--plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/PreferenceGrammarStandaloneSetup.java27
-rw-r--r--plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarLexer.java76
-rw-r--r--plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarParser.java106
-rw-r--r--plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/pref.ecore58
-rw-r--r--plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarMetamodelAccess.java7
-rw-r--r--plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarResourceFactory.java4
6 files changed, 141 insertions, 137 deletions
diff --git a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/PreferenceGrammarStandaloneSetup.java b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/PreferenceGrammarStandaloneSetup.java
index 3590c0a..03aadff 100644
--- a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/PreferenceGrammarStandaloneSetup.java
+++ b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/PreferenceGrammarStandaloneSetup.java
@@ -8,8 +8,8 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.xtext.EcoreUtil2;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.xtext.builtin.XtextBuiltinStandaloneSetup;
-import org.eclipse.xtext.service.ILanguageDescriptor;
-import org.eclipse.xtext.service.LanguageDescriptorFactory;
+import org.eclipse.xtext.service.IServiceScope;
+import org.eclipse.xtext.service.ServiceScopeFactory;
import org.eclipse.xtext.service.ServiceRegistry;
import org.eclipse.xtext.IGrammarAccess;
import org.eclipse.xtext.preference.services.PreferenceGrammarGrammarAccess;
@@ -36,18 +36,15 @@ public abstract class PreferenceGrammarStandaloneSetup {
// setup super language first
org.eclipse.xtext.builtin.XtextBuiltinStandaloneSetup.doSetup();
- ILanguageDescriptor languageDescriptor =
- LanguageDescriptorFactory.createLanguageDescriptor(
+ IServiceScope scope = ServiceScopeFactory.createScope(
IPreferenceGrammar.ID,
- IPreferenceGrammar.NAME,
- IPreferenceGrammar.NAMESPACE,
- LanguageDescriptorFactory.get("org.eclipse.xtext.builtin.XtextBuiltin"));
- ServiceRegistry.registerService(languageDescriptor, IGrammarAccess.class, PreferenceGrammarGrammarAccess.class);
- ServiceRegistry.registerService(languageDescriptor, IMetamodelAccess.class, PreferenceGrammarMetamodelAccess.class);
- ServiceRegistry.registerService(languageDescriptor, IAstFactory.class, GenericEcoreElementFactory.class);
- ServiceRegistry.registerService(languageDescriptor, IParser.class, PreferenceGrammarParser.class);
- ServiceRegistry.registerService(languageDescriptor, IResourceFactory.class, PreferenceGrammarResourceFactory.class);
- ServiceRegistry.registerService(languageDescriptor, IParseTreeConstructor.class, PreferenceGrammarParseTreeConstructor.class);
+ ServiceScopeFactory.get("org.eclipse.xtext.builtin.XtextBuiltin"));
+ ServiceRegistry.registerService(scope, IGrammarAccess.class, PreferenceGrammarGrammarAccess.class);
+ ServiceRegistry.registerService(scope, IMetamodelAccess.class, PreferenceGrammarMetamodelAccess.class);
+ ServiceRegistry.registerService(scope, IAstFactory.class, GenericEcoreElementFactory.class);
+ ServiceRegistry.registerService(scope, IParser.class, PreferenceGrammarParser.class);
+ ServiceRegistry.registerService(scope, IResourceFactory.class, PreferenceGrammarResourceFactory.class);
+ ServiceRegistry.registerService(scope, IParseTreeConstructor.class, PreferenceGrammarParseTreeConstructor.class);
// register resource factory to EMF
IResourceFactory resourceFactory = new PreferenceGrammarResourceFactory();
@@ -70,11 +67,11 @@ public abstract class PreferenceGrammarStandaloneSetup {
}
}
- public static synchronized ILanguageDescriptor getLanguageDescriptor() {
+ public static synchronized IServiceScope getServiceScope() {
if(!isInitialized) {
doSetup();
}
- return LanguageDescriptorFactory.get(IPreferenceGrammar.ID);
+ return ServiceScopeFactory.get(IPreferenceGrammar.ID);
}
}
diff --git a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarLexer.java b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarLexer.java
index c0239ec..d91c6c6 100644
--- a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarLexer.java
+++ b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g 2008-07-14 10:06:31
+// $ANTLR 3.0 ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g 2008-07-16 16:25:38
package org.eclipse.xtext.preference.parser.internal;
@@ -40,10 +40,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g"; }
// $ANTLR start T11
- public final void mT11() throws RecognitionException {
+ public void mT11() throws RecognitionException {
try {
int _type = T11;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:10:5: ( 'commonprefix' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:10:7: ( 'commonprefix' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:10:7: 'commonprefix'
{
match("commonprefix");
@@ -59,10 +59,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T11
// $ANTLR start T12
- public final void mT12() throws RecognitionException {
+ public void mT12() throws RecognitionException {
try {
int _type = T12;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:11:5: ( 'page' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:11:7: ( 'page' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:11:7: 'page'
{
match("page");
@@ -78,10 +78,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T12
// $ANTLR start T13
- public final void mT13() throws RecognitionException {
+ public void mT13() throws RecognitionException {
try {
int _type = T13;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:12:5: ( '{' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:12:7: ( '{' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:12:7: '{'
{
match('{');
@@ -96,10 +96,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T13
// $ANTLR start T14
- public final void mT14() throws RecognitionException {
+ public void mT14() throws RecognitionException {
try {
int _type = T14;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:13:5: ( '}' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:13:7: ( '}' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:13:7: '}'
{
match('}');
@@ -114,10 +114,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T14
// $ANTLR start T15
- public final void mT15() throws RecognitionException {
+ public void mT15() throws RecognitionException {
try {
int _type = T15;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:14:5: ( ';' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:14:7: ( ';' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:14:7: ';'
{
match(';');
@@ -132,10 +132,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T15
// $ANTLR start T16
- public final void mT16() throws RecognitionException {
+ public void mT16() throws RecognitionException {
try {
int _type = T16;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:15:5: ( '#' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:15:7: ( '#' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:15:7: '#'
{
match('#');
@@ -150,10 +150,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T16
// $ANTLR start T17
- public final void mT17() throws RecognitionException {
+ public void mT17() throws RecognitionException {
try {
int _type = T17;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:16:5: ( '?' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:16:7: ( '?' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:16:7: '?'
{
match('?');
@@ -168,10 +168,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T17
// $ANTLR start T18
- public final void mT18() throws RecognitionException {
+ public void mT18() throws RecognitionException {
try {
int _type = T18;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:17:5: ( '[' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:17:7: ( '[' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:17:7: '['
{
match('[');
@@ -186,10 +186,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T18
// $ANTLR start T19
- public final void mT19() throws RecognitionException {
+ public void mT19() throws RecognitionException {
try {
int _type = T19;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:18:5: ( ',' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:18:7: ( ',' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:18:7: ','
{
match(',');
@@ -204,10 +204,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T19
// $ANTLR start T20
- public final void mT20() throws RecognitionException {
+ public void mT20() throws RecognitionException {
try {
int _type = T20;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:19:5: ( ']' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:19:7: ( ']' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:19:7: ']'
{
match(']');
@@ -222,10 +222,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T20
// $ANTLR start T21
- public final void mT21() throws RecognitionException {
+ public void mT21() throws RecognitionException {
try {
int _type = T21;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:20:5: ( '.' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:20:7: ( '.' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:20:7: '.'
{
match('.');
@@ -240,10 +240,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end T21
// $ANTLR start RULE_ID
- public final void mRULE_ID() throws RecognitionException {
+ public void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:718:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:718:11: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:718:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:718:11: ( '^' )?
@@ -319,10 +319,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end RULE_ID
// $ANTLR start RULE_INT
- public final void mRULE_INT() throws RecognitionException {
+ public void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:720:10: ( ( '0' .. '9' )+ )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:720:12: ( ( '0' .. '9' )+ )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:720:12: ( '0' .. '9' )+
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:720:12: ( '0' .. '9' )+
@@ -366,10 +366,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end RULE_INT
// $ANTLR start RULE_STRING
- public final void mRULE_STRING() throws RecognitionException {
+ public void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:722:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:722:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -520,10 +520,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end RULE_STRING
// $ANTLR start RULE_ML_COMMENT
- public final void mRULE_ML_COMMENT() throws RecognitionException {
+ public void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:724:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:724:19: ( '/*' ( options {greedy=false; } : . )* '*/' )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:724:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
@@ -579,10 +579,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end RULE_ML_COMMENT
// $ANTLR start RULE_SL_COMMENT
- public final void mRULE_SL_COMMENT() throws RecognitionException {
+ public void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:726:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:726:19: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:726:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
@@ -669,10 +669,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end RULE_SL_COMMENT
// $ANTLR start RULE_WS
- public final void mRULE_WS() throws RecognitionException {
+ public void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:728:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:728:11: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:728:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:728:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
@@ -726,10 +726,10 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end RULE_WS
// $ANTLR start RULE_ANY_OTHER
- public final void mRULE_ANY_OTHER() throws RecognitionException {
+ public void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:730:16: ( . )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:730:18: ( . )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:730:18: .
{
matchAny();
@@ -744,7 +744,7 @@ public class InternalPreferenceGrammarLexer extends Lexer {
// $ANTLR end RULE_ANY_OTHER
public void mTokens() throws RecognitionException {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:1:10: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
int alt12=18;
int LA12_0 = input.LA(1);
diff --git a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarParser.java b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarParser.java
index 12a2dad..bd4c80e 100644
--- a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarParser.java
+++ b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammarParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g 2008-07-14 10:06:30
+// $ANTLR 3.0 ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g 2008-07-16 16:25:38
package org.eclipse.xtext.preference.parser.internal;
@@ -62,14 +62,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleDescription
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:63:1: entryRuleDescription returns [EObject current=null] : iv_ruleDescription= ruleDescription EOF ;
- public final EObject entryRuleDescription() throws RecognitionException {
+ public EObject entryRuleDescription() throws RecognitionException {
EObject current = null;
EObject iv_ruleDescription = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:63:53: (iv_ruleDescription= ruleDescription EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:64:2: (iv_ruleDescription= ruleDescription EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:64:2: iv_ruleDescription= ruleDescription EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.0" /* xtext::ParserRule */, currentNode);
@@ -97,7 +97,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleDescription
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:71:1: ruleDescription returns [EObject current=null] : ( ( 'commonprefix' (lv_idPrefix= ruleQName ) ) (lv_pages= rulePage ) ) ;
- public final EObject ruleDescription() throws RecognitionException {
+ public EObject ruleDescription() throws RecognitionException {
EObject current = null;
EObject lv_idPrefix = null;
@@ -107,7 +107,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:73:33: ( ( ( 'commonprefix' (lv_idPrefix= ruleQName ) ) (lv_pages= rulePage ) ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:74:1: ( ( ( 'commonprefix' (lv_idPrefix= ruleQName ) ) (lv_pages= rulePage ) ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:74:1: ( ( 'commonprefix' (lv_idPrefix= ruleQName ) ) (lv_pages= rulePage ) )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:74:1: ( ( 'commonprefix' (lv_idPrefix= ruleQName ) ) (lv_pages= rulePage ) )
@@ -191,14 +191,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRulePage
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:115:1: entryRulePage returns [EObject current=null] : iv_rulePage= rulePage EOF ;
- public final EObject entryRulePage() throws RecognitionException {
+ public EObject entryRulePage() throws RecognitionException {
EObject current = null;
EObject iv_rulePage = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:115:46: (iv_rulePage= rulePage EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:116:2: (iv_rulePage= rulePage EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:116:2: iv_rulePage= rulePage EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.1" /* xtext::ParserRule */, currentNode);
@@ -226,7 +226,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start rulePage
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:123:1: rulePage returns [EObject current=null] : ( ( 'page' (lv_name= ruleQName ) ) (lv_panel= rulePanel ) ) ;
- public final EObject rulePage() throws RecognitionException {
+ public EObject rulePage() throws RecognitionException {
EObject current = null;
EObject lv_name = null;
@@ -236,7 +236,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:125:33: ( ( ( 'page' (lv_name= ruleQName ) ) (lv_panel= rulePanel ) ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:126:1: ( ( ( 'page' (lv_name= ruleQName ) ) (lv_panel= rulePanel ) ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:126:1: ( ( 'page' (lv_name= ruleQName ) ) (lv_panel= rulePanel ) )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:126:1: ( ( 'page' (lv_name= ruleQName ) ) (lv_panel= rulePanel ) )
@@ -320,14 +320,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRulePanel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:167:1: entryRulePanel returns [EObject current=null] : iv_rulePanel= rulePanel EOF ;
- public final EObject entryRulePanel() throws RecognitionException {
+ public EObject entryRulePanel() throws RecognitionException {
EObject current = null;
EObject iv_rulePanel = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:167:47: (iv_rulePanel= rulePanel EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:168:2: (iv_rulePanel= rulePanel EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:168:2: iv_rulePanel= rulePanel EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.2" /* xtext::ParserRule */, currentNode);
@@ -355,7 +355,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start rulePanel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:175:1: rulePanel returns [EObject current=null] : ( ( '{' (lv_rows= ruleRow )* ) '}' ) ;
- public final EObject rulePanel() throws RecognitionException {
+ public EObject rulePanel() throws RecognitionException {
EObject current = null;
EObject lv_rows = null;
@@ -363,7 +363,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:177:33: ( ( ( '{' (lv_rows= ruleRow )* ) '}' ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:178:1: ( ( ( '{' (lv_rows= ruleRow )* ) '}' ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:178:1: ( ( '{' (lv_rows= ruleRow )* ) '}' )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:178:1: ( ( '{' (lv_rows= ruleRow )* ) '}' )
@@ -446,14 +446,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleRow
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:207:1: entryRuleRow returns [EObject current=null] : iv_ruleRow= ruleRow EOF ;
- public final EObject entryRuleRow() throws RecognitionException {
+ public EObject entryRuleRow() throws RecognitionException {
EObject current = null;
EObject iv_ruleRow = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:207:45: (iv_ruleRow= ruleRow EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:208:2: (iv_ruleRow= ruleRow EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:208:2: iv_ruleRow= ruleRow EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.3" /* xtext::ParserRule */, currentNode);
@@ -481,7 +481,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleRow
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:215:1: ruleRow returns [EObject current=null] : ( (lv_entries= ruleEntry )* ';' ) ;
- public final EObject ruleRow() throws RecognitionException {
+ public EObject ruleRow() throws RecognitionException {
EObject current = null;
EObject lv_entries = null;
@@ -489,7 +489,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:217:33: ( ( (lv_entries= ruleEntry )* ';' ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:218:1: ( ( (lv_entries= ruleEntry )* ';' ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:218:1: ( (lv_entries= ruleEntry )* ';' )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:218:1: ( (lv_entries= ruleEntry )* ';' )
@@ -562,14 +562,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleEntry
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:243:1: entryRuleEntry returns [EObject current=null] : iv_ruleEntry= ruleEntry EOF ;
- public final EObject entryRuleEntry() throws RecognitionException {
+ public EObject entryRuleEntry() throws RecognitionException {
EObject current = null;
EObject iv_ruleEntry = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:243:47: (iv_ruleEntry= ruleEntry EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:244:2: (iv_ruleEntry= ruleEntry EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:244:2: iv_ruleEntry= ruleEntry EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.4" /* xtext::ParserRule */, currentNode);
@@ -597,7 +597,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleEntry
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:251:1: ruleEntry returns [EObject current=null] : ( (lv_colspan= '#' )+ (lv_widget= ruleWidget ) ) ;
- public final EObject ruleEntry() throws RecognitionException {
+ public EObject ruleEntry() throws RecognitionException {
EObject current = null;
Token lv_colspan=null;
@@ -606,7 +606,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:253:33: ( ( (lv_colspan= '#' )+ (lv_widget= ruleWidget ) ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:254:1: ( ( (lv_colspan= '#' )+ (lv_widget= ruleWidget ) ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:254:1: ( (lv_colspan= '#' )+ (lv_widget= ruleWidget ) )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:254:1: ( (lv_colspan= '#' )+ (lv_widget= ruleWidget ) )
@@ -700,14 +700,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleWidget
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:290:1: entryRuleWidget returns [EObject current=null] : iv_ruleWidget= ruleWidget EOF ;
- public final EObject entryRuleWidget() throws RecognitionException {
+ public EObject entryRuleWidget() throws RecognitionException {
EObject current = null;
EObject iv_ruleWidget = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:290:48: (iv_ruleWidget= ruleWidget EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:291:2: (iv_ruleWidget= ruleWidget EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:291:2: iv_ruleWidget= ruleWidget EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.5" /* xtext::ParserRule */, currentNode);
@@ -735,7 +735,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleWidget
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:298:1: ruleWidget returns [EObject current=null] : ( ( ( ( ( (this_Label= ruleLabel | this_Text= ruleText ) | this_Check= ruleCheck ) | this_Combo= ruleCombo ) | this_Panel= rulePanel ) | this_NamedPanel= ruleNamedPanel ) | this_CheckedPanel= ruleCheckedPanel ) ;
- public final EObject ruleWidget() throws RecognitionException {
+ public EObject ruleWidget() throws RecognitionException {
EObject current = null;
EObject this_Label = null;
@@ -755,7 +755,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:300:33: ( ( ( ( ( ( (this_Label= ruleLabel | this_Text= ruleText ) | this_Check= ruleCheck ) | this_Combo= ruleCombo ) | this_Panel= rulePanel ) | this_NamedPanel= ruleNamedPanel ) | this_CheckedPanel= ruleCheckedPanel ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:301:1: ( ( ( ( ( ( (this_Label= ruleLabel | this_Text= ruleText ) | this_Check= ruleCheck ) | this_Combo= ruleCombo ) | this_Panel= rulePanel ) | this_NamedPanel= ruleNamedPanel ) | this_CheckedPanel= ruleCheckedPanel ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:301:1: ( ( ( ( ( (this_Label= ruleLabel | this_Text= ruleText ) | this_Check= ruleCheck ) | this_Combo= ruleCombo ) | this_Panel= rulePanel ) | this_NamedPanel= ruleNamedPanel ) | this_CheckedPanel= ruleCheckedPanel )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:301:1: ( ( ( ( ( (this_Label= ruleLabel | this_Text= ruleText ) | this_Check= ruleCheck ) | this_Combo= ruleCombo ) | this_Panel= rulePanel ) | this_NamedPanel= ruleNamedPanel ) | this_CheckedPanel= ruleCheckedPanel )
@@ -1072,14 +1072,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleNamedPanel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:375:1: entryRuleNamedPanel returns [EObject current=null] : iv_ruleNamedPanel= ruleNamedPanel EOF ;
- public final EObject entryRuleNamedPanel() throws RecognitionException {
+ public EObject entryRuleNamedPanel() throws RecognitionException {
EObject current = null;
EObject iv_ruleNamedPanel = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:375:52: (iv_ruleNamedPanel= ruleNamedPanel EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:376:2: (iv_ruleNamedPanel= ruleNamedPanel EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:376:2: iv_ruleNamedPanel= ruleNamedPanel EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.6" /* xtext::ParserRule */, currentNode);
@@ -1107,7 +1107,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleNamedPanel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:383:1: ruleNamedPanel returns [EObject current=null] : ( ( ( (lv_name= RULE_STRING ) '{' ) (lv_rows= ruleRow )* ) '}' ) ;
- public final EObject ruleNamedPanel() throws RecognitionException {
+ public EObject ruleNamedPanel() throws RecognitionException {
EObject current = null;
Token lv_name=null;
@@ -1116,7 +1116,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:385:33: ( ( ( ( (lv_name= RULE_STRING ) '{' ) (lv_rows= ruleRow )* ) '}' ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:386:1: ( ( ( ( (lv_name= RULE_STRING ) '{' ) (lv_rows= ruleRow )* ) '}' ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:386:1: ( ( ( (lv_name= RULE_STRING ) '{' ) (lv_rows= ruleRow )* ) '}' )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:386:1: ( ( ( (lv_name= RULE_STRING ) '{' ) (lv_rows= ruleRow )* ) '}' )
@@ -1225,14 +1225,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleCheckedPanel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:430:1: entryRuleCheckedPanel returns [EObject current=null] : iv_ruleCheckedPanel= ruleCheckedPanel EOF ;
- public final EObject entryRuleCheckedPanel() throws RecognitionException {
+ public EObject entryRuleCheckedPanel() throws RecognitionException {
EObject current = null;
EObject iv_ruleCheckedPanel = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:430:54: (iv_ruleCheckedPanel= ruleCheckedPanel EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:431:2: (iv_ruleCheckedPanel= ruleCheckedPanel EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:431:2: iv_ruleCheckedPanel= ruleCheckedPanel EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.7" /* xtext::ParserRule */, currentNode);
@@ -1260,7 +1260,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleCheckedPanel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:438:1: ruleCheckedPanel returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) ) '{' ) (lv_rows= ruleRow )* ) '}' ) ;
- public final EObject ruleCheckedPanel() throws RecognitionException {
+ public EObject ruleCheckedPanel() throws RecognitionException {
EObject current = null;
Token lv_name=null;
@@ -1269,7 +1269,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:440:33: ( ( ( ( ( (lv_name= RULE_ID ) ) '{' ) (lv_rows= ruleRow )* ) '}' ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:441:1: ( ( ( ( ( (lv_name= RULE_ID ) ) '{' ) (lv_rows= ruleRow )* ) '}' ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:441:1: ( ( ( ( (lv_name= RULE_ID ) ) '{' ) (lv_rows= ruleRow )* ) '}' )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:441:1: ( ( ( ( (lv_name= RULE_ID ) ) '{' ) (lv_rows= ruleRow )* ) '}' )
@@ -1384,14 +1384,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleLabel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:487:1: entryRuleLabel returns [EObject current=null] : iv_ruleLabel= ruleLabel EOF ;
- public final EObject entryRuleLabel() throws RecognitionException {
+ public EObject entryRuleLabel() throws RecognitionException {
EObject current = null;
EObject iv_ruleLabel = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:487:47: (iv_ruleLabel= ruleLabel EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:488:2: (iv_ruleLabel= ruleLabel EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:488:2: iv_ruleLabel= ruleLabel EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.9" /* xtext::ParserRule */, currentNode);
@@ -1419,14 +1419,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleLabel
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:495:1: ruleLabel returns [EObject current=null] : (lv_value= RULE_STRING ) ;
- public final EObject ruleLabel() throws RecognitionException {
+ public EObject ruleLabel() throws RecognitionException {
EObject current = null;
Token lv_value=null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:497:33: ( (lv_value= RULE_STRING ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:498:1: ( (lv_value= RULE_STRING ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:498:1: (lv_value= RULE_STRING )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:498:1: (lv_value= RULE_STRING )
@@ -1468,14 +1468,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleText
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:518:1: entryRuleText returns [EObject current=null] : iv_ruleText= ruleText EOF ;
- public final EObject entryRuleText() throws RecognitionException {
+ public EObject entryRuleText() throws RecognitionException {
EObject current = null;
EObject iv_ruleText = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:518:46: (iv_ruleText= ruleText EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:519:2: (iv_ruleText= ruleText EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:519:2: iv_ruleText= ruleText EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.10" /* xtext::ParserRule */, currentNode);
@@ -1503,14 +1503,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleText
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:526:1: ruleText returns [EObject current=null] : (lv_name= RULE_ID ) ;
- public final EObject ruleText() throws RecognitionException {
+ public EObject ruleText() throws RecognitionException {
EObject current = null;
Token lv_name=null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:528:33: ( (lv_name= RULE_ID ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:529:1: ( (lv_name= RULE_ID ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:529:1: (lv_name= RULE_ID )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:529:1: (lv_name= RULE_ID )
@@ -1552,14 +1552,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleCheck
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:549:1: entryRuleCheck returns [EObject current=null] : iv_ruleCheck= ruleCheck EOF ;
- public final EObject entryRuleCheck() throws RecognitionException {
+ public EObject entryRuleCheck() throws RecognitionException {
EObject current = null;
EObject iv_ruleCheck = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:549:47: (iv_ruleCheck= ruleCheck EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:550:2: (iv_ruleCheck= ruleCheck EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:550:2: iv_ruleCheck= ruleCheck EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.11" /* xtext::ParserRule */, currentNode);
@@ -1587,14 +1587,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleCheck
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:557:1: ruleCheck returns [EObject current=null] : ( '?' (lv_name= RULE_ID ) ) ;
- public final EObject ruleCheck() throws RecognitionException {
+ public EObject ruleCheck() throws RecognitionException {
EObject current = null;
Token lv_name=null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:559:33: ( ( '?' (lv_name= RULE_ID ) ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:560:1: ( ( '?' (lv_name= RULE_ID ) ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:560:1: ( '?' (lv_name= RULE_ID ) )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:560:1: ( '?' (lv_name= RULE_ID ) )
@@ -1646,14 +1646,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleCombo
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:584:1: entryRuleCombo returns [EObject current=null] : iv_ruleCombo= ruleCombo EOF ;
- public final EObject entryRuleCombo() throws RecognitionException {
+ public EObject entryRuleCombo() throws RecognitionException {
EObject current = null;
EObject iv_ruleCombo = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:584:47: (iv_ruleCombo= ruleCombo EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:585:2: (iv_ruleCombo= ruleCombo EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:585:2: iv_ruleCombo= ruleCombo EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.12" /* xtext::ParserRule */, currentNode);
@@ -1681,7 +1681,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleCombo
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:592:1: ruleCombo returns [EObject current=null] : ( ( ( ( '[' (lv_alts= RULE_STRING ) ) ( ',' (lv_alts= RULE_STRING ) ) ) ']' ) (lv_name= RULE_ID ) ) ;
- public final EObject ruleCombo() throws RecognitionException {
+ public EObject ruleCombo() throws RecognitionException {
EObject current = null;
Token lv_alts=null;
@@ -1689,7 +1689,7 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:594:33: ( ( ( ( ( '[' (lv_alts= RULE_STRING ) ) ( ',' (lv_alts= RULE_STRING ) ) ) ']' ) (lv_name= RULE_ID ) ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:595:1: ( ( ( ( ( '[' (lv_alts= RULE_STRING ) ) ( ',' (lv_alts= RULE_STRING ) ) ) ']' ) (lv_name= RULE_ID ) ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:595:1: ( ( ( ( '[' (lv_alts= RULE_STRING ) ) ( ',' (lv_alts= RULE_STRING ) ) ) ']' ) (lv_name= RULE_ID ) )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:595:1: ( ( ( ( '[' (lv_alts= RULE_STRING ) ) ( ',' (lv_alts= RULE_STRING ) ) ) ']' ) (lv_name= RULE_ID ) )
@@ -1813,14 +1813,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start entryRuleQName
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:657:1: entryRuleQName returns [EObject current=null] : iv_ruleQName= ruleQName EOF ;
- public final EObject entryRuleQName() throws RecognitionException {
+ public EObject entryRuleQName() throws RecognitionException {
EObject current = null;
EObject iv_ruleQName = null;
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:657:47: (iv_ruleQName= ruleQName EOF )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:658:2: (iv_ruleQName= ruleQName EOF )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:658:2: iv_ruleQName= ruleQName EOF
{
currentNode = createCompositeNode("classpath:/org/eclipse/xtext/preference/PreferenceGrammar.xmi#//@parserRules.13" /* xtext::ParserRule */, currentNode);
@@ -1848,14 +1848,14 @@ public class InternalPreferenceGrammarParser extends AbstractAntlrParser {
// $ANTLR start ruleQName
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:665:1: ruleQName returns [EObject current=null] : ( (lv_element= RULE_ID ) ( (lv_element= '.' ) (lv_element= RULE_ID ) )* ) ;
- public final EObject ruleQName() throws RecognitionException {
+ public EObject ruleQName() throws RecognitionException {
EObject current = null;
Token lv_element=null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:667:33: ( ( (lv_element= RULE_ID ) ( (lv_element= '.' ) (lv_element= RULE_ID ) )* ) )
+ // ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:668:1: ( ( (lv_element= RULE_ID ) ( (lv_element= '.' ) (lv_element= RULE_ID ) )* ) )
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:668:1: ( (lv_element= RULE_ID ) ( (lv_element= '.' ) (lv_element= RULE_ID ) )* )
{
// ./src-gen/org/eclipse/xtext/preference/parser/internal/InternalPreferenceGrammar.g:668:1: ( (lv_element= RULE_ID ) ( (lv_element= '.' ) (lv_element= RULE_ID ) )* )
diff --git a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/pref.ecore b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/pref.ecore
index d919fbe..13b31a6 100644
--- a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/pref.ecore
+++ b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/pref.ecore
@@ -5,28 +5,18 @@
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Description">
- <eStructuralFeatures xsi:type="ecore:EReference" name="pages" upperBound="-1" eType="//Page" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="idPrefix" eType="//QName" containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Row">
- <eStructuralFeatures xsi:type="ecore:EReference" name="entries" upperBound="-1" eType="//Entry" containment="true" resolveProxies="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="QName">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" upperBound="-1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
+ <eClassifiers xsi:type="ecore:EClass" name="Page">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="//QName" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="panel" eType="//Panel" containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CheckedPanel" eSuperTypes="//Widget">
+ <eClassifiers xsi:type="ecore:EClass" name="Panel" eSuperTypes="//Widget">
<eStructuralFeatures xsi:type="ecore:EReference" name="rows" upperBound="-1" eType="//Row" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Text" eSuperTypes="//Widget">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Page">
- <eStructuralFeatures xsi:type="ecore:EReference" name="panel" eType="//Panel" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="//QName" containment="true" resolveProxies="false"/>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NamedPanel" eSuperTypes="//Widget">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -34,32 +24,42 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="rows" upperBound="-1" eType="//Row" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="MasterDetail" abstract="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="Combo" eSuperTypes="//Widget">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="alts" upperBound="-1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
+ <eClassifiers xsi:type="ecore:EClass" name="CheckedPanel" eSuperTypes="//Widget">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rows" upperBound="-1" eType="//Row" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Label" eSuperTypes="//Widget">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Widget" abstract="true"/>
<eClassifiers xsi:type="ecore:EClass" name="Entry">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="colspan" upperBound="-1">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="widget" eType="//Widget" containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Widget" abstract="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="Text" eSuperTypes="//Widget">
+ <eClassifiers xsi:type="ecore:EClass" name="Row">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="entries" upperBound="-1" eType="//Entry" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="QName">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" upperBound="-1">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Description">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="pages" upperBound="-1" eType="//Page" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="idPrefix" eType="//QName" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Combo" eSuperTypes="//Widget">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="alts" upperBound="-1">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Panel" eSuperTypes="//Widget">
- <eStructuralFeatures xsi:type="ecore:EReference" name="rows" upperBound="-1" eType="//Row" containment="true" resolveProxies="false"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Label" eSuperTypes="//Widget">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eStructuralFeatures>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarMetamodelAccess.java b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarMetamodelAccess.java
index 5bf0414..ddb8a8b 100644
--- a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarMetamodelAccess.java
+++ b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarMetamodelAccess.java
@@ -9,6 +9,13 @@ import org.eclipse.xtext.parser.BaseEPackageAccess;
public class PreferenceGrammarMetamodelAccess extends BaseEPackageAccess implements IMetamodelAccess {
+{
+
+ if (!EPackage.Registry.INSTANCE.containsKey(PREF_NS_URI))
+ EPackage.Registry.INSTANCE.put(PREF_NS_URI, loadEcoreFile(getClass().getClassLoader(), "classpath:/org/eclipse/xtext/preference/pref.ecore"));
+
+}
+
private EPackage[] generated = new EPackage[] {
getPrefEPackage()
diff --git a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarResourceFactory.java b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarResourceFactory.java
index 11f5ab0..2d9a7ca 100644
--- a/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarResourceFactory.java
+++ b/plugins/org.eclipse.xtext.preference/src-gen/org/eclipse/xtext/preference/services/PreferenceGrammarResourceFactory.java
@@ -8,7 +8,7 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.xtext.resource.IResourceFactory;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.service.ServiceRegistry;
-import org.eclipse.xtext.service.LanguageDescriptorFactory;
+import org.eclipse.xtext.service.ServiceScopeFactory;
public class PreferenceGrammarResourceFactory implements IResourceFactory {
@@ -21,7 +21,7 @@ public class PreferenceGrammarResourceFactory implements IResourceFactory {
*/
public Resource createResource(URI uri) {
XtextResource resource = new XtextResource(uri);
- ServiceRegistry.injectServices(LanguageDescriptorFactory.get("org.eclipse.xtext.preference.PreferenceGrammar"), resource);
+ ServiceRegistry.injectServices(ServiceScopeFactory.get("org.eclipse.xtext.preference.PreferenceGrammar"), resource);
return resource;
}