diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/IndentationAwareUiTestLanguageGrammarAccess.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/IndentationAwareUiTestLanguageGrammarAccess.java index 86f8bfbbd..d260afb41 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/IndentationAwareUiTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/IndentationAwareUiTestLanguageGrammarAccess.java @@ -20,11 +20,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class IndentationAwareUiTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class IndentationAwareUiTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class TreeElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.ide.tests.testlanguage.IndentationAwareUiTestLanguage.Tree"); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialContentAssistTestLanguageGrammarAccess.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialContentAssistTestLanguageGrammarAccess.java index 65b4a77c3..3ab403fd8 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialContentAssistTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialContentAssistTestLanguageGrammarAccess.java @@ -22,11 +22,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class PartialContentAssistTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class PartialContentAssistTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class TypeDeclarationElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.ide.tests.testlanguage.PartialContentAssistTestLanguage.TypeDeclaration"); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialSerializationTestLanguageGrammarAccess.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialSerializationTestLanguageGrammarAccess.java index 1ceff1a92..d179f2aa2 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialSerializationTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/PartialSerializationTestLanguageGrammarAccess.java @@ -23,11 +23,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class PartialSerializationTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class PartialSerializationTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.ide.tests.testlanguage.PartialSerializationTestLanguage.Model"); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/RenameTestLanguageGrammarAccess.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/RenameTestLanguageGrammarAccess.java index ca973c647..9926b14f3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/RenameTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/RenameTestLanguageGrammarAccess.java @@ -21,11 +21,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class RenameTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class RenameTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.ide.tests.testlanguage.RenameTestLanguage.Model"); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java index c81d2de89..ee9dd30e4 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/services/TestLanguageGrammarAccess.java @@ -23,11 +23,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.ide.tests.testlanguage.TestLanguage.Model"); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java index 823839cf7..b5f93e5ed 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/BeeLangTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.UnorderedGroup; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class BeeLangTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class BeeLangTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.backtracking.BeeLangTestLanguage.Model"); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java index a44d01c95..7d2906fd5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/ExBeeLangTestLanguageGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ExBeeLangTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ExBeeLangTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DelegateModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.backtracking.ExBeeLangTestLanguage.DelegateModel"); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java index d88eb4b65..552b261c6 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/services/SimpleBeeLangTestLanguageGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SimpleBeeLangTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SimpleBeeLangTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DelegateModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.backtracking.SimpleBeeLangTestLanguage.DelegateModel"); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/services/FileAwareTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/services/FileAwareTestLanguageGrammarAccess.java index afe218b80..4c63b6d3c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/services/FileAwareTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/services/FileAwareTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class FileAwareTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class FileAwareTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class PackageDeclarationElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.fileAware.FileAwareTestLanguage.PackageDeclaration"); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/services/NestedRefsTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/services/NestedRefsTestLanguageGrammarAccess.java index da4776c6a..dfe9caa36 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/services/NestedRefsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/services/NestedRefsTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class NestedRefsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class NestedRefsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DocElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.nestedRefs.NestedRefsTestLanguage.Doc"); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/services/NoJdtTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/services/NoJdtTestLanguageGrammarAccess.java index cd8b7271a..05c8fab5b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/services/NoJdtTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/services/NoJdtTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class NoJdtTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class NoJdtTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.noJdt.NoJdtTestLanguage.Model"); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java index 4c4d8a3b9..54e838c11 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/services/XtextGrammarTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class XtextGrammarTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class GrammarElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.xtextgrammar.XtextGrammarTestLanguage.Grammar"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java index 63699f37a..476ab16a4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class DummyTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class DummyTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.dummy.DummyTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java index 224c1612f..d8192a979 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumAndReferenceTestLanguageGrammarAccess.java @@ -19,12 +19,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EnumAndReferenceTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EnumAndReferenceTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class EntityWithEnumAndReferenceElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.EnumAndReferenceTestLanguage.EntityWithEnumAndReference"); @@ -70,7 +69,7 @@ public class EnumAndReferenceTestLanguageGrammarAccess extends AbstractGrammarEl public RuleCall getRefEntityWithEnumAndReferenceIDTerminalRuleCall_3_0_1() { return cRefEntityWithEnumAndReferenceIDTerminalRuleCall_3_0_1; } } - public class KindOfKeywordElements extends AbstractEnumRuleElementFinder { + public class KindOfKeywordElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.EnumAndReferenceTestLanguage.KindOfKeyword"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cKindOfKeywordEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java index 9a50d09a1..a31ac8702 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/EnumRulesTestLanguageGrammarAccess.java @@ -18,12 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EnumRulesTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EnumRulesTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.EnumRulesTestLanguage.Model"); @@ -85,7 +84,7 @@ public class EnumRulesTestLanguageGrammarAccess extends AbstractGrammarElementFi public RuleCall getGeneratedGeneratedEnumEnumRuleCall_1_1_0() { return cGeneratedGeneratedEnumEnumRuleCall_1_1_0; } } - public class ExistingEnumElements extends AbstractEnumRuleElementFinder { + public class ExistingEnumElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.EnumRulesTestLanguage.ExistingEnum"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cSameNameEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); @@ -120,7 +119,7 @@ public class EnumRulesTestLanguageGrammarAccess extends AbstractGrammarElementFi //"DifferentLiteral" public Keyword getDifferentNameDifferentLiteralKeyword_2_0() { return cDifferentNameDifferentLiteralKeyword_2_0; } } - public class GeneratedEnumElements extends AbstractEnumRuleElementFinder { + public class GeneratedEnumElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.EnumRulesTestLanguage.GeneratedEnum"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cSameNameEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java index da1d601aa..168d7c8d0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/services/MultiRuleEnumTestLanguageGrammarAccess.java @@ -18,12 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class MultiRuleEnumTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class MultiRuleEnumTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.MultiRuleEnumTestLanguage.Model"); @@ -65,7 +64,7 @@ public class MultiRuleEnumTestLanguageGrammarAccess extends AbstractGrammarEleme public RuleCall getCEnumRuleCEnumRuleCall_3_0() { return cCEnumRuleCEnumRuleCall_3_0; } } - public class EnumRuleAElements extends AbstractEnumRuleElementFinder { + public class EnumRuleAElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.MultiRuleEnumTestLanguage.EnumRuleA"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cAEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); @@ -100,7 +99,7 @@ public class MultiRuleEnumTestLanguageGrammarAccess extends AbstractGrammarEleme //"C" public Keyword getCCKeyword_2_0() { return cCCKeyword_2_0; } } - public class EnumRuleBElements extends AbstractEnumRuleElementFinder { + public class EnumRuleBElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.MultiRuleEnumTestLanguage.EnumRuleB"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cCEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); @@ -135,7 +134,7 @@ public class MultiRuleEnumTestLanguageGrammarAccess extends AbstractGrammarEleme //"E" public Keyword getEEKeyword_2_0() { return cEEKeyword_2_0; } } - public class EnumRuleCElements extends AbstractEnumRuleElementFinder { + public class EnumRuleCElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.enumrules.MultiRuleEnumTestLanguage.EnumRuleC"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cAEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java index 752d3ac4f..2f128232d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/services/FormatterTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class FormatterTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class FormatterTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.formatting2.internal.FormatterTestLanguage.Root"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java index 91418719b..dc5cae641 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/services/RegionAccessTestLanguageGrammarAccess.java @@ -20,12 +20,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class RegionAccessTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class RegionAccessTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.formatting2.regionaccess.internal.RegionAccessTestLanguage.Root"); @@ -592,7 +591,7 @@ public class RegionAccessTestLanguageGrammarAccess extends AbstractGrammarElemen public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; } } - public class EnumElements extends AbstractEnumRuleElementFinder { + public class EnumElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.formatting2.regionaccess.internal.RegionAccessTestLanguage.Enum"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cLit1EnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java index ab8a4d1dd..5fc997a1d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/EcoreFragmentTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EcoreFragmentTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EcoreFragmentTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class SecondElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.generator.ecore.EcoreFragmentTestLanguage.Second"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java index 2b23750b8..8bc96c458 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SubTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SubTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class SubMainElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.generator.ecore.SubTestLanguage.SubMain"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java index bb72e6124..102a36ffd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SuperTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SuperTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SuperTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class SuperMainElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.generator.ecore.SuperTestLanguage.SuperMain"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java index 982155cb4..3c763a11d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/grammarAccess/services/GrammarAccessTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class GrammarAccessTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class GrammarAccessTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.generator.grammarAccess.GrammarAccessTestLanguage.Root"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java index e9eb918d4..f52ccd2d8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class AbstractTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class AbstractTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class InheritedParserRuleElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.grammarinheritance.AbstractTestLanguage.InheritedParserRule"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java index 159658ebe..0df20344c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/BaseInheritanceTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class BaseInheritanceTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class BaseInheritanceTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.grammarinheritance.BaseInheritanceTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java index c974a9864..9980382d7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ConcreteTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootRuleElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.grammarinheritance.ConcreteTestLanguage.RootRule"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java index a3fcde6b1..b4f6afbff 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class InheritanceTest2LanguageGrammarAccess extends AbstractGrammarElementFinder { +public class InheritanceTest2LanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.grammarinheritance.InheritanceTest2Language.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java index 3400e8a4a..8b7fd0146 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElementFinder { +public class InheritanceTest3LanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.grammarinheritance.InheritanceTest3Language.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java index ad701aff0..7cde50f80 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class InheritanceTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class InheritanceTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.grammarinheritance.InheritanceTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java index 690487f96..f003c03e7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/services/IndexTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class IndexTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class IndexTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class FileElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.index.IndexTestLanguage.File"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java index eea631960..0e80a57b2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/BacktrackingLexerTestLanguageGrammarAccess.java @@ -17,12 +17,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class BacktrackingLexerTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class BacktrackingLexerTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.lexer.BacktrackingLexerTestLanguage.Model"); @@ -143,7 +142,7 @@ public class BacktrackingLexerTestLanguageGrammarAccess extends AbstractGrammarE public RuleCall getYCharbTerminalRuleCall_1_0() { return cYCharbTerminalRuleCall_1_0; } } - public class EnumNameElements extends AbstractEnumRuleElementFinder { + public class EnumNameElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.lexer.BacktrackingLexerTestLanguage.EnumName"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cAbcEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/IgnoreCaseLexerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/IgnoreCaseLexerTestLanguageGrammarAccess.java index 1bf56ce52..8b4c2a0e9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/IgnoreCaseLexerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/services/IgnoreCaseLexerTestLanguageGrammarAccess.java @@ -13,11 +13,11 @@ import org.eclipse.xtext.Group; import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class IgnoreCaseLexerTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class IgnoreCaseLexerTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.lexer.IgnoreCaseLexerTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java index 307cdba37..c56087ed0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/Bug311337TestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug311337TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug311337TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.lazy.Bug311337TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java index bfcbe39de..5e6bddc4d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/services/LazyLinkingTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class LazyLinkingTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class LazyLinkingTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.lazy.LazyLinkingTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java index fb364b524..6dd6717a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/AbstractIgnoreCaseLinkingTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class AbstractIgnoreCaseLinkingTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class AbstractIgnoreCaseLinkingTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.AbstractIgnoreCaseLinkingTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java index 3d19a1d72..28af556dc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug287988TestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug287988TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug287988TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.Bug287988TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java index f4ef40b41..9cdb3e398 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug289059TestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug289059TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug289059TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.Bug289059TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java index 12a54f111..8253af70b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug313089TestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug313089TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug313089TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class FooElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.Bug313089TestLanguage.Foo"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java index be8a32059..ab0b7b0f1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/Bug362902GrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug362902GrammarAccess extends AbstractGrammarElementFinder { +public class Bug362902GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.Bug362902.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java index d109cbfd1..de30bad67 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java @@ -14,11 +14,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class IgnoreCaseImportsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class IgnoreCaseImportsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.IgnoreCaseImportsTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java index 47755048a..a1da31b9a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java @@ -14,11 +14,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class IgnoreCaseNamespacesTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class IgnoreCaseNamespacesTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.IgnoreCaseNamespacesTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java index 3bcfa4ffd..4f580b23f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/ImportUriTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ImportUriTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ImportUriTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class MainElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.ImportUriTestLanguage.Main"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java index dd746e814..578bef021 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/LangATestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class LangATestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class LangATestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class MainElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.linking.LangATestLanguage.Main"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java index 32dc008e2..db24a395c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/EcoreReferenceTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EcoreReferenceTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EcoreReferenceTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.metamodelreferencing.tests.EcoreReferenceTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java index 22b9d1c29..5138dcbf6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class MetamodelRefTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class MetamodelRefTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class FooElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.metamodelreferencing.tests.MetamodelRefTestLanguage.Foo"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java index dc761cffc..c79b819c0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java @@ -14,11 +14,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class MultiGenMMTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class MultiGenMMTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class FooElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.metamodelreferencing.tests.MultiGenMMTestLanguage.Foo"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java index 7952decc3..15922154e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289515TestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug289515TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug289515TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug289515TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java index feac478a5..570e33508 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524ExTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug289524ExTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug289524ExTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug289524ExTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java index 8cf7c5807..4f4603519 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug289524TestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug289524TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug289524TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug289524TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java index 38f843619..5c4ab30a9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889ExTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug296889ExTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug296889ExTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug296889ExTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java index cfc494e81..ba1231ad0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug296889TestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug296889TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug296889TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug296889TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java index 3fcb36014..e3082f08c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug299237TestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug299237TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug299237TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug299237TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935ExTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935ExTestLanguageGrammarAccess.java index 5501cbcc6..9961de71e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935ExTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935ExTestLanguageGrammarAccess.java @@ -11,11 +11,11 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug301935ExTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug301935ExTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DelegateModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug301935ExTestLanguage.DelegateModel"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935TestLanguageGrammarAccess.java index 36e9d7e49..882361369 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug301935TestLanguageGrammarAccess.java @@ -14,11 +14,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug301935TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug301935TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug301935TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java index dd9c55a33..8c2a92711 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug378967TestLanguageGrammarAccess.java @@ -18,12 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug378967TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug378967TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug378967TestLanguage.Root"); @@ -277,7 +276,7 @@ public class Bug378967TestLanguageGrammarAccess extends AbstractGrammarElementFi public Keyword getSKeyword() { return cSKeyword; } } - public class FirstEnumElements extends AbstractEnumRuleElementFinder { + public class FirstEnumElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug378967TestLanguage.FirstEnum"); private final EnumLiteralDeclaration cValueEnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cValueAfterKeyword_0 = (Keyword)cValueEnumLiteralDeclaration.eContents().get(0); @@ -292,7 +291,7 @@ public class Bug378967TestLanguageGrammarAccess extends AbstractGrammarElementFi //'after' public Keyword getValueAfterKeyword_0() { return cValueAfterKeyword_0; } } - public class SecondEnumElements extends AbstractEnumRuleElementFinder { + public class SecondEnumElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug378967TestLanguage.SecondEnum"); private final EnumLiteralDeclaration cValueEnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cValueSKeyword_0 = (Keyword)cValueEnumLiteralDeclaration.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug406914TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug406914TestLanguageGrammarAccess.java index 47e45a09d..4c33019eb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug406914TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug406914TestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug406914TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug406914TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug406914TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java index 98a7acfb1..5ea219b6c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/Bug443221TestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug443221TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug443221TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.Bug443221TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/GH1462TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/GH1462TestLanguageGrammarAccess.java index b323cea78..9d9af4b0b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/GH1462TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/services/GH1462TestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class GH1462TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class GH1462TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.antlr.GH1462TestLanguage.Root"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java index 8b0682c58..2bd611e92 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/AssignmentsTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class AssignmentsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class AssignmentsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.assignments.AssignmentsTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java index d0ed6f3b0..0fa0ee42d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug287184TestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug287184TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug287184TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.assignments.Bug287184TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java index 415ca9aed..d91d92896 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/services/Bug288432TestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug288432TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug288432TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class BodyElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.assignments.Bug288432TestLanguage.Body"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java index 3d2895ee2..8371e4aaa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/bug419429/services/Bug419429GrammarAccess.java @@ -14,11 +14,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug419429GrammarAccess extends AbstractGrammarElementFinder { +public class Bug419429GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class EReferenceElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.bug419429.Bug419429.EReference"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java index cfa537ccb..11eacef9e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class DatatypeRulesTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class DatatypeRulesTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class CompositeModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.datatyperules.DatatypeRulesTestLanguage.CompositeModel"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/services/EncodingTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/services/EncodingTestLanguageGrammarAccess.java index 01ef8726e..a9aec644c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/services/EncodingTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/services/EncodingTestLanguageGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EncodingTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EncodingTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.encoding.EncodingTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java index 42ac6bf94..399ab7f8a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/services/EpatchTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EpatchTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EpatchTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class EPatchElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.epatch.EpatchTestLanguage.EPatch"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java index 52777ce85..86974affc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageExGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class FragmentTestLanguageExGrammarAccess extends AbstractGrammarElementFinder { +public class FragmentTestLanguageExGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ParserRuleFragmentsExElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.fragments.FragmentTestLanguageEx.ParserRuleFragmentsEx"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java index ed6e70fbe..c6dac3db8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/services/FragmentTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class FragmentTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class FragmentTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ParserRuleFragmentsElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.fragments.FragmentTestLanguage.ParserRuleFragments"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java index 737bcb4b6..3e9c4ef35 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class IndentationAwareTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class IndentationAwareTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class TreeElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.indentation.IndentationAwareTestLanguage.Tree"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java index 5bd4224b7..1879fe48c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java @@ -14,11 +14,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class KeywordsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class KeywordsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.keywords.KeywordsTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java index aecb783b8..b04970a84 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class NoParametersTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class NoParametersTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ParserRuleParametersElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.NoParametersTestLanguage.ParserRuleParameters"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java index 205e714f4..6d525c675 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElementFinder { +public class ParametersTestLanguageExGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ParserRuleParametersElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.ParametersTestLanguageEx.ParserRuleParameters"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java index a7b4d62f7..a3aae0e70 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ParametersTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ParametersTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ParserRuleParametersElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.ParametersTestLanguage.ParserRuleParameters"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java index 3587ea0d0..7561a971b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class TwoParametersTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class TwoParametersTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ParserRuleParametersElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.TwoParametersTestLanguage.ParserRuleParameters"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug292245TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug292245TestLanguageGrammarAccess.java index 87876e970..4c8654b01 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug292245TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug292245TestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug292245TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug292245TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.Bug292245TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java index 389e1b232..770177589 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug297105TestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug297105TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug297105TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.Bug297105TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java index 0c7e51384..2f9efa737 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/Bug317840TestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug317840TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug317840TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.Bug317840TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/EcoreTerminalsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/EcoreTerminalsTestLanguageGrammarAccess.java index 9ed10044e..84c09132e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/EcoreTerminalsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/EcoreTerminalsTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EcoreTerminalsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EcoreTerminalsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.EcoreTerminalsTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java index f9cf1d8b7..2a4f3f5d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/HiddenTerminalsTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class HiddenTerminalsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class HiddenTerminalsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.HiddenTerminalsTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java index 041ec1877..a5f390b48 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/TerminalRulesTestLanguageGrammarAccess.java @@ -13,11 +13,11 @@ import org.eclipse.xtext.GrammarUtil; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class TerminalRulesTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class TerminalRulesTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.TerminalRulesTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java index 1e08521a4..233744f40 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/UnicodeTestLanguageGrammarAccess.java @@ -14,11 +14,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class UnicodeTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class UnicodeTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.UnicodeTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java index 247ee86f4..589aaa5f9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/services/XtextTerminalsTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.Keyword; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class XtextTerminalsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class XtextTerminalsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class GrammarElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.terminalrules.XtextTerminalsTestLanguage.Grammar"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java index 44b02d037..8cc5081f8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/BacktrackingBug325745TestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.UnorderedGroup; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class BacktrackingBug325745TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class BacktrackingBug325745TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.unorderedGroups.BacktrackingBug325745TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java index cacf362fd..087beba0a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExBacktrackingBug325745TestLanguageGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ExBacktrackingBug325745TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ExBacktrackingBug325745TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DelegateModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.unorderedGroups.ExBacktrackingBug325745TestLanguage.DelegateModel"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java index dd0d63b94..af4c6e7a6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/ExUnorderedGroupsTestLanguageGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ExUnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DelegateModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.unorderedGroups.ExUnorderedGroupsTestLanguage.DelegateModel"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java index 7a485147a..7159ff010 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleBacktrackingBug325745TestLanguageGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SimpleBacktrackingBug325745TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SimpleBacktrackingBug325745TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DelegateModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.unorderedGroups.SimpleBacktrackingBug325745TestLanguage.DelegateModel"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java index 9349c1d46..54332c22c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/SimpleUnorderedGroupsTestLanguageGrammarAccess.java @@ -12,11 +12,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SimpleUnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class DelegateModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.unorderedGroups.SimpleUnorderedGroupsTestLanguage.DelegateModel"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java index bd1d13b85..dea11204f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/services/UnorderedGroupsTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.UnorderedGroup; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class UnorderedGroupsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.unorderedGroups.UnorderedGroupsTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguage2GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguage2GrammarAccess.java index 5b3205c68..0cc69b28b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguage2GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguage2GrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class FormatterTestLanguage2GrammarAccess extends AbstractGrammarElementFinder { +public class FormatterTestLanguage2GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.formatter.FormatterTestLanguage2.Root"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java index 1e26f628b..3a8aaec54 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java @@ -20,12 +20,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class FormatterTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class FormatterTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.formatter.FormatterTestLanguage.Root"); @@ -788,7 +787,7 @@ public class FormatterTestLanguageGrammarAccess extends AbstractGrammarElementFi public RuleCall getIDTerminalRuleCall() { return cIDTerminalRuleCall; } } - public class Enum1Elements extends AbstractEnumRuleElementFinder { + public class Enum1Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.formatter.FormatterTestLanguage.Enum1"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cLit1EnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java index 7e0f6d144..767fff193 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/Bug305397GrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug305397GrammarAccess extends AbstractGrammarElementFinder { +public class Bug305397GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.impl.Bug305397.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java index d054ef44a..c5ca25c7f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/services/CommentAssociationTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class CommentAssociationTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class CommentAssociationTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.impl.CommentAssociationTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java index b605cd530..4cca96dea 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java @@ -59,7 +59,7 @@ public class SerializationErrorTestLanguageSemanticSequencer extends AbstractDel * Indent returns Indent * * Constraint: - * ((req=TwoRequired? opt=TwoOptions indent+=Indent+) | (req=TwoRequired? indent+=Indent+) | indent+=Indent+)? + * ((((req=TwoRequired opt=TwoOptions) | opt=TwoOptions)? indent+=Indent+) | indent+=Indent+)? */ protected void sequence_Indent(ISerializationContext context, Indent semanticObject) { genericSequencer.createSequence(context, semanticObject); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java index 5c104f49a..31481e49a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug299395TestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug299395TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug299395TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.reconstr.Bug299395TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java index e55e1643a..e23d58032 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug302128TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class Bug302128TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.reconstr.Bug302128TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java index f0ee8f008..4ca62bde0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ComplexReconstrTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ComplexReconstrTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.reconstr.ComplexReconstrTestLanguage.Root"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java index 233a08d79..749bb502e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationBug269362TestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SerializationBug269362TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SerializationBug269362TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.reconstr.SerializationBug269362TestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java index 3099a4f89..59e7a7b63 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SerializationErrorTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SerializationErrorTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SerializationErrorTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.reconstr.SerializationErrorTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java index 785afc886..cce6e637d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class TransientValuesTestGrammarAccess extends AbstractGrammarElementFinder { +public class TransientValuesTestGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class RootElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.transientvalues.TransientValuesTest.Root"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java index 77e108c0c..c08453cfb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/services/UnassignedTextTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class UnassignedTextTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class UnassignedTextTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parsetree.unassignedtext.UnassignedTextTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java index 77617fc5a..6b6bf48f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/Bug385636GrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug385636GrammarAccess extends AbstractGrammarElementFinder { +public class Bug385636GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ProgramElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.resource.Bug385636.Program"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java index ea2495c32..caffa860c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/EObjectAtOffsetTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class EObjectAtOffsetTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class EObjectAtOffsetTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.resource.EObjectAtOffsetTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java index ae98a3cb9..cb868cf70 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerBuilderIntegerationTestLanguageGrammarAccess.java @@ -13,11 +13,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class LiveContainerBuilderIntegerationTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class LiveContainerBuilderIntegerationTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.resource.LiveContainerBuilderIntegerationTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java index a78897bbc..31f28f361 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LiveContainerTestLanguageGrammarAccess.java @@ -13,11 +13,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class LiveContainerTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class LiveContainerTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.resource.LiveContainerTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java index debb511c2..14dd0a7ee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/services/LocationProviderTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class LocationProviderTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class LocationProviderTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.resource.LocationProviderTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java index 446cac850..da3de39e5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/AssignmentFinderTestLanguageGrammarAccess.java @@ -19,12 +19,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class AssignmentFinderTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class AssignmentFinderTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.AssignmentFinderTestLanguage.Model"); @@ -592,7 +591,7 @@ public class AssignmentFinderTestLanguageGrammarAccess extends AbstractGrammarEl public RuleCall getCrossRefCrossRefTerminal2TerminalRuleCall_1_1_0_1() { return cCrossRefCrossRefTerminal2TerminalRuleCall_1_1_0_1; } } - public class Enum1Elements extends AbstractEnumRuleElementFinder { + public class Enum1Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.AssignmentFinderTestLanguage.Enum1"); private final EnumLiteralDeclaration cLit1EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cLit1Lit1Keyword_0 = (Keyword)cLit1EnumLiteralDeclaration.eContents().get(0); @@ -607,7 +606,7 @@ public class AssignmentFinderTestLanguageGrammarAccess extends AbstractGrammarEl //"lit1" public Keyword getLit1Lit1Keyword_0() { return cLit1Lit1Keyword_0; } } - public class Enum2Elements extends AbstractEnumRuleElementFinder { + public class Enum2Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.AssignmentFinderTestLanguage.Enum2"); private final EnumLiteralDeclaration cLit2EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cLit2Lit2Keyword_0 = (Keyword)cLit2EnumLiteralDeclaration.eContents().get(0); @@ -622,7 +621,7 @@ public class AssignmentFinderTestLanguageGrammarAccess extends AbstractGrammarEl //"lit2" public Keyword getLit2Lit2Keyword_0() { return cLit2Lit2Keyword_0; } } - public class Enum3Elements extends AbstractEnumRuleElementFinder { + public class Enum3Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.AssignmentFinderTestLanguage.Enum3"); private final EnumLiteralDeclaration cLit3EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cLit3Lit3Keyword_0 = (Keyword)cLit3EnumLiteralDeclaration.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java index 3e17b336c..2427d708c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/ContextFinderTestLanguageGrammarAccess.java @@ -20,12 +20,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ContextFinderTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ContextFinderTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.ContextFinderTestLanguage.Model"); @@ -763,7 +762,7 @@ public class ContextFinderTestLanguageGrammarAccess extends AbstractGrammarEleme public RuleCall getRefModelSTRINGTerminalRuleCall_0_1() { return cRefModelSTRINGTerminalRuleCall_0_1; } } - public class ValueExclusionTestEn0Elements extends AbstractEnumRuleElementFinder { + public class ValueExclusionTestEn0Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.ContextFinderTestLanguage.ValueExclusionTestEn0"); private final EnumLiteralDeclaration cLit0EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cLit0Lit0Keyword_0 = (Keyword)cLit0EnumLiteralDeclaration.eContents().get(0); @@ -778,7 +777,7 @@ public class ContextFinderTestLanguageGrammarAccess extends AbstractGrammarEleme //"lit0" public Keyword getLit0Lit0Keyword_0() { return cLit0Lit0Keyword_0; } } - public class ValueExclusionTestEn1Elements extends AbstractEnumRuleElementFinder { + public class ValueExclusionTestEn1Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.ContextFinderTestLanguage.ValueExclusionTestEn1"); private final EnumLiteralDeclaration cLit1EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cLit1Lit1Keyword_0 = (Keyword)cLit1EnumLiteralDeclaration.eContents().get(0); @@ -793,7 +792,7 @@ public class ContextFinderTestLanguageGrammarAccess extends AbstractGrammarEleme //"lit1" public Keyword getLit1Lit1Keyword_0() { return cLit1Lit1Keyword_0; } } - public class ValueExclusionTestEn2Elements extends AbstractEnumRuleElementFinder { + public class ValueExclusionTestEn2Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.ContextFinderTestLanguage.ValueExclusionTestEn2"); private final EnumLiteralDeclaration cLit2EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cLit2Lit2Keyword_0 = (Keyword)cLit2EnumLiteralDeclaration.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java index 5035287d1..b67a3ace9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/HiddenTokenSequencerTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class HiddenTokenSequencerTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class HiddenTokenSequencerTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.HiddenTokenSequencerTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java index 55e2555f5..b5a9fa114 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SequencerTestLanguageGrammarAccess.java @@ -21,12 +21,11 @@ import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.UnorderedGroup; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SequencerTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SequencerTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SequencerTestLanguage.Model"); @@ -2476,7 +2475,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractGrammarElementFi public RuleCall getRc2DelegationParserRuleCall_1_2_1_0() { return cRc2DelegationParserRuleCall_1_2_1_0; } } - public class DefEnum1Elements extends AbstractEnumRuleElementFinder { + public class DefEnum1Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SequencerTestLanguage.DefEnum1"); private final EnumLiteralDeclaration cKw1EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cKw1Kw1Keyword_0 = (Keyword)cKw1EnumLiteralDeclaration.eContents().get(0); @@ -2491,7 +2490,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractGrammarElementFi //"kw1" public Keyword getKw1Kw1Keyword_0() { return cKw1Kw1Keyword_0; } } - public class DefEnum2Elements extends AbstractEnumRuleElementFinder { + public class DefEnum2Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SequencerTestLanguage.DefEnum2"); private final EnumLiteralDeclaration cKw2EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cKw2Kw2Keyword_0 = (Keyword)cKw2EnumLiteralDeclaration.eContents().get(0); @@ -2506,7 +2505,7 @@ public class SequencerTestLanguageGrammarAccess extends AbstractGrammarElementFi //"kw2" public Keyword getKw2Kw2Keyword_0() { return cKw2Kw2Keyword_0; } } - public class DefEnum3Elements extends AbstractEnumRuleElementFinder { + public class DefEnum3Elements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SequencerTestLanguage.DefEnum3"); private final EnumLiteralDeclaration cKw3EnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1); private final Keyword cKw3Kw3Keyword_0 = (Keyword)cKw3EnumLiteralDeclaration.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java index 7113210df..33d19c775 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/services/SyntacticSequencerTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SyntacticSequencerTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.serializer.SyntacticSequencerTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java index 7e7b008c0..c2d4ea468 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java @@ -18,11 +18,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class XtextGrammarTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class XtextGrammarTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class GrammarElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.XtextGrammarTestLanguage.Grammar"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/services/IndentationAwareTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/services/IndentationAwareTestLanguageGrammarAccess.java index 9bbd8b3b4..698164490 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/services/IndentationAwareTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/services/IndentationAwareTestLanguageGrammarAccess.java @@ -13,11 +13,11 @@ import org.eclipse.xtext.Group; import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class IndentationAwareTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class IndentationAwareTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class NodeListElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.indent.IndentationAwareTestLanguage.NodeList"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java index b1e8e0e5f..b66874053 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage2GrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ActionTestLanguage2GrammarAccess extends AbstractGrammarElementFinder { +public class ActionTestLanguage2GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ORingElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.ActionTestLanguage2.ORing"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage3GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage3GrammarAccess.java index 0d15e9690..e2da3570a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage3GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguage3GrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ActionTestLanguage3GrammarAccess extends AbstractGrammarElementFinder { +public class ActionTestLanguage3GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ProductionRulesElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.ActionTestLanguage3.ProductionRules"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java index 08fa2fd7f..ed49f13d7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ActionTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ActionTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.ActionTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java index 260a49e77..742279305 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class FowlerDslTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class FowlerDslTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class StatemachineElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.FowlerDslTestLanguage.Statemachine"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java index aff365dd7..7a461d9bd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class LookaheadTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class LookaheadTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class EntryElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.LookaheadTestLanguage.Entry"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java index 56a717f6b..8e4be94d3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class OptionalEmptyTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class OptionalEmptyTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.OptionalEmptyTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java index 877b95981..8d56ce357 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class PartialParserTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class PartialParserTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class SomeContainerElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.PartialParserTestLanguage.SomeContainer"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java index da92e4851..4494252c6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ReferenceGrammarTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ReferenceGrammarTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class SpielplatzElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.ReferenceGrammarTestLanguage.Spielplatz"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java index 0d74bbfdb..3bbdbf99f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/SimpleExpressionsTestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class SimpleExpressionsTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class SequenceElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.SimpleExpressionsTestLanguage.Sequence"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java index 40c3a7d44..cebbcde23 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TestLanguageGrammarAccess.java @@ -17,11 +17,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class TestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class TestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class EntryRuleElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.TestLanguage.EntryRule"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java index cbeed7aa3..bf80a0bce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/services/TreeTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class TreeTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class TreeTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.testlanguages.TreeTestLanguage.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java index 80d58c19f..38eb3d410 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/services/ConcreteSyntaxValidationTestLanguageGrammarAccess.java @@ -19,12 +19,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.validation.ConcreteSyntaxValidationTestLanguage.Model"); @@ -2019,7 +2018,7 @@ public class ConcreteSyntaxValidationTestLanguageGrammarAccess extends AbstractG public RuleCall getCIDTerminalRuleCall_3_2_0() { return cCIDTerminalRuleCall_3_2_0; } } - public class TransientSerializeables1EnumElements extends AbstractEnumRuleElementFinder { + public class TransientSerializeables1EnumElements extends AbstractElementFinder.AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.validation.ConcreteSyntaxValidationTestLanguage.TransientSerializeables1Enum"); private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); private final EnumLiteralDeclaration cLit1EnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java index c9a1d0ad1..28e8dbd2d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/Bug250313GrammarAccess.java @@ -16,11 +16,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class Bug250313GrammarAccess extends AbstractGrammarElementFinder { +public class Bug250313GrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.valueconverter.Bug250313.Model"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java index d47e88d05..979270021 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/services/QualifiedNameTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class QualifiedNameTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class QualifiedNameTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ElementElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.valueconverter.QualifiedNameTestLanguage.Element"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java index 151addcd0..24b60d8e9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/MultiValueFeatureTestLanguageGrammarAccess.java @@ -13,11 +13,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class MultiValueFeatureTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class StartElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.xtext.ecoreInference.MultiValueFeatureTestLanguage.Start"); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java index 59c85cd20..f7785c8c5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/services/UnassignedRuleCallTestLanguageGrammarAccess.java @@ -15,11 +15,11 @@ import org.eclipse.xtext.ParserRule; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.common.services.TerminalsGrammarAccess; -import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder; +import org.eclipse.xtext.service.AbstractElementFinder; import org.eclipse.xtext.service.GrammarProvider; @Singleton -public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractGrammarElementFinder { +public class UnassignedRuleCallTestLanguageGrammarAccess extends AbstractElementFinder.AbstractGrammarElementFinder { public class ModelElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.xtext.ecoreInference.UnassignedRuleCallTestLanguage.Model");