From 90dea707ada33a781c76d8cecb5d3aa3203a9e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Mon, 9 Jan 2017 10:12:02 +0100 Subject: [PATCH] Regenerated test languages in tests bundle, fixed lazy linking test language --- org.eclipse.xtext.testlanguages/build.gradle | 2 +- .../build.properties | 11 - .../META-INF/MANIFEST.MF_gen | 1022 ++++++++--------- org.eclipse.xtext.tests/build.gradle | 1 + .../lazy/lazyLinking/LazyLinkingFactory.java | 70 ++ .../lazy/lazyLinking/LazyLinkingPackage.java | 548 +++++++++ .../xtext/linking/lazy/lazyLinking/Model.java | 43 + .../linking/lazy/lazyLinking/Property.java | 70 ++ .../xtext/linking/lazy/lazyLinking/Type.java | 162 +++ .../lazyLinking/UnresolvedProxyProperty.java | 70 ++ .../impl/LazyLinkingFactoryImpl.java | 129 +++ .../impl/LazyLinkingPackageImpl.java | 359 ++++++ .../lazy/lazyLinking/impl/ModelImpl.java | 153 +++ .../lazy/lazyLinking/impl/PropertyImpl.java | 206 ++++ .../lazy/lazyLinking/impl/TypeImpl.java | 460 ++++++++ .../impl/UnresolvedProxyPropertyImpl.java | 206 ++++ .../util/LazyLinkingAdapterFactory.java | 175 +++ .../lazyLinking/util/LazyLinkingSwitch.java | 174 +++ .../xtext/XtextGrammarTestLanguage.xtextbin | Bin 8404 -> 8404 bytes .../RegionAccessTestLanguage.xtextbin | Bin 3555 -> 3555 bytes ...nAccessTestLanguageSyntacticSequencer.java | 8 +- .../generator/ecore/SubTestLanguage.xtextbin | Bin 2116 -> 2161 bytes .../SubTestLanguageGrammarAccess.java | 4 +- .../AbstractTestLanguage.xtextbin | Bin 2402 -> 2447 bytes .../ConcreteTestLanguage.xtextbin | Bin 3663 -> 3788 bytes .../InheritanceTest2Language.xtextbin | Bin 2480 -> 2571 bytes .../InheritanceTest3Language.xtextbin | Bin 2568 -> 2693 bytes .../InheritanceTestLanguage.xtextbin | Bin 2161 -> 2235 bytes .../AbstractTestLanguageGrammarAccess.java | 2 +- .../ConcreteTestLanguageGrammarAccess.java | 22 +- ...InheritanceTest2LanguageGrammarAccess.java | 6 +- ...InheritanceTest3LanguageGrammarAccess.java | 14 +- .../InheritanceTestLanguageGrammarAccess.java | 6 +- ...InternalIgnoreCaseLexerTestLanguageLexer.g | 2 - ...ernalIgnoreCaseLexerTestLanguageLexer.java | 22 +- .../IgnoreCaseImportsTestLanguage.xtextbin | Bin 2179 -> 2224 bytes .../IgnoreCaseNamespacesTestLanguage.xtextbin | Bin 2196 -> 2241 bytes .../lazy/LazyLinkingTestLanguage.xtextbin | Bin 2353 -> 2307 bytes ...gTestLanguageStandaloneSetupGenerated.java | 5 - .../lazy/lazyLinking/LazyLinkingFactory.java | 71 -- .../lazy/lazyLinking/LazyLinkingPackage.java | 550 --------- .../xtext/linking/lazy/lazyLinking/Model.java | 44 - .../linking/lazy/lazyLinking/Property.java | 71 -- .../xtext/linking/lazy/lazyLinking/Type.java | 163 --- .../lazyLinking/UnresolvedProxyProperty.java | 71 -- .../impl/LazyLinkingFactoryImpl.java | 143 --- .../impl/LazyLinkingPackageImpl.java | 380 ------ .../lazy/lazyLinking/impl/ModelImpl.java | 168 --- .../lazy/lazyLinking/impl/PropertyImpl.java | 222 ---- .../lazy/lazyLinking/impl/TypeImpl.java | 497 -------- .../impl/UnresolvedProxyPropertyImpl.java | 222 ---- .../util/LazyLinkingAdapterFactory.java | 193 ---- .../lazyLinking/util/LazyLinkingSwitch.java | 189 --- ...eCaseImportsTestLanguageGrammarAccess.java | 4 +- ...seNamespacesTestLanguageGrammarAccess.java | 4 +- .../parser/antlr/Bug301935TestLanguage.ecore | 6 +- .../antlr/Bug301935TestLanguage.genmodel | 2 +- .../parser/antlr/Bug406914TestLanguage.ecore | 2 +- .../antlr/Bug406914TestLanguage.genmodel | 2 +- .../impl/Bug301935TestPackageImpl.java | 13 +- .../impl/Bug406914TestPackageImpl.java | 9 +- .../InternalBug299237TestLanguageLexer.g | 2 - .../InternalBug299237TestLanguageLexer.java | 74 +- .../InternalBug301935ExTestLanguageLexer.g | 2 - .../InternalBug301935ExTestLanguageLexer.java | 20 +- ...g301935TestLanguageSemanticSequencer.java} | 2 +- ...301935TestLanguageSyntacticSequencer.java} | 2 +- .../fragments/FragmentTestLanguage.xtextbin | Bin 3652 -> 3652 bytes .../fragments/FragmentTestLanguageEx.xtextbin | Bin 3780 -> 3780 bytes .../IndentationAwareTestLanguage.xtextbin | Bin 1987 -> 2032 bytes ...nternalIndentationAwareTestLanguageLexer.g | 2 - ...rnalIndentationAwareTestLanguageLexer.java | 74 +- ...ntationAwareTestLanguageGrammarAccess.java | 2 +- .../internal/InternalKeywordsTestLanguage.g | 2 +- .../InternalKeywordsTestLanguageParser.java | 2 +- .../KeywordsTestLanguageGrammarAccess.java | 4 +- .../NoParametersTestLanguage.xtextbin | Bin 5100 -> 5145 bytes .../ParametersTestLanguage.xtextbin | Bin 3479 -> 3479 bytes .../ParametersTestLanguageEx.xtextbin | Bin 3700 -> 3762 bytes .../TwoParametersTestLanguage.xtextbin | Bin 5750 -> 5795 bytes ...NoParametersTestLanguageGrammarAccess.java | 4 +- ...ParametersTestLanguageExGrammarAccess.java | 8 +- ...woParametersTestLanguageGrammarAccess.java | 4 +- .../Bug292245TestLanguage.xtextbin | Bin 1333 -> 1333 bytes .../Bug297105TestLanguage.xtextbin | Bin 2255 -> 2255 bytes .../Bug317840TestLanguage.xtextbin | Bin 1971 -> 1971 bytes .../HiddenTerminalsTestLanguage.xtextbin | Bin 2328 -> 2328 bytes .../TerminalRulesTestLanguage.xtextbin | Bin 2133 -> 2133 bytes ...dGroupsTestLanguageSyntacticSequencer.java | 12 +- ...dGroupsTestLanguageSyntacticSequencer.java | 10 +- .../formatter/FormatterTestLanguage.xtextbin | Bin 4479 -> 4479 bytes .../reconstr/Bug302128TestLanguage.xtextbin | Bin 1993 -> 2038 bytes .../Bug302128TestLanguageGrammarAccess.java | 2 +- .../serializer/SequencerTestLanguage.xtextbin | Bin 10908 -> 10908 bytes .../SyntacticSequencerTestLanguage.xtextbin | Bin 5787 -> 5787 bytes .../xtext/GenerateAllTestLanguages.mwe2 | 2 + .../linking/GenerateLinkingTestLanguages.mwe2 | 1 + .../xtext/linking/lazy/Bug443705Test.java | 2 +- .../lazy/LazyLinkingTestLanguage.ecore | 0 .../lazy/LazyLinkingTestLanguage.genmodel | 2 +- .../lazy/LazyLinkingTestLanguage.xtext | 2 +- .../LazyLinkingTestLanguagePostProcessor.ext | 27 - ...azyLinkingTestLanguageStandaloneSetup.java | 18 +- ...ug301935TestLanguageSemanticSequencer.java | 8 + ...g301935TestLanguageSyntacticSequencer.java | 8 + .../parser/keywords/GrammarAccessTest.java | 2 +- 106 files changed, 3550 insertions(+), 3728 deletions(-) delete mode 100644 org.eclipse.xtext.testlanguages/build.properties create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java create mode 100644 org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java delete mode 100644 org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java rename org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/{Bug301935TestLanguageSemanticSequencer.java => AbstractBug301935TestLanguageSemanticSequencer.java} (96%) rename org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/{Bug301935TestLanguageSyntacticSequencer.java => AbstractBug301935TestLanguageSyntacticSequencer.java} (95%) rename org.eclipse.xtext.tests/{src-gen => src}/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore (100%) rename org.eclipse.xtext.tests/{src-gen => src}/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel (99%) delete mode 100644 org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext create mode 100644 org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java create mode 100644 org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java diff --git a/org.eclipse.xtext.testlanguages/build.gradle b/org.eclipse.xtext.testlanguages/build.gradle index e6a67bcbc..a8128245d 100644 --- a/org.eclipse.xtext.testlanguages/build.gradle +++ b/org.eclipse.xtext.testlanguages/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(':org.eclipse.xtext.testing') compile "org.eclipse.core:org.eclipse.core.runtime:$versions.eclipseCore" mwe2Compile project(':org.eclipse.xtext.xtext.generator') - mwe2Compile "org.eclipse.xtext:org.eclipse.xtext.common.types:$versions.xtext_bootstrap" + mwe2Runtime "org.eclipse.xtext:org.eclipse.xtext.common.types:$versions.xtext_bootstrap" mwe2Runtime "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$versions.emfMwe2" } diff --git a/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties deleted file mode 100644 index b2a618eee..000000000 --- a/org.eclipse.xtext.testlanguages/build.properties +++ /dev/null @@ -1,11 +0,0 @@ -source.. = src/,\ - src-gen/,\ - xtend-gen/ -bin.includes = model/generated/,\ - META-INF/,\ - .,\ - plugin.xml,\ - about.html - -src.includes = about.html -additional.bundles = org.eclipse.xtext.generator diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen index ad1c0af03..3bb53e59a 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen @@ -1,515 +1,507 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: org.eclipse.xtext.tests -Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true -Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.xtext, - org.eclipse.xtext.dummy, - org.eclipse.xtext.dummy.dummyLang, - org.eclipse.xtext.dummy.dummyLang.impl, - org.eclipse.xtext.dummy.dummyLang.util, - org.eclipse.xtext.dummy.parser.antlr, - org.eclipse.xtext.dummy.parser.antlr.internal, - org.eclipse.xtext.dummy.serializer, - org.eclipse.xtext.dummy.services, - org.eclipse.xtext.enumrules, - org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage, - org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.impl, - org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.util, - org.eclipse.xtext.enumrules.enumRulesTestLanguage, - org.eclipse.xtext.enumrules.enumRulesTestLanguage.impl, - org.eclipse.xtext.enumrules.enumRulesTestLanguage.util, - org.eclipse.xtext.enumrules.multiRuleenums, - org.eclipse.xtext.enumrules.multiRuleenums.impl, - org.eclipse.xtext.enumrules.multiRuleenums.util, - org.eclipse.xtext.enumrules.parser.antlr, - org.eclipse.xtext.enumrules.parser.antlr.internal, - org.eclipse.xtext.enumrules.serializer, - org.eclipse.xtext.enumrules.services, - org.eclipse.xtext.formatting2.internal, - org.eclipse.xtext.formatting2.internal.formattertestlanguage, - org.eclipse.xtext.formatting2.internal.formattertestlanguage.impl, - org.eclipse.xtext.formatting2.internal.formattertestlanguage.util, - org.eclipse.xtext.formatting2.internal.parser.antlr, - org.eclipse.xtext.formatting2.internal.parser.antlr.internal, - org.eclipse.xtext.formatting2.internal.serializer, - org.eclipse.xtext.formatting2.internal.services, - org.eclipse.xtext.formatting2.internal.tests, - org.eclipse.xtext.formatting2.regionaccess.internal, - org.eclipse.xtext.formatting2.regionaccess.internal.parser.antlr, - org.eclipse.xtext.formatting2.regionaccess.internal.parser.antlr.internal, - org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage, - org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.impl, - org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.util, - org.eclipse.xtext.formatting2.regionaccess.internal.serializer, - org.eclipse.xtext.formatting2.regionaccess.internal.services, - org.eclipse.xtext.formatting2.regionaccess.internal.tests, - org.eclipse.xtext.generator.ecore, - org.eclipse.xtext.generator.ecore.parser.antlr, - org.eclipse.xtext.generator.ecore.parser.antlr.internal, - org.eclipse.xtext.generator.ecore.second, - org.eclipse.xtext.generator.ecore.second.impl, - org.eclipse.xtext.generator.ecore.second.util, - org.eclipse.xtext.generator.ecore.serializer, - org.eclipse.xtext.generator.ecore.services, - org.eclipse.xtext.generator.ecore.subPackage, - org.eclipse.xtext.generator.ecore.subPackage.impl, - org.eclipse.xtext.generator.ecore.subPackage.util, - org.eclipse.xtext.generator.ecore.superPackage, - org.eclipse.xtext.generator.ecore.superPackage.impl, - org.eclipse.xtext.generator.ecore.superPackage.util, - org.eclipse.xtext.generator.grammarAccess, - org.eclipse.xtext.generator.grammarAccess.parser.antlr, - org.eclipse.xtext.generator.grammarAccess.parser.antlr.internal, - org.eclipse.xtext.generator.grammarAccess.serializer, - org.eclipse.xtext.generator.grammarAccess.services, - org.eclipse.xtext.grammarinheritance, - org.eclipse.xtext.grammarinheritance.baseInheritanceTest, - org.eclipse.xtext.grammarinheritance.baseInheritanceTest.impl, - org.eclipse.xtext.grammarinheritance.baseInheritanceTest.util, - org.eclipse.xtext.grammarinheritance.foo, - org.eclipse.xtext.grammarinheritance.foo.impl, - org.eclipse.xtext.grammarinheritance.foo.util, - org.eclipse.xtext.grammarinheritance.inheritanceTest, - org.eclipse.xtext.grammarinheritance.inheritanceTest.impl, - org.eclipse.xtext.grammarinheritance.inheritanceTest.util, - org.eclipse.xtext.grammarinheritance.inheritanceTest2, - org.eclipse.xtext.grammarinheritance.inheritanceTest2.impl, - org.eclipse.xtext.grammarinheritance.inheritanceTest2.util, - org.eclipse.xtext.grammarinheritance.parser.antlr, - org.eclipse.xtext.grammarinheritance.parser.antlr.internal, - org.eclipse.xtext.grammarinheritance.serializer, - org.eclipse.xtext.grammarinheritance.services, - org.eclipse.xtext.index, - org.eclipse.xtext.index.indexTestLanguage, - org.eclipse.xtext.index.indexTestLanguage.impl, - org.eclipse.xtext.index.indexTestLanguage.util, - org.eclipse.xtext.index.parser.antlr, - org.eclipse.xtext.index.parser.antlr.internal, - org.eclipse.xtext.index.serializer, - org.eclipse.xtext.index.services, - org.eclipse.xtext.lexer, - org.eclipse.xtext.lexer.backtrackingTestLanguage, - org.eclipse.xtext.lexer.backtrackingTestLanguage.impl, - org.eclipse.xtext.lexer.backtrackingTestLanguage.util, - org.eclipse.xtext.lexer.ignoreCaseTestLanguage, - org.eclipse.xtext.lexer.ignoreCaseTestLanguage.impl, - org.eclipse.xtext.lexer.ignoreCaseTestLanguage.util, - org.eclipse.xtext.lexer.parser.antlr, - org.eclipse.xtext.lexer.parser.antlr.internal, - org.eclipse.xtext.lexer.parser.antlr.lexer, - org.eclipse.xtext.lexer.serializer, - org.eclipse.xtext.lexer.services, - org.eclipse.xtext.linking, - org.eclipse.xtext.linking.bug287988Test, - org.eclipse.xtext.linking.bug287988Test.impl, - org.eclipse.xtext.linking.bug287988Test.util, - org.eclipse.xtext.linking.bug289059Test, - org.eclipse.xtext.linking.bug289059Test.impl, - org.eclipse.xtext.linking.bug289059Test.util, - org.eclipse.xtext.linking.bug313089, - org.eclipse.xtext.linking.bug313089.impl, - org.eclipse.xtext.linking.bug313089.util, - org.eclipse.xtext.linking.bug362902, - org.eclipse.xtext.linking.bug362902.impl, - org.eclipse.xtext.linking.bug362902.util, - org.eclipse.xtext.linking.ignoreCaseImportsTest, - org.eclipse.xtext.linking.ignoreCaseImportsTest.impl, - org.eclipse.xtext.linking.ignoreCaseImportsTest.util, - org.eclipse.xtext.linking.ignoreCaseLinkingTest, - org.eclipse.xtext.linking.ignoreCaseLinkingTest.impl, - org.eclipse.xtext.linking.ignoreCaseLinkingTest.util, - org.eclipse.xtext.linking.ignoreCaseNamespacesTest, - org.eclipse.xtext.linking.ignoreCaseNamespacesTest.impl, - org.eclipse.xtext.linking.ignoreCaseNamespacesTest.util, - org.eclipse.xtext.linking.importedURI, - org.eclipse.xtext.linking.importedURI.impl, - org.eclipse.xtext.linking.importedURI.util, - org.eclipse.xtext.linking.langATestLanguage, - org.eclipse.xtext.linking.langATestLanguage.impl, - org.eclipse.xtext.linking.langATestLanguage.util, - org.eclipse.xtext.linking.lazy, - org.eclipse.xtext.linking.lazy.bug311337, - org.eclipse.xtext.linking.lazy.bug311337.impl, - org.eclipse.xtext.linking.lazy.bug311337.util, - org.eclipse.xtext.linking.lazy.lazyLinking, - org.eclipse.xtext.linking.lazy.lazyLinking.impl, - org.eclipse.xtext.linking.lazy.lazyLinking.util, - org.eclipse.xtext.linking.lazy.parser.antlr, - org.eclipse.xtext.linking.lazy.parser.antlr.internal, - org.eclipse.xtext.linking.lazy.serializer, - org.eclipse.xtext.linking.lazy.services, - org.eclipse.xtext.linking.lazy.tests, - org.eclipse.xtext.linking.parser.antlr, - org.eclipse.xtext.linking.parser.antlr.internal, - org.eclipse.xtext.linking.scoping, - org.eclipse.xtext.linking.serializer, - org.eclipse.xtext.linking.services, - org.eclipse.xtext.metamodelreferencing.tests, - org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest, - org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.impl, - org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.util, - org.eclipse.xtext.metamodelreferencing.tests.ecoreReference, - org.eclipse.xtext.metamodelreferencing.tests.ecoreReference.impl, - org.eclipse.xtext.metamodelreferencing.tests.ecoreReference.util, - org.eclipse.xtext.metamodelreferencing.tests.otherTest, - org.eclipse.xtext.metamodelreferencing.tests.otherTest.impl, - org.eclipse.xtext.metamodelreferencing.tests.otherTest.util, - org.eclipse.xtext.metamodelreferencing.tests.parser.antlr, - org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.internal, - org.eclipse.xtext.metamodelreferencing.tests.serializer, - org.eclipse.xtext.metamodelreferencing.tests.services, - org.eclipse.xtext.metamodelreferencing.tests.simpleTest, - org.eclipse.xtext.metamodelreferencing.tests.simpleTest.impl, - org.eclipse.xtext.metamodelreferencing.tests.simpleTest.util, - org.eclipse.xtext.parser.antlr, - org.eclipse.xtext.parser.antlr.bug289515Test, - org.eclipse.xtext.parser.antlr.bug289515Test.impl, - org.eclipse.xtext.parser.antlr.bug289515Test.util, - org.eclipse.xtext.parser.antlr.bug289524ExTest, - org.eclipse.xtext.parser.antlr.bug289524ExTest.impl, - org.eclipse.xtext.parser.antlr.bug289524ExTest.util, - org.eclipse.xtext.parser.antlr.bug289524Test, - org.eclipse.xtext.parser.antlr.bug289524Test.impl, - org.eclipse.xtext.parser.antlr.bug289524Test.util, - org.eclipse.xtext.parser.antlr.bug296889ExTest, - org.eclipse.xtext.parser.antlr.bug296889ExTest.impl, - org.eclipse.xtext.parser.antlr.bug296889ExTest.util, - org.eclipse.xtext.parser.antlr.bug296889Test, - org.eclipse.xtext.parser.antlr.bug296889Test.impl, - org.eclipse.xtext.parser.antlr.bug296889Test.util, - org.eclipse.xtext.parser.antlr.bug299237Test, - org.eclipse.xtext.parser.antlr.bug299237Test.impl, - org.eclipse.xtext.parser.antlr.bug299237Test.util, - org.eclipse.xtext.parser.antlr.bug301935Test, - org.eclipse.xtext.parser.antlr.bug301935Test.impl, - org.eclipse.xtext.parser.antlr.bug301935Test.util, - org.eclipse.xtext.parser.antlr.bug378967Test, - org.eclipse.xtext.parser.antlr.bug378967Test.impl, - org.eclipse.xtext.parser.antlr.bug378967Test.util, - org.eclipse.xtext.parser.antlr.bug443221Test, - org.eclipse.xtext.parser.antlr.bug443221Test.impl, - org.eclipse.xtext.parser.antlr.bug443221Test.util, - org.eclipse.xtext.parser.antlr.internal, - org.eclipse.xtext.parser.antlr.parser.antlr, - org.eclipse.xtext.parser.antlr.parser.antlr.internal, - org.eclipse.xtext.parser.antlr.parser.antlr.lexer, - org.eclipse.xtext.parser.antlr.serializer, - org.eclipse.xtext.parser.antlr.services, - org.eclipse.xtext.parser.assignments, - org.eclipse.xtext.parser.assignments.assignmentsTestLanguage, - org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.impl, - org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.util, - org.eclipse.xtext.parser.assignments.bug287184Test, - org.eclipse.xtext.parser.assignments.bug287184Test.impl, - org.eclipse.xtext.parser.assignments.bug287184Test.util, - org.eclipse.xtext.parser.assignments.bug288432Test, - org.eclipse.xtext.parser.assignments.bug288432Test.impl, - org.eclipse.xtext.parser.assignments.bug288432Test.util, - org.eclipse.xtext.parser.assignments.parser.antlr, - org.eclipse.xtext.parser.assignments.parser.antlr.internal, - org.eclipse.xtext.parser.assignments.serializer, - org.eclipse.xtext.parser.assignments.services, - org.eclipse.xtext.parser.bug419429, - org.eclipse.xtext.parser.bug419429.parser.antlr, - org.eclipse.xtext.parser.bug419429.parser.antlr.internal, - org.eclipse.xtext.parser.bug419429.serializer, - org.eclipse.xtext.parser.bug419429.services, - org.eclipse.xtext.parser.datatyperules, - org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage, - org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.impl, - org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.util, - org.eclipse.xtext.parser.datatyperules.parser.antlr, - org.eclipse.xtext.parser.datatyperules.parser.antlr.internal, - org.eclipse.xtext.parser.datatyperules.serializer, - org.eclipse.xtext.parser.datatyperules.services, - org.eclipse.xtext.parser.encoding, - org.eclipse.xtext.parser.encoding.encodingTest, - org.eclipse.xtext.parser.encoding.encodingTest.impl, - org.eclipse.xtext.parser.encoding.encodingTest.util, - org.eclipse.xtext.parser.encoding.parser.antlr, - org.eclipse.xtext.parser.encoding.parser.antlr.internal, - org.eclipse.xtext.parser.encoding.serializer, - org.eclipse.xtext.parser.encoding.services, - org.eclipse.xtext.parser.epatch, - org.eclipse.xtext.parser.epatch.epatchTestLanguage, - org.eclipse.xtext.parser.epatch.epatchTestLanguage.impl, - org.eclipse.xtext.parser.epatch.epatchTestLanguage.util, - org.eclipse.xtext.parser.epatch.parser.antlr, - org.eclipse.xtext.parser.epatch.parser.antlr.internal, - org.eclipse.xtext.parser.epatch.serializer, - org.eclipse.xtext.parser.epatch.services, - org.eclipse.xtext.parser.fragments, - org.eclipse.xtext.parser.fragments.fragmentTestLanguage, - org.eclipse.xtext.parser.fragments.fragmentTestLanguage.impl, - org.eclipse.xtext.parser.fragments.fragmentTestLanguage.util, - org.eclipse.xtext.parser.fragments.parser.antlr, - org.eclipse.xtext.parser.fragments.parser.antlr.internal, - org.eclipse.xtext.parser.fragments.serializer, - org.eclipse.xtext.parser.fragments.services, - org.eclipse.xtext.parser.fragments.tests, - org.eclipse.xtext.parser.indentation, - org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage, - org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.impl, - org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.util, - org.eclipse.xtext.parser.indentation.parser.antlr, - org.eclipse.xtext.parser.indentation.parser.antlr.internal, - org.eclipse.xtext.parser.indentation.parser.antlr.lexer, - org.eclipse.xtext.parser.indentation.serializer, - org.eclipse.xtext.parser.indentation.services, - org.eclipse.xtext.parser.indentation.tests, - org.eclipse.xtext.parser.keywords, - org.eclipse.xtext.parser.keywords.keywordsTestLanguage, - org.eclipse.xtext.parser.keywords.keywordsTestLanguage.impl, - org.eclipse.xtext.parser.keywords.keywordsTestLanguage.util, - org.eclipse.xtext.parser.keywords.parser.antlr, - org.eclipse.xtext.parser.keywords.parser.antlr.internal, - org.eclipse.xtext.parser.keywords.serializer, - org.eclipse.xtext.parser.keywords.services, - org.eclipse.xtext.parser.parameters, - org.eclipse.xtext.parser.parameters.parametersTestLanguage, - org.eclipse.xtext.parser.parameters.parametersTestLanguage.impl, - org.eclipse.xtext.parser.parameters.parametersTestLanguage.util, - org.eclipse.xtext.parser.parameters.parser.antlr, - org.eclipse.xtext.parser.parameters.parser.antlr.internal, - org.eclipse.xtext.parser.parameters.serializer, - org.eclipse.xtext.parser.parameters.services, - org.eclipse.xtext.parser.parameters.tests, - org.eclipse.xtext.parser.terminalrules, - org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage, - org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage.impl, - org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage.util, - org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage, - org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage.impl, - org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage.util, - org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage, - org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.impl, - org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.util, - org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage, - org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.impl, - org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.util, - org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage, - org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.impl, - org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.util, - org.eclipse.xtext.parser.terminalrules.parser.antlr, - org.eclipse.xtext.parser.terminalrules.parser.antlr.internal, - org.eclipse.xtext.parser.terminalrules.serializer, - org.eclipse.xtext.parser.terminalrules.services, - org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage, - org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage.impl, - org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage.util, - org.eclipse.xtext.parser.terminalrules.unicode, - org.eclipse.xtext.parser.terminalrules.unicode.impl, - org.eclipse.xtext.parser.terminalrules.unicode.util, - org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage, - org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl, - org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.util, - org.eclipse.xtext.parser.unorderedGroups, - org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage, - org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.impl, - org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.util, - org.eclipse.xtext.parser.unorderedGroups.parser.antlr, - org.eclipse.xtext.parser.unorderedGroups.parser.antlr.internal, - org.eclipse.xtext.parser.unorderedGroups.serializer, - org.eclipse.xtext.parser.unorderedGroups.services, - org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage, - org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.impl, - org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.util, - org.eclipse.xtext.parsetree.formatter, - org.eclipse.xtext.parsetree.formatter.formattertestlanguage, - org.eclipse.xtext.parsetree.formatter.formattertestlanguage.impl, - org.eclipse.xtext.parsetree.formatter.formattertestlanguage.util, - org.eclipse.xtext.parsetree.formatter.parser.antlr, - org.eclipse.xtext.parsetree.formatter.parser.antlr.internal, - org.eclipse.xtext.parsetree.formatter.serializer, - org.eclipse.xtext.parsetree.formatter.services, - org.eclipse.xtext.parsetree.impl, - org.eclipse.xtext.parsetree.impl.bug305397, - org.eclipse.xtext.parsetree.impl.bug305397.impl, - org.eclipse.xtext.parsetree.impl.bug305397.util, - org.eclipse.xtext.parsetree.impl.commentAssociation, - org.eclipse.xtext.parsetree.impl.commentAssociation.impl, - org.eclipse.xtext.parsetree.impl.commentAssociation.util, - org.eclipse.xtext.parsetree.impl.parser.antlr, - org.eclipse.xtext.parsetree.impl.parser.antlr.internal, - org.eclipse.xtext.parsetree.impl.serializer, - org.eclipse.xtext.parsetree.impl.services, - org.eclipse.xtext.parsetree.reconstr, - org.eclipse.xtext.parsetree.reconstr.bug299395, - org.eclipse.xtext.parsetree.reconstr.bug299395.impl, - org.eclipse.xtext.parsetree.reconstr.bug299395.util, - org.eclipse.xtext.parsetree.reconstr.bug302128, - org.eclipse.xtext.parsetree.reconstr.bug302128.impl, - org.eclipse.xtext.parsetree.reconstr.bug302128.util, - org.eclipse.xtext.parsetree.reconstr.complexrewritetest, - org.eclipse.xtext.parsetree.reconstr.complexrewritetest.impl, - org.eclipse.xtext.parsetree.reconstr.complexrewritetest.util, - org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest, - org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.impl, - org.eclipse.xtext.parsetree.reconstr.hiddentokenmergertest.util, - org.eclipse.xtext.parsetree.reconstr.parser.antlr, - org.eclipse.xtext.parsetree.reconstr.parser.antlr.internal, - org.eclipse.xtext.parsetree.reconstr.partialserializationtest, - org.eclipse.xtext.parsetree.reconstr.partialserializationtest.impl, - org.eclipse.xtext.parsetree.reconstr.partialserializationtest.util, - org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage, - org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.impl, - org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.util, - org.eclipse.xtext.parsetree.reconstr.serializationerror, - org.eclipse.xtext.parsetree.reconstr.serializationerror.impl, - org.eclipse.xtext.parsetree.reconstr.serializationerror.util, - org.eclipse.xtext.parsetree.reconstr.serializer, - org.eclipse.xtext.parsetree.reconstr.services, - org.eclipse.xtext.parsetree.reconstr.simplerewritetest, - org.eclipse.xtext.parsetree.reconstr.simplerewritetest.impl, - org.eclipse.xtext.parsetree.reconstr.simplerewritetest.util, - org.eclipse.xtext.parsetree.transientvalues, - org.eclipse.xtext.parsetree.transientvalues.parser.antlr, - org.eclipse.xtext.parsetree.transientvalues.parser.antlr.internal, - org.eclipse.xtext.parsetree.transientvalues.serializer, - org.eclipse.xtext.parsetree.transientvalues.services, - org.eclipse.xtext.parsetree.transientvalues.transientvaluestest, - org.eclipse.xtext.parsetree.transientvalues.transientvaluestest.impl, - org.eclipse.xtext.parsetree.transientvalues.transientvaluestest.util, - org.eclipse.xtext.parsetree.unassignedtext, - org.eclipse.xtext.parsetree.unassignedtext.parser.antlr, - org.eclipse.xtext.parsetree.unassignedtext.parser.antlr.internal, - org.eclipse.xtext.parsetree.unassignedtext.serializer, - org.eclipse.xtext.parsetree.unassignedtext.services, - org.eclipse.xtext.parsetree.unassignedtext.unassignedtext, - org.eclipse.xtext.parsetree.unassignedtext.unassignedtext.impl, - org.eclipse.xtext.parsetree.unassignedtext.unassignedtext.util, - org.eclipse.xtext.resource, - org.eclipse.xtext.resource.bug385636, - org.eclipse.xtext.resource.bug385636.impl, - org.eclipse.xtext.resource.bug385636.util, - org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage, - org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.impl, - org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.util, - org.eclipse.xtext.resource.liveContainerBuilderIntegerationTestLanguage, - org.eclipse.xtext.resource.liveContainerBuilderIntegerationTestLanguage.impl, - org.eclipse.xtext.resource.liveContainerBuilderIntegerationTestLanguage.util, - org.eclipse.xtext.resource.liveContainerTestLanguage, - org.eclipse.xtext.resource.liveContainerTestLanguage.impl, - org.eclipse.xtext.resource.liveContainerTestLanguage.util, - org.eclipse.xtext.resource.locationprovidertest, - org.eclipse.xtext.resource.locationprovidertest.impl, - org.eclipse.xtext.resource.locationprovidertest.util, - org.eclipse.xtext.resource.parser.antlr, - org.eclipse.xtext.resource.parser.antlr.internal, - org.eclipse.xtext.resource.serializer, - org.eclipse.xtext.resource.services, - org.eclipse.xtext.serializer, - org.eclipse.xtext.serializer.assignmentFinderTest, - org.eclipse.xtext.serializer.assignmentFinderTest.impl, - org.eclipse.xtext.serializer.assignmentFinderTest.util, - org.eclipse.xtext.serializer.contextFinderTest, - org.eclipse.xtext.serializer.contextFinderTest.impl, - org.eclipse.xtext.serializer.contextFinderTest.util, - org.eclipse.xtext.serializer.hiddentokensequencertest, - org.eclipse.xtext.serializer.hiddentokensequencertest.impl, - org.eclipse.xtext.serializer.hiddentokensequencertest.util, - org.eclipse.xtext.serializer.parser.antlr, - org.eclipse.xtext.serializer.parser.antlr.internal, - org.eclipse.xtext.serializer.sequencertest, - org.eclipse.xtext.serializer.sequencertest.impl, - org.eclipse.xtext.serializer.sequencertest.util, - org.eclipse.xtext.serializer.serializer, - org.eclipse.xtext.serializer.services, - org.eclipse.xtext.serializer.syntacticsequencertest, - org.eclipse.xtext.serializer.syntacticsequencertest.impl, - org.eclipse.xtext.serializer.syntacticsequencertest.util, - org.eclipse.xtext.services, - org.eclipse.xtext.testlanguages, - org.eclipse.xtext.testlanguages.actionLang, - org.eclipse.xtext.testlanguages.actionLang.impl, - org.eclipse.xtext.testlanguages.actionLang.util, - org.eclipse.xtext.testlanguages.actionLang2, - org.eclipse.xtext.testlanguages.actionLang2.impl, - org.eclipse.xtext.testlanguages.actionLang2.util, - org.eclipse.xtext.testlanguages.fowlerdsl, - org.eclipse.xtext.testlanguages.fowlerdsl.impl, - org.eclipse.xtext.testlanguages.fowlerdsl.util, - org.eclipse.xtext.testlanguages.indent, - org.eclipse.xtext.testlanguages.indent.indentLang, - org.eclipse.xtext.testlanguages.indent.indentLang.impl, - org.eclipse.xtext.testlanguages.indent.indentLang.util, - org.eclipse.xtext.testlanguages.indent.parser.antlr, - org.eclipse.xtext.testlanguages.indent.parser.antlr.internal, - org.eclipse.xtext.testlanguages.indent.serializer, - org.eclipse.xtext.testlanguages.indent.services, - org.eclipse.xtext.testlanguages.lookaheadLang, - org.eclipse.xtext.testlanguages.lookaheadLang.impl, - org.eclipse.xtext.testlanguages.lookaheadLang.util, - org.eclipse.xtext.testlanguages.optionalEmpty, - org.eclipse.xtext.testlanguages.optionalEmpty.impl, - org.eclipse.xtext.testlanguages.optionalEmpty.util, - org.eclipse.xtext.testlanguages.parser.antlr, - org.eclipse.xtext.testlanguages.parser.antlr.internal, - org.eclipse.xtext.testlanguages.partialParserTestLanguage, - org.eclipse.xtext.testlanguages.partialParserTestLanguage.impl, - org.eclipse.xtext.testlanguages.partialParserTestLanguage.util, - org.eclipse.xtext.testlanguages.referenceGrammar, - org.eclipse.xtext.testlanguages.referenceGrammar.impl, - org.eclipse.xtext.testlanguages.referenceGrammar.util, - org.eclipse.xtext.testlanguages.serializer, - org.eclipse.xtext.testlanguages.services, - org.eclipse.xtext.testlanguages.simpleExpressions, - org.eclipse.xtext.testlanguages.simpleExpressions.impl, - org.eclipse.xtext.testlanguages.simpleExpressions.util, - org.eclipse.xtext.testlanguages.testLang, - org.eclipse.xtext.testlanguages.testLang.impl, - org.eclipse.xtext.testlanguages.testLang.util, - org.eclipse.xtext.testlanguages.treeTestLanguage, - org.eclipse.xtext.testlanguages.treeTestLanguage.impl, - org.eclipse.xtext.testlanguages.treeTestLanguage.util, - org.eclipse.xtext.validation, - org.eclipse.xtext.validation.csvalidationtest, - org.eclipse.xtext.validation.csvalidationtest.impl, - org.eclipse.xtext.validation.csvalidationtest.util, - org.eclipse.xtext.validation.parser.antlr, - org.eclipse.xtext.validation.parser.antlr.internal, - org.eclipse.xtext.validation.serializer, - org.eclipse.xtext.validation.services, - org.eclipse.xtext.valueconverter, - org.eclipse.xtext.valueconverter.bug250313, - org.eclipse.xtext.valueconverter.bug250313.impl, - org.eclipse.xtext.valueconverter.bug250313.util, - org.eclipse.xtext.valueconverter.parser.antlr, - org.eclipse.xtext.valueconverter.parser.antlr.internal, - org.eclipse.xtext.valueconverter.qualifiedName, - org.eclipse.xtext.valueconverter.qualifiedName.impl, - org.eclipse.xtext.valueconverter.qualifiedName.util, - org.eclipse.xtext.valueconverter.serializer, - org.eclipse.xtext.valueconverter.services, - org.eclipse.xtext.xtext.ecoreInference, - org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage, - org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.impl, - org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.util, - org.eclipse.xtext.xtext.ecoreInference.parser.antlr, - org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal, - org.eclipse.xtext.xtext.ecoreInference.serializer, - org.eclipse.xtext.xtext.ecoreInference.services, - org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage, - org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl, - org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.util, - org.eclipse.xtext.xtextTest, - org.eclipse.xtext.xtextTest.impl, - org.eclipse.xtext.xtextTest.util -Require-Bundle: org.antlr.runtime, - org.eclipse.emf.common, - org.eclipse.emf.ecore, - org.eclipse.xtext, - org.eclipse.xtext.testing, - org.eclipse.xtext.util, - org.eclipse.xtext.xbase.lib -Import-Package: org.apache.log4j, - org.hamcrest.core, - org.junit.runner.manipulation;version="4.5.0", - org.junit.runner.notification;version="4.5.0", - org.junit.runner;version="4.5.0", - org.junit.runners.model;version="4.5.0", - org.junit.runners;version="4.5.0", - org.junit;version="4.5.0" +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.eclipse.xtext.tests +Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true +Bundle-Version: 0.0.1.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.xtext, + org.eclipse.xtext.dummy, + org.eclipse.xtext.dummy.dummyLang, + org.eclipse.xtext.dummy.dummyLang.impl, + org.eclipse.xtext.dummy.dummyLang.util, + org.eclipse.xtext.dummy.parser.antlr, + org.eclipse.xtext.dummy.parser.antlr.internal, + org.eclipse.xtext.dummy.serializer, + org.eclipse.xtext.dummy.services, + org.eclipse.xtext.enumrules, + org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage, + org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.impl, + org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.util, + org.eclipse.xtext.enumrules.enumRulesTestLanguage, + org.eclipse.xtext.enumrules.enumRulesTestLanguage.impl, + org.eclipse.xtext.enumrules.enumRulesTestLanguage.util, + org.eclipse.xtext.enumrules.multiRuleenums, + org.eclipse.xtext.enumrules.multiRuleenums.impl, + org.eclipse.xtext.enumrules.multiRuleenums.util, + org.eclipse.xtext.enumrules.parser.antlr, + org.eclipse.xtext.enumrules.parser.antlr.internal, + org.eclipse.xtext.enumrules.serializer, + org.eclipse.xtext.enumrules.services, + org.eclipse.xtext.formatting2.internal, + org.eclipse.xtext.formatting2.internal.formattertestlanguage, + org.eclipse.xtext.formatting2.internal.formattertestlanguage.impl, + org.eclipse.xtext.formatting2.internal.formattertestlanguage.util, + org.eclipse.xtext.formatting2.internal.parser.antlr, + org.eclipse.xtext.formatting2.internal.parser.antlr.internal, + org.eclipse.xtext.formatting2.internal.serializer, + org.eclipse.xtext.formatting2.internal.services, + org.eclipse.xtext.formatting2.internal.tests;x-internal=true, + org.eclipse.xtext.formatting2.regionaccess.internal, + org.eclipse.xtext.formatting2.regionaccess.internal.parser.antlr, + org.eclipse.xtext.formatting2.regionaccess.internal.parser.antlr.internal, + org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage, + org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.impl, + org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.util, + org.eclipse.xtext.formatting2.regionaccess.internal.serializer, + org.eclipse.xtext.formatting2.regionaccess.internal.services, + org.eclipse.xtext.formatting2.regionaccess.internal.tests;x-internal=true, + org.eclipse.xtext.generator.ecore, + org.eclipse.xtext.generator.ecore.parser.antlr, + org.eclipse.xtext.generator.ecore.parser.antlr.internal, + org.eclipse.xtext.generator.ecore.second, + org.eclipse.xtext.generator.ecore.second.impl, + org.eclipse.xtext.generator.ecore.second.util, + org.eclipse.xtext.generator.ecore.serializer, + org.eclipse.xtext.generator.ecore.services, + org.eclipse.xtext.generator.ecore.subPackage, + org.eclipse.xtext.generator.ecore.subPackage.impl, + org.eclipse.xtext.generator.ecore.subPackage.util, + org.eclipse.xtext.generator.ecore.superPackage, + org.eclipse.xtext.generator.ecore.superPackage.impl, + org.eclipse.xtext.generator.ecore.superPackage.util, + org.eclipse.xtext.generator.grammarAccess, + org.eclipse.xtext.generator.grammarAccess.parser.antlr, + org.eclipse.xtext.generator.grammarAccess.parser.antlr.internal, + org.eclipse.xtext.generator.grammarAccess.serializer, + org.eclipse.xtext.generator.grammarAccess.services, + org.eclipse.xtext.grammarinheritance, + org.eclipse.xtext.grammarinheritance.baseInheritanceTest, + org.eclipse.xtext.grammarinheritance.baseInheritanceTest.impl, + org.eclipse.xtext.grammarinheritance.baseInheritanceTest.util, + org.eclipse.xtext.grammarinheritance.foo, + org.eclipse.xtext.grammarinheritance.foo.impl, + org.eclipse.xtext.grammarinheritance.foo.util, + org.eclipse.xtext.grammarinheritance.inheritanceTest, + org.eclipse.xtext.grammarinheritance.inheritanceTest.impl, + org.eclipse.xtext.grammarinheritance.inheritanceTest.util, + org.eclipse.xtext.grammarinheritance.inheritanceTest2, + org.eclipse.xtext.grammarinheritance.inheritanceTest2.impl, + org.eclipse.xtext.grammarinheritance.inheritanceTest2.util, + org.eclipse.xtext.grammarinheritance.parser.antlr, + org.eclipse.xtext.grammarinheritance.parser.antlr.internal, + org.eclipse.xtext.grammarinheritance.serializer, + org.eclipse.xtext.grammarinheritance.services, + org.eclipse.xtext.index, + org.eclipse.xtext.index.indexTestLanguage, + org.eclipse.xtext.index.indexTestLanguage.impl, + org.eclipse.xtext.index.indexTestLanguage.util, + org.eclipse.xtext.index.parser.antlr, + org.eclipse.xtext.index.parser.antlr.internal, + org.eclipse.xtext.index.serializer, + org.eclipse.xtext.index.services, + org.eclipse.xtext.lexer, + org.eclipse.xtext.lexer.backtrackingTestLanguage, + org.eclipse.xtext.lexer.backtrackingTestLanguage.impl, + org.eclipse.xtext.lexer.backtrackingTestLanguage.util, + org.eclipse.xtext.lexer.ignoreCaseTestLanguage, + org.eclipse.xtext.lexer.ignoreCaseTestLanguage.impl, + org.eclipse.xtext.lexer.ignoreCaseTestLanguage.util, + org.eclipse.xtext.lexer.parser.antlr, + org.eclipse.xtext.lexer.parser.antlr.internal, + org.eclipse.xtext.lexer.parser.antlr.lexer, + org.eclipse.xtext.lexer.serializer, + org.eclipse.xtext.lexer.services, + org.eclipse.xtext.linking, + org.eclipse.xtext.linking.bug287988Test, + org.eclipse.xtext.linking.bug287988Test.impl, + org.eclipse.xtext.linking.bug287988Test.util, + org.eclipse.xtext.linking.bug289059Test, + org.eclipse.xtext.linking.bug289059Test.impl, + org.eclipse.xtext.linking.bug289059Test.util, + org.eclipse.xtext.linking.bug313089, + org.eclipse.xtext.linking.bug313089.impl, + org.eclipse.xtext.linking.bug313089.util, + org.eclipse.xtext.linking.bug362902, + org.eclipse.xtext.linking.bug362902.impl, + org.eclipse.xtext.linking.bug362902.util, + org.eclipse.xtext.linking.ignoreCaseImportsTest, + org.eclipse.xtext.linking.ignoreCaseImportsTest.impl, + org.eclipse.xtext.linking.ignoreCaseImportsTest.util, + org.eclipse.xtext.linking.ignoreCaseLinkingTest, + org.eclipse.xtext.linking.ignoreCaseLinkingTest.impl, + org.eclipse.xtext.linking.ignoreCaseLinkingTest.util, + org.eclipse.xtext.linking.ignoreCaseNamespacesTest, + org.eclipse.xtext.linking.ignoreCaseNamespacesTest.impl, + org.eclipse.xtext.linking.ignoreCaseNamespacesTest.util, + org.eclipse.xtext.linking.importedURI, + org.eclipse.xtext.linking.importedURI.impl, + org.eclipse.xtext.linking.importedURI.util, + org.eclipse.xtext.linking.langATestLanguage, + org.eclipse.xtext.linking.langATestLanguage.impl, + org.eclipse.xtext.linking.langATestLanguage.util, + org.eclipse.xtext.linking.lazy, + org.eclipse.xtext.linking.lazy.bug311337, + org.eclipse.xtext.linking.lazy.bug311337.impl, + org.eclipse.xtext.linking.lazy.bug311337.util, + org.eclipse.xtext.linking.lazy.parser.antlr, + org.eclipse.xtext.linking.lazy.parser.antlr.internal, + org.eclipse.xtext.linking.lazy.serializer, + org.eclipse.xtext.linking.lazy.services, + org.eclipse.xtext.linking.lazy.tests;x-internal=true, + org.eclipse.xtext.linking.parser.antlr, + org.eclipse.xtext.linking.parser.antlr.internal, + org.eclipse.xtext.linking.scoping, + org.eclipse.xtext.linking.serializer, + org.eclipse.xtext.linking.services, + org.eclipse.xtext.metamodelreferencing.tests, + org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest, + org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.impl, + org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.util, + org.eclipse.xtext.metamodelreferencing.tests.ecoreReference, + org.eclipse.xtext.metamodelreferencing.tests.ecoreReference.impl, + org.eclipse.xtext.metamodelreferencing.tests.ecoreReference.util, + org.eclipse.xtext.metamodelreferencing.tests.otherTest, + org.eclipse.xtext.metamodelreferencing.tests.otherTest.impl, + org.eclipse.xtext.metamodelreferencing.tests.otherTest.util, + org.eclipse.xtext.metamodelreferencing.tests.parser.antlr, + org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.internal, + org.eclipse.xtext.metamodelreferencing.tests.serializer, + org.eclipse.xtext.metamodelreferencing.tests.services, + org.eclipse.xtext.metamodelreferencing.tests.simpleTest, + org.eclipse.xtext.metamodelreferencing.tests.simpleTest.impl, + org.eclipse.xtext.metamodelreferencing.tests.simpleTest.util, + org.eclipse.xtext.parser.antlr, + org.eclipse.xtext.parser.antlr.bug289515Test, + org.eclipse.xtext.parser.antlr.bug289515Test.impl, + org.eclipse.xtext.parser.antlr.bug289515Test.util, + org.eclipse.xtext.parser.antlr.bug289524ExTest, + org.eclipse.xtext.parser.antlr.bug289524ExTest.impl, + org.eclipse.xtext.parser.antlr.bug289524ExTest.util, + org.eclipse.xtext.parser.antlr.bug289524Test, + org.eclipse.xtext.parser.antlr.bug289524Test.impl, + org.eclipse.xtext.parser.antlr.bug289524Test.util, + org.eclipse.xtext.parser.antlr.bug296889ExTest, + org.eclipse.xtext.parser.antlr.bug296889ExTest.impl, + org.eclipse.xtext.parser.antlr.bug296889ExTest.util, + org.eclipse.xtext.parser.antlr.bug296889Test, + org.eclipse.xtext.parser.antlr.bug296889Test.impl, + org.eclipse.xtext.parser.antlr.bug296889Test.util, + org.eclipse.xtext.parser.antlr.bug299237Test, + org.eclipse.xtext.parser.antlr.bug299237Test.impl, + org.eclipse.xtext.parser.antlr.bug299237Test.util, + org.eclipse.xtext.parser.antlr.bug301935Test, + org.eclipse.xtext.parser.antlr.bug301935Test.impl, + org.eclipse.xtext.parser.antlr.bug301935Test.util, + org.eclipse.xtext.parser.antlr.bug378967Test, + org.eclipse.xtext.parser.antlr.bug378967Test.impl, + org.eclipse.xtext.parser.antlr.bug378967Test.util, + org.eclipse.xtext.parser.antlr.bug406914Test, + org.eclipse.xtext.parser.antlr.bug406914Test.impl, + org.eclipse.xtext.parser.antlr.bug406914Test.util, + org.eclipse.xtext.parser.antlr.bug443221Test, + org.eclipse.xtext.parser.antlr.bug443221Test.impl, + org.eclipse.xtext.parser.antlr.bug443221Test.util, + org.eclipse.xtext.parser.antlr.internal, + org.eclipse.xtext.parser.antlr.parser.antlr, + org.eclipse.xtext.parser.antlr.parser.antlr.internal, + org.eclipse.xtext.parser.antlr.parser.antlr.lexer, + org.eclipse.xtext.parser.antlr.serializer, + org.eclipse.xtext.parser.antlr.services, + org.eclipse.xtext.parser.assignments, + org.eclipse.xtext.parser.assignments.assignmentsTestLanguage, + org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.impl, + org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.util, + org.eclipse.xtext.parser.assignments.bug287184Test, + org.eclipse.xtext.parser.assignments.bug287184Test.impl, + org.eclipse.xtext.parser.assignments.bug287184Test.util, + org.eclipse.xtext.parser.assignments.bug288432Test, + org.eclipse.xtext.parser.assignments.bug288432Test.impl, + org.eclipse.xtext.parser.assignments.bug288432Test.util, + org.eclipse.xtext.parser.assignments.parser.antlr, + org.eclipse.xtext.parser.assignments.parser.antlr.internal, + org.eclipse.xtext.parser.assignments.serializer, + org.eclipse.xtext.parser.assignments.services, + org.eclipse.xtext.parser.bug419429, + org.eclipse.xtext.parser.bug419429.parser.antlr, + org.eclipse.xtext.parser.bug419429.parser.antlr.internal, + org.eclipse.xtext.parser.bug419429.serializer, + org.eclipse.xtext.parser.bug419429.services, + org.eclipse.xtext.parser.datatyperules, + org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage, + org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.impl, + org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.util, + org.eclipse.xtext.parser.datatyperules.parser.antlr, + org.eclipse.xtext.parser.datatyperules.parser.antlr.internal, + org.eclipse.xtext.parser.datatyperules.serializer, + org.eclipse.xtext.parser.datatyperules.services, + org.eclipse.xtext.parser.encoding, + org.eclipse.xtext.parser.encoding.encodingTest, + org.eclipse.xtext.parser.encoding.encodingTest.impl, + org.eclipse.xtext.parser.encoding.encodingTest.util, + org.eclipse.xtext.parser.encoding.parser.antlr, + org.eclipse.xtext.parser.encoding.parser.antlr.internal, + org.eclipse.xtext.parser.encoding.serializer, + org.eclipse.xtext.parser.encoding.services, + org.eclipse.xtext.parser.epatch, + org.eclipse.xtext.parser.epatch.epatchTestLanguage, + org.eclipse.xtext.parser.epatch.epatchTestLanguage.impl, + org.eclipse.xtext.parser.epatch.epatchTestLanguage.util, + org.eclipse.xtext.parser.epatch.parser.antlr, + org.eclipse.xtext.parser.epatch.parser.antlr.internal, + org.eclipse.xtext.parser.epatch.serializer, + org.eclipse.xtext.parser.epatch.services, + org.eclipse.xtext.parser.fragments, + org.eclipse.xtext.parser.fragments.fragmentTestLanguage, + org.eclipse.xtext.parser.fragments.fragmentTestLanguage.impl, + org.eclipse.xtext.parser.fragments.fragmentTestLanguage.util, + org.eclipse.xtext.parser.fragments.parser.antlr, + org.eclipse.xtext.parser.fragments.parser.antlr.internal, + org.eclipse.xtext.parser.fragments.serializer, + org.eclipse.xtext.parser.fragments.services, + org.eclipse.xtext.parser.fragments.tests;x-internal=true, + org.eclipse.xtext.parser.indentation, + org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage, + org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.impl, + org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.util, + org.eclipse.xtext.parser.indentation.parser.antlr, + org.eclipse.xtext.parser.indentation.parser.antlr.internal, + org.eclipse.xtext.parser.indentation.parser.antlr.lexer, + org.eclipse.xtext.parser.indentation.serializer, + org.eclipse.xtext.parser.indentation.services, + org.eclipse.xtext.parser.indentation.tests;x-internal=true, + org.eclipse.xtext.parser.keywords, + org.eclipse.xtext.parser.keywords.keywordsTestLanguage, + org.eclipse.xtext.parser.keywords.keywordsTestLanguage.impl, + org.eclipse.xtext.parser.keywords.keywordsTestLanguage.util, + org.eclipse.xtext.parser.keywords.parser.antlr, + org.eclipse.xtext.parser.keywords.parser.antlr.internal, + org.eclipse.xtext.parser.keywords.serializer, + org.eclipse.xtext.parser.keywords.services, + org.eclipse.xtext.parser.parameters, + org.eclipse.xtext.parser.parameters.parametersTestLanguage, + org.eclipse.xtext.parser.parameters.parametersTestLanguage.impl, + org.eclipse.xtext.parser.parameters.parametersTestLanguage.util, + org.eclipse.xtext.parser.parameters.parser.antlr, + org.eclipse.xtext.parser.parameters.parser.antlr.internal, + org.eclipse.xtext.parser.parameters.serializer, + org.eclipse.xtext.parser.parameters.services, + org.eclipse.xtext.parser.parameters.tests;x-internal=true, + org.eclipse.xtext.parser.terminalrules, + org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage, + org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage.impl, + org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage.util, + org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage, + org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage.impl, + org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage.util, + org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage, + org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.impl, + org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.util, + org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage, + org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.impl, + org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.util, + org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage, + org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.impl, + org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.util, + org.eclipse.xtext.parser.terminalrules.parser.antlr, + org.eclipse.xtext.parser.terminalrules.parser.antlr.internal, + org.eclipse.xtext.parser.terminalrules.serializer, + org.eclipse.xtext.parser.terminalrules.services, + org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage, + org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage.impl, + org.eclipse.xtext.parser.terminalrules.terminalRulesTestLanguage.util, + org.eclipse.xtext.parser.terminalrules.unicode, + org.eclipse.xtext.parser.terminalrules.unicode.impl, + org.eclipse.xtext.parser.terminalrules.unicode.util, + org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage, + org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.impl, + org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.util, + org.eclipse.xtext.parser.unorderedGroups, + org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage, + org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.impl, + org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.util, + org.eclipse.xtext.parser.unorderedGroups.parser.antlr, + org.eclipse.xtext.parser.unorderedGroups.parser.antlr.internal, + org.eclipse.xtext.parser.unorderedGroups.serializer, + org.eclipse.xtext.parser.unorderedGroups.services, + org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage, + org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.impl, + org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.util, + org.eclipse.xtext.parsetree.formatter, + org.eclipse.xtext.parsetree.formatter.formattertestlanguage, + org.eclipse.xtext.parsetree.formatter.formattertestlanguage.impl, + org.eclipse.xtext.parsetree.formatter.formattertestlanguage.util, + org.eclipse.xtext.parsetree.formatter.parser.antlr, + org.eclipse.xtext.parsetree.formatter.parser.antlr.internal, + org.eclipse.xtext.parsetree.formatter.serializer, + org.eclipse.xtext.parsetree.formatter.services, + org.eclipse.xtext.parsetree.impl, + org.eclipse.xtext.parsetree.impl.bug305397, + org.eclipse.xtext.parsetree.impl.bug305397.impl, + org.eclipse.xtext.parsetree.impl.bug305397.util, + org.eclipse.xtext.parsetree.impl.commentAssociation, + org.eclipse.xtext.parsetree.impl.commentAssociation.impl, + org.eclipse.xtext.parsetree.impl.commentAssociation.util, + org.eclipse.xtext.parsetree.impl.parser.antlr, + org.eclipse.xtext.parsetree.impl.parser.antlr.internal, + org.eclipse.xtext.parsetree.impl.serializer, + org.eclipse.xtext.parsetree.impl.services, + org.eclipse.xtext.parsetree.reconstr, + org.eclipse.xtext.parsetree.reconstr.bug299395, + org.eclipse.xtext.parsetree.reconstr.bug299395.impl, + org.eclipse.xtext.parsetree.reconstr.bug299395.util, + org.eclipse.xtext.parsetree.reconstr.bug302128, + org.eclipse.xtext.parsetree.reconstr.bug302128.impl, + org.eclipse.xtext.parsetree.reconstr.bug302128.util, + org.eclipse.xtext.parsetree.reconstr.complexrewritetest, + org.eclipse.xtext.parsetree.reconstr.complexrewritetest.impl, + org.eclipse.xtext.parsetree.reconstr.complexrewritetest.util, + org.eclipse.xtext.parsetree.reconstr.parser.antlr, + org.eclipse.xtext.parsetree.reconstr.parser.antlr.internal, + org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage, + org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.impl, + org.eclipse.xtext.parsetree.reconstr.serializationBug269362TestLanguage.util, + org.eclipse.xtext.parsetree.reconstr.serializationerror, + org.eclipse.xtext.parsetree.reconstr.serializationerror.impl, + org.eclipse.xtext.parsetree.reconstr.serializationerror.util, + org.eclipse.xtext.parsetree.reconstr.serializer, + org.eclipse.xtext.parsetree.reconstr.services, + org.eclipse.xtext.parsetree.transientvalues, + org.eclipse.xtext.parsetree.transientvalues.parser.antlr, + org.eclipse.xtext.parsetree.transientvalues.parser.antlr.internal, + org.eclipse.xtext.parsetree.transientvalues.serializer, + org.eclipse.xtext.parsetree.transientvalues.services, + org.eclipse.xtext.parsetree.transientvalues.transientvaluestest, + org.eclipse.xtext.parsetree.transientvalues.transientvaluestest.impl, + org.eclipse.xtext.parsetree.transientvalues.transientvaluestest.util, + org.eclipse.xtext.parsetree.unassignedtext, + org.eclipse.xtext.parsetree.unassignedtext.parser.antlr, + org.eclipse.xtext.parsetree.unassignedtext.parser.antlr.internal, + org.eclipse.xtext.parsetree.unassignedtext.serializer, + org.eclipse.xtext.parsetree.unassignedtext.services, + org.eclipse.xtext.parsetree.unassignedtext.unassignedtext, + org.eclipse.xtext.parsetree.unassignedtext.unassignedtext.impl, + org.eclipse.xtext.parsetree.unassignedtext.unassignedtext.util, + org.eclipse.xtext.resource, + org.eclipse.xtext.resource.bug385636, + org.eclipse.xtext.resource.bug385636.impl, + org.eclipse.xtext.resource.bug385636.util, + org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage, + org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.impl, + org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.util, + org.eclipse.xtext.resource.liveContainerBuilderIntegerationTestLanguage, + org.eclipse.xtext.resource.liveContainerBuilderIntegerationTestLanguage.impl, + org.eclipse.xtext.resource.liveContainerBuilderIntegerationTestLanguage.util, + org.eclipse.xtext.resource.liveContainerTestLanguage, + org.eclipse.xtext.resource.liveContainerTestLanguage.impl, + org.eclipse.xtext.resource.liveContainerTestLanguage.util, + org.eclipse.xtext.resource.locationprovidertest, + org.eclipse.xtext.resource.locationprovidertest.impl, + org.eclipse.xtext.resource.locationprovidertest.util, + org.eclipse.xtext.resource.parser.antlr, + org.eclipse.xtext.resource.parser.antlr.internal, + org.eclipse.xtext.resource.serializer, + org.eclipse.xtext.resource.services, + org.eclipse.xtext.serializer, + org.eclipse.xtext.serializer.assignmentFinderTest, + org.eclipse.xtext.serializer.assignmentFinderTest.impl, + org.eclipse.xtext.serializer.assignmentFinderTest.util, + org.eclipse.xtext.serializer.contextFinderTest, + org.eclipse.xtext.serializer.contextFinderTest.impl, + org.eclipse.xtext.serializer.contextFinderTest.util, + org.eclipse.xtext.serializer.hiddentokensequencertest, + org.eclipse.xtext.serializer.hiddentokensequencertest.impl, + org.eclipse.xtext.serializer.hiddentokensequencertest.util, + org.eclipse.xtext.serializer.parser.antlr, + org.eclipse.xtext.serializer.parser.antlr.internal, + org.eclipse.xtext.serializer.sequencertest, + org.eclipse.xtext.serializer.sequencertest.impl, + org.eclipse.xtext.serializer.sequencertest.util, + org.eclipse.xtext.serializer.serializer, + org.eclipse.xtext.serializer.services, + org.eclipse.xtext.serializer.syntacticsequencertest, + org.eclipse.xtext.serializer.syntacticsequencertest.impl, + org.eclipse.xtext.serializer.syntacticsequencertest.util, + org.eclipse.xtext.serializer.tests;x-internal=true, + org.eclipse.xtext.services, + org.eclipse.xtext.testlanguages, + org.eclipse.xtext.testlanguages.actionLang, + org.eclipse.xtext.testlanguages.actionLang.impl, + org.eclipse.xtext.testlanguages.actionLang.util, + org.eclipse.xtext.testlanguages.actionLang2, + org.eclipse.xtext.testlanguages.actionLang2.impl, + org.eclipse.xtext.testlanguages.actionLang2.util, + org.eclipse.xtext.testlanguages.fowlerdsl, + org.eclipse.xtext.testlanguages.fowlerdsl.impl, + org.eclipse.xtext.testlanguages.fowlerdsl.util, + org.eclipse.xtext.testlanguages.indent, + org.eclipse.xtext.testlanguages.indent.indentLang, + org.eclipse.xtext.testlanguages.indent.indentLang.impl, + org.eclipse.xtext.testlanguages.indent.indentLang.util, + org.eclipse.xtext.testlanguages.indent.parser.antlr, + org.eclipse.xtext.testlanguages.indent.parser.antlr.internal, + org.eclipse.xtext.testlanguages.indent.serializer, + org.eclipse.xtext.testlanguages.indent.services, + org.eclipse.xtext.testlanguages.lookaheadLang, + org.eclipse.xtext.testlanguages.lookaheadLang.impl, + org.eclipse.xtext.testlanguages.lookaheadLang.util, + org.eclipse.xtext.testlanguages.optionalEmpty, + org.eclipse.xtext.testlanguages.optionalEmpty.impl, + org.eclipse.xtext.testlanguages.optionalEmpty.util, + org.eclipse.xtext.testlanguages.parser.antlr, + org.eclipse.xtext.testlanguages.parser.antlr.internal, + org.eclipse.xtext.testlanguages.partialParserTestLanguage, + org.eclipse.xtext.testlanguages.partialParserTestLanguage.impl, + org.eclipse.xtext.testlanguages.partialParserTestLanguage.util, + org.eclipse.xtext.testlanguages.referenceGrammar, + org.eclipse.xtext.testlanguages.referenceGrammar.impl, + org.eclipse.xtext.testlanguages.referenceGrammar.util, + org.eclipse.xtext.testlanguages.serializer, + org.eclipse.xtext.testlanguages.services, + org.eclipse.xtext.testlanguages.simpleExpressions, + org.eclipse.xtext.testlanguages.simpleExpressions.impl, + org.eclipse.xtext.testlanguages.simpleExpressions.util, + org.eclipse.xtext.testlanguages.testLang, + org.eclipse.xtext.testlanguages.testLang.impl, + org.eclipse.xtext.testlanguages.testLang.util, + org.eclipse.xtext.testlanguages.treeTestLanguage, + org.eclipse.xtext.testlanguages.treeTestLanguage.impl, + org.eclipse.xtext.testlanguages.treeTestLanguage.util, + org.eclipse.xtext.validation, + org.eclipse.xtext.validation.csvalidationtest, + org.eclipse.xtext.validation.csvalidationtest.impl, + org.eclipse.xtext.validation.csvalidationtest.util, + org.eclipse.xtext.validation.parser.antlr, + org.eclipse.xtext.validation.parser.antlr.internal, + org.eclipse.xtext.validation.serializer, + org.eclipse.xtext.validation.services, + org.eclipse.xtext.valueconverter, + org.eclipse.xtext.valueconverter.bug250313, + org.eclipse.xtext.valueconverter.bug250313.impl, + org.eclipse.xtext.valueconverter.bug250313.util, + org.eclipse.xtext.valueconverter.parser.antlr, + org.eclipse.xtext.valueconverter.parser.antlr.internal, + org.eclipse.xtext.valueconverter.qualifiedName, + org.eclipse.xtext.valueconverter.qualifiedName.impl, + org.eclipse.xtext.valueconverter.qualifiedName.util, + org.eclipse.xtext.valueconverter.serializer, + org.eclipse.xtext.valueconverter.services, + org.eclipse.xtext.xtext.ecoreInference, + org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage, + org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.impl, + org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.util, + org.eclipse.xtext.xtext.ecoreInference.parser.antlr, + org.eclipse.xtext.xtext.ecoreInference.parser.antlr.internal, + org.eclipse.xtext.xtext.ecoreInference.serializer, + org.eclipse.xtext.xtext.ecoreInference.services, + org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage, + org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.impl, + org.eclipse.xtext.xtext.ecoreInference.unassignedRuleCallTestLanguage.util, + org.eclipse.xtext.xtextTest, + org.eclipse.xtext.xtextTest.impl, + org.eclipse.xtext.xtextTest.util +Require-Bundle: org.antlr.runtime, + org.eclipse.emf.common, + org.eclipse.emf.ecore, + org.eclipse.xtext, + org.eclipse.xtext.testing, + org.eclipse.xtext.util, + org.eclipse.xtext.xbase.lib +Import-Package: org.apache.log4j, + org.hamcrest.core, + org.junit.runner.manipulation;version="4.5.0", + org.junit.runner.notification;version="4.5.0", + org.junit.runner;version="4.5.0", + org.junit.runners.model;version="4.5.0", + org.junit.runners;version="4.5.0", + org.junit;version="4.5.0" diff --git a/org.eclipse.xtext.tests/build.gradle b/org.eclipse.xtext.tests/build.gradle index e02061c8f..252ce7ae6 100644 --- a/org.eclipse.xtext.tests/build.gradle +++ b/org.eclipse.xtext.tests/build.gradle @@ -14,6 +14,7 @@ dependencies { compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$versions.emfEcore" // From the 'lib' folder optional name: 'simple' + mwe2Runtime "org.eclipse.xtext:org.eclipse.xtext.common.types:$versions.xtext_bootstrap" mwe2Runtime "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$versions.emfMwe2" } diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java new file mode 100644 index 000000000..f9054c16d --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java @@ -0,0 +1,70 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage + * @generated + */ +public interface LazyLinkingFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + LazyLinkingFactory eINSTANCE = org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingFactoryImpl.init(); + + /** + * Returns a new object of class 'Model'. + * + * + * @return a new object of class 'Model'. + * @generated + */ + Model createModel(); + + /** + * Returns a new object of class 'Type'. + * + * + * @return a new object of class 'Type'. + * @generated + */ + Type createType(); + + /** + * Returns a new object of class 'Property'. + * + * + * @return a new object of class 'Property'. + * @generated + */ + Property createProperty(); + + /** + * Returns a new object of class 'Unresolved Proxy Property'. + * + * + * @return a new object of class 'Unresolved Proxy Property'. + * @generated + */ + UnresolvedProxyProperty createUnresolvedProxyProperty(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + LazyLinkingPackage getLazyLinkingPackage(); + +} //LazyLinkingFactory diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java new file mode 100644 index 000000000..71f986542 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java @@ -0,0 +1,548 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory + * @model kind="package" + * @generated + */ +public interface LazyLinkingPackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "lazyLinking"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://eclipse.org/xtext/lazyLinkingTestLanguage"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "lazyLinking"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + LazyLinkingPackage eINSTANCE = org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl.init(); + + /** + * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl Model}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getModel() + * @generated + */ + int MODEL = 0; + + /** + * The feature id for the 'Types' containment reference list. + * + * + * @generated + * @ordered + */ + int MODEL__TYPES = 0; + + /** + * The number of structural features of the 'Model' class. + * + * + * @generated + * @ordered + */ + int MODEL_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl Type}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getType() + * @generated + */ + int TYPE = 1; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + int TYPE__NAME = 0; + + /** + * The feature id for the 'Extends' reference. + * + * + * @generated + * @ordered + */ + int TYPE__EXTENDS = 1; + + /** + * The feature id for the 'Parent Id' reference. + * + * + * @generated + * @ordered + */ + int TYPE__PARENT_ID = 2; + + /** + * The feature id for the 'Properties' containment reference list. + * + * + * @generated + * @ordered + */ + int TYPE__PROPERTIES = 3; + + /** + * The feature id for the 'Unresolved Proxy Property' containment reference list. + * + * + * @generated + * @ordered + */ + int TYPE__UNRESOLVED_PROXY_PROPERTY = 4; + + /** + * The feature id for the 'Subtypes' reference list. + * + * + * @generated + * @ordered + */ + int TYPE__SUBTYPES = 5; + + /** + * The number of structural features of the 'Type' class. + * + * + * @generated + * @ordered + */ + int TYPE_FEATURE_COUNT = 6; + + /** + * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl Property}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getProperty() + * @generated + */ + int PROPERTY = 2; + + /** + * The feature id for the 'Type' reference list. + * + * + * @generated + * @ordered + */ + int PROPERTY__TYPE = 0; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + int PROPERTY__NAME = 1; + + /** + * The number of structural features of the 'Property' class. + * + * + * @generated + * @ordered + */ + int PROPERTY_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl Unresolved Proxy Property}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getUnresolvedProxyProperty() + * @generated + */ + int UNRESOLVED_PROXY_PROPERTY = 3; + + /** + * The feature id for the 'Type' reference list. + * + * + * @generated + * @ordered + */ + int UNRESOLVED_PROXY_PROPERTY__TYPE = 0; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + int UNRESOLVED_PROXY_PROPERTY__NAME = 1; + + /** + * The number of structural features of the 'Unresolved Proxy Property' class. + * + * + * @generated + * @ordered + */ + int UNRESOLVED_PROXY_PROPERTY_FEATURE_COUNT = 2; + + + /** + * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model Model}'. + * + * + * @return the meta object for class 'Model'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model + * @generated + */ + EClass getModel(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes Types}'. + * + * + * @return the meta object for the containment reference list 'Types'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes() + * @see #getModel() + * @generated + */ + EReference getModel_Types(); + + /** + * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type Type}'. + * + * + * @return the meta object for class 'Type'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type + * @generated + */ + EClass getType(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}'. + * + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName() + * @see #getType() + * @generated + */ + EAttribute getType_Name(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}'. + * + * + * @return the meta object for the reference 'Extends'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends() + * @see #getType() + * @generated + */ + EReference getType_Extends(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}'. + * + * + * @return the meta object for the reference 'Parent Id'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId() + * @see #getType() + * @generated + */ + EReference getType_ParentId(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties Properties}'. + * + * + * @return the meta object for the containment reference list 'Properties'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties() + * @see #getType() + * @generated + */ + EReference getType_Properties(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty Unresolved Proxy Property}'. + * + * + * @return the meta object for the containment reference list 'Unresolved Proxy Property'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty() + * @see #getType() + * @generated + */ + EReference getType_UnresolvedProxyProperty(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}'. + * + * + * @return the meta object for the reference list 'Subtypes'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes() + * @see #getType() + * @generated + */ + EReference getType_Subtypes(); + + /** + * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property Property}'. + * + * + * @return the meta object for class 'Property'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property + * @generated + */ + EClass getProperty(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType Type}'. + * + * + * @return the meta object for the reference list 'Type'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType() + * @see #getProperty() + * @generated + */ + EReference getProperty_Type(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}'. + * + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName() + * @see #getProperty() + * @generated + */ + EAttribute getProperty_Name(); + + /** + * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty Unresolved Proxy Property}'. + * + * + * @return the meta object for class 'Unresolved Proxy Property'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty + * @generated + */ + EClass getUnresolvedProxyProperty(); + + /** + * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType Type}'. + * + * + * @return the meta object for the reference list 'Type'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType() + * @see #getUnresolvedProxyProperty() + * @generated + */ + EReference getUnresolvedProxyProperty_Type(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}'. + * + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName() + * @see #getUnresolvedProxyProperty() + * @generated + */ + EAttribute getUnresolvedProxyProperty_Name(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + LazyLinkingFactory getLazyLinkingFactory(); + + /** + * + * Defines literals for the meta objects that represent + * + * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl Model}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getModel() + * @generated + */ + EClass MODEL = eINSTANCE.getModel(); + + /** + * The meta object literal for the 'Types' containment reference list feature. + * + * + * @generated + */ + EReference MODEL__TYPES = eINSTANCE.getModel_Types(); + + /** + * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl Type}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getType() + * @generated + */ + EClass TYPE = eINSTANCE.getType(); + + /** + * The meta object literal for the 'Name' attribute feature. + * + * + * @generated + */ + EAttribute TYPE__NAME = eINSTANCE.getType_Name(); + + /** + * The meta object literal for the 'Extends' reference feature. + * + * + * @generated + */ + EReference TYPE__EXTENDS = eINSTANCE.getType_Extends(); + + /** + * The meta object literal for the 'Parent Id' reference feature. + * + * + * @generated + */ + EReference TYPE__PARENT_ID = eINSTANCE.getType_ParentId(); + + /** + * The meta object literal for the 'Properties' containment reference list feature. + * + * + * @generated + */ + EReference TYPE__PROPERTIES = eINSTANCE.getType_Properties(); + + /** + * The meta object literal for the 'Unresolved Proxy Property' containment reference list feature. + * + * + * @generated + */ + EReference TYPE__UNRESOLVED_PROXY_PROPERTY = eINSTANCE.getType_UnresolvedProxyProperty(); + + /** + * The meta object literal for the 'Subtypes' reference list feature. + * + * + * @generated + */ + EReference TYPE__SUBTYPES = eINSTANCE.getType_Subtypes(); + + /** + * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl Property}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getProperty() + * @generated + */ + EClass PROPERTY = eINSTANCE.getProperty(); + + /** + * The meta object literal for the 'Type' reference list feature. + * + * + * @generated + */ + EReference PROPERTY__TYPE = eINSTANCE.getProperty_Type(); + + /** + * The meta object literal for the 'Name' attribute feature. + * + * + * @generated + */ + EAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name(); + + /** + * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl Unresolved Proxy Property}' class. + * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl + * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getUnresolvedProxyProperty() + * @generated + */ + EClass UNRESOLVED_PROXY_PROPERTY = eINSTANCE.getUnresolvedProxyProperty(); + + /** + * The meta object literal for the 'Type' reference list feature. + * + * + * @generated + */ + EReference UNRESOLVED_PROXY_PROPERTY__TYPE = eINSTANCE.getUnresolvedProxyProperty_Type(); + + /** + * The meta object literal for the 'Name' attribute feature. + * + * + * @generated + */ + EAttribute UNRESOLVED_PROXY_PROPERTY__NAME = eINSTANCE.getUnresolvedProxyProperty_Name(); + + } + +} //LazyLinkingPackage diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java new file mode 100644 index 000000000..b8245fb93 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java @@ -0,0 +1,43 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Model'. + * + * + *

+ * The following features are supported: + *

+ * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getModel() + * @model + * @generated + */ +public interface Model extends EObject { + /** + * Returns the value of the 'Types' containment reference list. + * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. + * + *

+ * If the meaning of the 'Types' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Types' containment reference list. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getModel_Types() + * @model containment="true" + * @generated + */ + EList getTypes(); + +} // Model diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java new file mode 100644 index 000000000..8daee6bf3 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java @@ -0,0 +1,70 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Property'. + * + * + *

+ * The following features are supported: + *

+ * + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty() + * @model + * @generated + */ +public interface Property extends EObject { + /** + * Returns the value of the 'Type' reference list. + * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. + * + *

+ * If the meaning of the 'Type' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Type' reference list. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty_Type() + * @model + * @generated + */ + EList getType(); + + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty_Name() + * @model + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + +} // Property diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java new file mode 100644 index 000000000..5a3f165a5 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java @@ -0,0 +1,162 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Type'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties Properties}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty Unresolved Proxy Property}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}
    • + *
+ * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType() + * @model + * @generated + */ +public interface Type extends EObject { + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Name() + * @model + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the 'Extends' reference. + * It is bidirectional and its opposite is '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}'. + * + *

+ * If the meaning of the 'Extends' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Extends' reference. + * @see #setExtends(Type) + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Extends() + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes + * @model opposite="subtypes" + * @generated + */ + Type getExtends(); + + /** + * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}' reference. + * + * + * @param value the new value of the 'Extends' reference. + * @see #getExtends() + * @generated + */ + void setExtends(Type value); + + /** + * Returns the value of the 'Parent Id' reference. + * + *

+ * If the meaning of the 'Parent Id' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Parent Id' reference. + * @see #setParentId(Property) + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_ParentId() + * @model + * @generated + */ + Property getParentId(); + + /** + * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}' reference. + * + * + * @param value the new value of the 'Parent Id' reference. + * @see #getParentId() + * @generated + */ + void setParentId(Property value); + + /** + * Returns the value of the 'Properties' containment reference list. + * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Property}. + * + *

+ * If the meaning of the 'Properties' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Properties' containment reference list. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Properties() + * @model containment="true" + * @generated + */ + EList getProperties(); + + /** + * Returns the value of the 'Unresolved Proxy Property' containment reference list. + * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty}. + * + *

+ * If the meaning of the 'Unresolved Proxy Property' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Unresolved Proxy Property' containment reference list. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_UnresolvedProxyProperty() + * @model containment="true" + * @generated + */ + EList getUnresolvedProxyProperty(); + + /** + * Returns the value of the 'Subtypes' reference list. + * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. + * It is bidirectional and its opposite is '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}'. + * + *

+ * If the meaning of the 'Subtypes' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Subtypes' reference list. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Subtypes() + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends + * @model opposite="extends" + * @generated + */ + EList getSubtypes(); + +} // Type diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java new file mode 100644 index 000000000..31f589dce --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java @@ -0,0 +1,70 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Unresolved Proxy Property'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType Type}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}
    • + *
+ * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty() + * @model + * @generated + */ +public interface UnresolvedProxyProperty extends EObject { + /** + * Returns the value of the 'Type' reference list. + * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. + * + *

+ * If the meaning of the 'Type' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Type' reference list. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty_Type() + * @model resolveProxies="false" + * @generated + */ + EList getType(); + + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty_Name() + * @model + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + +} // UnresolvedProxyProperty diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java new file mode 100644 index 000000000..051f541b1 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java @@ -0,0 +1,129 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.impl; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +import org.eclipse.xtext.linking.lazy.lazyLinking.*; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class LazyLinkingFactoryImpl extends EFactoryImpl implements LazyLinkingFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static LazyLinkingFactory init() { + try { + LazyLinkingFactory theLazyLinkingFactory = (LazyLinkingFactory)EPackage.Registry.INSTANCE.getEFactory(LazyLinkingPackage.eNS_URI); + if (theLazyLinkingFactory != null) { + return theLazyLinkingFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new LazyLinkingFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public LazyLinkingFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case LazyLinkingPackage.MODEL: return createModel(); + case LazyLinkingPackage.TYPE: return createType(); + case LazyLinkingPackage.PROPERTY: return createProperty(); + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY: return createUnresolvedProxyProperty(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public Model createModel() { + ModelImpl model = new ModelImpl(); + return model; + } + + /** + * + * + * @generated + */ + public Type createType() { + TypeImpl type = new TypeImpl(); + return type; + } + + /** + * + * + * @generated + */ + public Property createProperty() { + PropertyImpl property = new PropertyImpl(); + return property; + } + + /** + * + * + * @generated + */ + public UnresolvedProxyProperty createUnresolvedProxyProperty() { + UnresolvedProxyPropertyImpl unresolvedProxyProperty = new UnresolvedProxyPropertyImpl(); + return unresolvedProxyProperty; + } + + /** + * + * + * @generated + */ + public LazyLinkingPackage getLazyLinkingPackage() { + return (LazyLinkingPackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static LazyLinkingPackage getPackage() { + return LazyLinkingPackage.eINSTANCE; + } + +} //LazyLinkingFactoryImpl diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java new file mode 100644 index 000000000..3d94767e2 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java @@ -0,0 +1,359 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.impl; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EcorePackage; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory; +import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; +import org.eclipse.xtext.linking.lazy.lazyLinking.Model; +import org.eclipse.xtext.linking.lazy.lazyLinking.Property; +import org.eclipse.xtext.linking.lazy.lazyLinking.Type; +import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class LazyLinkingPackageImpl extends EPackageImpl implements LazyLinkingPackage { + /** + * + * + * @generated + */ + private EClass modelEClass = null; + + /** + * + * + * @generated + */ + private EClass typeEClass = null; + + /** + * + * + * @generated + */ + private EClass propertyEClass = null; + + /** + * + * + * @generated + */ + private EClass unresolvedProxyPropertyEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#eNS_URI + * @see #init() + * @generated + */ + private LazyLinkingPackageImpl() { + super(eNS_URI, LazyLinkingFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link LazyLinkingPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static LazyLinkingPackage init() { + if (isInited) return (LazyLinkingPackage)EPackage.Registry.INSTANCE.getEPackage(LazyLinkingPackage.eNS_URI); + + // Obtain or create and register package + LazyLinkingPackageImpl theLazyLinkingPackage = (LazyLinkingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LazyLinkingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LazyLinkingPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theLazyLinkingPackage.createPackageContents(); + + // Initialize created meta-data + theLazyLinkingPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theLazyLinkingPackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(LazyLinkingPackage.eNS_URI, theLazyLinkingPackage); + return theLazyLinkingPackage; + } + + /** + * + * + * @generated + */ + public EClass getModel() { + return modelEClass; + } + + /** + * + * + * @generated + */ + public EReference getModel_Types() { + return (EReference)modelEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getType() { + return typeEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getType_Name() { + return (EAttribute)typeEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getType_Extends() { + return (EReference)typeEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getType_ParentId() { + return (EReference)typeEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EReference getType_Properties() { + return (EReference)typeEClass.getEStructuralFeatures().get(3); + } + + /** + * + * + * @generated + */ + public EReference getType_UnresolvedProxyProperty() { + return (EReference)typeEClass.getEStructuralFeatures().get(4); + } + + /** + * + * + * @generated + */ + public EReference getType_Subtypes() { + return (EReference)typeEClass.getEStructuralFeatures().get(5); + } + + /** + * + * + * @generated + */ + public EClass getProperty() { + return propertyEClass; + } + + /** + * + * + * @generated + */ + public EReference getProperty_Type() { + return (EReference)propertyEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EAttribute getProperty_Name() { + return (EAttribute)propertyEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EClass getUnresolvedProxyProperty() { + return unresolvedProxyPropertyEClass; + } + + /** + * + * + * @generated + */ + public EReference getUnresolvedProxyProperty_Type() { + return (EReference)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EAttribute getUnresolvedProxyProperty_Name() { + return (EAttribute)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public LazyLinkingFactory getLazyLinkingFactory() { + return (LazyLinkingFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + modelEClass = createEClass(MODEL); + createEReference(modelEClass, MODEL__TYPES); + + typeEClass = createEClass(TYPE); + createEAttribute(typeEClass, TYPE__NAME); + createEReference(typeEClass, TYPE__EXTENDS); + createEReference(typeEClass, TYPE__PARENT_ID); + createEReference(typeEClass, TYPE__PROPERTIES); + createEReference(typeEClass, TYPE__UNRESOLVED_PROXY_PROPERTY); + createEReference(typeEClass, TYPE__SUBTYPES); + + propertyEClass = createEClass(PROPERTY); + createEReference(propertyEClass, PROPERTY__TYPE); + createEAttribute(propertyEClass, PROPERTY__NAME); + + unresolvedProxyPropertyEClass = createEClass(UNRESOLVED_PROXY_PROPERTY); + createEReference(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__TYPE); + createEAttribute(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__NAME); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getModel_Types(), this.getType(), null, "types", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(typeEClass, Type.class, "Type", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getType_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getType_Extends(), this.getType(), this.getType_Subtypes(), "extends", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getType_ParentId(), this.getProperty(), null, "parentId", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getType_Properties(), this.getProperty(), null, "properties", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getType_UnresolvedProxyProperty(), this.getUnresolvedProxyProperty(), null, "unresolvedProxyProperty", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getType_Subtypes(), this.getType(), this.getType_Extends(), "subtypes", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(propertyEClass, Property.class, "Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getProperty_Type(), this.getType(), null, "type", null, 0, -1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(unresolvedProxyPropertyEClass, UnresolvedProxyProperty.class, "UnresolvedProxyProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getUnresolvedProxyProperty_Type(), this.getType(), null, "type", null, 0, -1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getUnresolvedProxyProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + } + +} //LazyLinkingPackageImpl diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java new file mode 100644 index 000000000..c01920824 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java @@ -0,0 +1,153 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; +import org.eclipse.xtext.linking.lazy.lazyLinking.Model; +import org.eclipse.xtext.linking.lazy.lazyLinking.Type; + +/** + * + * An implementation of the model object 'Model'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl#getTypes Types}
    • + *
+ * + * @generated + */ +public class ModelImpl extends MinimalEObjectImpl.Container implements Model { + /** + * The cached value of the '{@link #getTypes() Types}' containment reference list. + * + * + * @see #getTypes() + * @generated + * @ordered + */ + protected EList types; + + /** + * + * + * @generated + */ + protected ModelImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LazyLinkingPackage.Literals.MODEL; + } + + /** + * + * + * @generated + */ + public EList getTypes() { + if (types == null) { + types = new EObjectContainmentEList(Type.class, this, LazyLinkingPackage.MODEL__TYPES); + } + return types; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case LazyLinkingPackage.MODEL__TYPES: + return ((InternalEList)getTypes()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LazyLinkingPackage.MODEL__TYPES: + return getTypes(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LazyLinkingPackage.MODEL__TYPES: + getTypes().clear(); + getTypes().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LazyLinkingPackage.MODEL__TYPES: + getTypes().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LazyLinkingPackage.MODEL__TYPES: + return types != null && !types.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //ModelImpl diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java new file mode 100644 index 000000000..bf1ded9a0 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java @@ -0,0 +1,206 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectResolvingEList; + +import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; +import org.eclipse.xtext.linking.lazy.lazyLinking.Property; +import org.eclipse.xtext.linking.lazy.lazyLinking.Type; + +/** + * + * An implementation of the model object 'Property'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getType Type}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getName Name}
    • + *
+ * + * @generated + */ +public class PropertyImpl extends MinimalEObjectImpl.Container implements Property { + /** + * The cached value of the '{@link #getType() Type}' reference list. + * + * + * @see #getType() + * @generated + * @ordered + */ + protected EList type; + + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * + * + * @generated + */ + protected PropertyImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LazyLinkingPackage.Literals.PROPERTY; + } + + /** + * + * + * @generated + */ + public EList getType() { + if (type == null) { + type = new EObjectResolvingEList(Type.class, this, LazyLinkingPackage.PROPERTY__TYPE); + } + return type; + } + + /** + * + * + * @generated + */ + public String getName() { + return name; + } + + /** + * + * + * @generated + */ + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.PROPERTY__NAME, oldName, name)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LazyLinkingPackage.PROPERTY__TYPE: + return getType(); + case LazyLinkingPackage.PROPERTY__NAME: + return getName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LazyLinkingPackage.PROPERTY__TYPE: + getType().clear(); + getType().addAll((Collection)newValue); + return; + case LazyLinkingPackage.PROPERTY__NAME: + setName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LazyLinkingPackage.PROPERTY__TYPE: + getType().clear(); + return; + case LazyLinkingPackage.PROPERTY__NAME: + setName(NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LazyLinkingPackage.PROPERTY__TYPE: + return type != null && !type.isEmpty(); + case LazyLinkingPackage.PROPERTY__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(')'); + return result.toString(); + } + +} //PropertyImpl diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java new file mode 100644 index 000000000..ae3a9e753 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java @@ -0,0 +1,460 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; +import org.eclipse.xtext.linking.lazy.lazyLinking.Property; +import org.eclipse.xtext.linking.lazy.lazyLinking.Type; +import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty; + +/** + * + * An implementation of the model object 'Type'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getName Name}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getExtends Extends}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getParentId Parent Id}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getProperties Properties}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getUnresolvedProxyProperty Unresolved Proxy Property}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getSubtypes Subtypes}
    • + *
+ * + * @generated + */ +public class TypeImpl extends MinimalEObjectImpl.Container implements Type { + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The cached value of the '{@link #getExtends() Extends}' reference. + * + * + * @see #getExtends() + * @generated + * @ordered + */ + protected Type extends_; + + /** + * The cached value of the '{@link #getParentId() Parent Id}' reference. + * + * + * @see #getParentId() + * @generated + * @ordered + */ + protected Property parentId; + + /** + * The cached value of the '{@link #getProperties() Properties}' containment reference list. + * + * + * @see #getProperties() + * @generated + * @ordered + */ + protected EList properties; + + /** + * The cached value of the '{@link #getUnresolvedProxyProperty() Unresolved Proxy Property}' containment reference list. + * + * + * @see #getUnresolvedProxyProperty() + * @generated + * @ordered + */ + protected EList unresolvedProxyProperty; + + /** + * The cached value of the '{@link #getSubtypes() Subtypes}' reference list. + * + * + * @see #getSubtypes() + * @generated + * @ordered + */ + protected EList subtypes; + + /** + * + * + * @generated + */ + protected TypeImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LazyLinkingPackage.Literals.TYPE; + } + + /** + * + * + * @generated + */ + public String getName() { + return name; + } + + /** + * + * + * @generated + */ + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__NAME, oldName, name)); + } + + /** + * + * + * @generated + */ + public Type getExtends() { + if (extends_ != null && extends_.eIsProxy()) { + InternalEObject oldExtends = (InternalEObject)extends_; + extends_ = (Type)eResolveProxy(oldExtends); + if (extends_ != oldExtends) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, extends_)); + } + } + return extends_; + } + + /** + * + * + * @generated + */ + public Type basicGetExtends() { + return extends_; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetExtends(Type newExtends, NotificationChain msgs) { + Type oldExtends = extends_; + extends_ = newExtends; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, newExtends); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setExtends(Type newExtends) { + if (newExtends != extends_) { + NotificationChain msgs = null; + if (extends_ != null) + msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs); + if (newExtends != null) + msgs = ((InternalEObject)newExtends).eInverseAdd(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs); + msgs = basicSetExtends(newExtends, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, newExtends, newExtends)); + } + + /** + * + * + * @generated + */ + public Property getParentId() { + if (parentId != null && parentId.eIsProxy()) { + InternalEObject oldParentId = (InternalEObject)parentId; + parentId = (Property)eResolveProxy(oldParentId); + if (parentId != oldParentId) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId)); + } + } + return parentId; + } + + /** + * + * + * @generated + */ + public Property basicGetParentId() { + return parentId; + } + + /** + * + * + * @generated + */ + public void setParentId(Property newParentId) { + Property oldParentId = parentId; + parentId = newParentId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId)); + } + + /** + * + * + * @generated + */ + public EList getProperties() { + if (properties == null) { + properties = new EObjectContainmentEList(Property.class, this, LazyLinkingPackage.TYPE__PROPERTIES); + } + return properties; + } + + /** + * + * + * @generated + */ + public EList getUnresolvedProxyProperty() { + if (unresolvedProxyProperty == null) { + unresolvedProxyProperty = new EObjectContainmentEList(UnresolvedProxyProperty.class, this, LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY); + } + return unresolvedProxyProperty; + } + + /** + * + * + * @generated + */ + public EList getSubtypes() { + if (subtypes == null) { + subtypes = new EObjectWithInverseResolvingEList(Type.class, this, LazyLinkingPackage.TYPE__SUBTYPES, LazyLinkingPackage.TYPE__EXTENDS); + } + return subtypes; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case LazyLinkingPackage.TYPE__EXTENDS: + if (extends_ != null) + msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs); + return basicSetExtends((Type)otherEnd, msgs); + case LazyLinkingPackage.TYPE__SUBTYPES: + return ((InternalEList)(InternalEList)getSubtypes()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case LazyLinkingPackage.TYPE__EXTENDS: + return basicSetExtends(null, msgs); + case LazyLinkingPackage.TYPE__PROPERTIES: + return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs); + case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: + return ((InternalEList)getUnresolvedProxyProperty()).basicRemove(otherEnd, msgs); + case LazyLinkingPackage.TYPE__SUBTYPES: + return ((InternalEList)getSubtypes()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LazyLinkingPackage.TYPE__NAME: + return getName(); + case LazyLinkingPackage.TYPE__EXTENDS: + if (resolve) return getExtends(); + return basicGetExtends(); + case LazyLinkingPackage.TYPE__PARENT_ID: + if (resolve) return getParentId(); + return basicGetParentId(); + case LazyLinkingPackage.TYPE__PROPERTIES: + return getProperties(); + case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: + return getUnresolvedProxyProperty(); + case LazyLinkingPackage.TYPE__SUBTYPES: + return getSubtypes(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LazyLinkingPackage.TYPE__NAME: + setName((String)newValue); + return; + case LazyLinkingPackage.TYPE__EXTENDS: + setExtends((Type)newValue); + return; + case LazyLinkingPackage.TYPE__PARENT_ID: + setParentId((Property)newValue); + return; + case LazyLinkingPackage.TYPE__PROPERTIES: + getProperties().clear(); + getProperties().addAll((Collection)newValue); + return; + case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: + getUnresolvedProxyProperty().clear(); + getUnresolvedProxyProperty().addAll((Collection)newValue); + return; + case LazyLinkingPackage.TYPE__SUBTYPES: + getSubtypes().clear(); + getSubtypes().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LazyLinkingPackage.TYPE__NAME: + setName(NAME_EDEFAULT); + return; + case LazyLinkingPackage.TYPE__EXTENDS: + setExtends((Type)null); + return; + case LazyLinkingPackage.TYPE__PARENT_ID: + setParentId((Property)null); + return; + case LazyLinkingPackage.TYPE__PROPERTIES: + getProperties().clear(); + return; + case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: + getUnresolvedProxyProperty().clear(); + return; + case LazyLinkingPackage.TYPE__SUBTYPES: + getSubtypes().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LazyLinkingPackage.TYPE__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case LazyLinkingPackage.TYPE__EXTENDS: + return extends_ != null; + case LazyLinkingPackage.TYPE__PARENT_ID: + return parentId != null; + case LazyLinkingPackage.TYPE__PROPERTIES: + return properties != null && !properties.isEmpty(); + case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: + return unresolvedProxyProperty != null && !unresolvedProxyProperty.isEmpty(); + case LazyLinkingPackage.TYPE__SUBTYPES: + return subtypes != null && !subtypes.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(')'); + return result.toString(); + } + +} //TypeImpl diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java new file mode 100644 index 000000000..df82fbe44 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java @@ -0,0 +1,206 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectEList; + +import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; +import org.eclipse.xtext.linking.lazy.lazyLinking.Type; +import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty; + +/** + * + * An implementation of the model object 'Unresolved Proxy Property'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getType Type}
    • + *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getName Name}
    • + *
+ * + * @generated + */ +public class UnresolvedProxyPropertyImpl extends MinimalEObjectImpl.Container implements UnresolvedProxyProperty { + /** + * The cached value of the '{@link #getType() Type}' reference list. + * + * + * @see #getType() + * @generated + * @ordered + */ + protected EList type; + + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * + * + * @generated + */ + protected UnresolvedProxyPropertyImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LazyLinkingPackage.Literals.UNRESOLVED_PROXY_PROPERTY; + } + + /** + * + * + * @generated + */ + public EList getType() { + if (type == null) { + type = new EObjectEList(Type.class, this, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE); + } + return type; + } + + /** + * + * + * @generated + */ + public String getName() { + return name; + } + + /** + * + * + * @generated + */ + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME, oldName, name)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: + return getType(); + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: + return getName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: + getType().clear(); + getType().addAll((Collection)newValue); + return; + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: + setName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: + getType().clear(); + return; + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: + setName(NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: + return type != null && !type.isEmpty(); + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(')'); + return result.toString(); + } + +} //UnresolvedProxyPropertyImpl diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java new file mode 100644 index 000000000..a38409a82 --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java @@ -0,0 +1,175 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.util; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +import org.eclipse.xtext.linking.lazy.lazyLinking.*; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage + * @generated + */ +public class LazyLinkingAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static LazyLinkingPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public LazyLinkingAdapterFactory() { + if (modelPackage == null) { + modelPackage = LazyLinkingPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected LazyLinkingSwitch modelSwitch = + new LazyLinkingSwitch() { + @Override + public Adapter caseModel(Model object) { + return createModelAdapter(); + } + @Override + public Adapter caseType(Type object) { + return createTypeAdapter(); + } + @Override + public Adapter caseProperty(Property object) { + return createPropertyAdapter(); + } + @Override + public Adapter caseUnresolvedProxyProperty(UnresolvedProxyProperty object) { + return createUnresolvedProxyPropertyAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model Model}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model + * @generated + */ + public Adapter createModelAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type Type}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type + * @generated + */ + public Adapter createTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property Property}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property + * @generated + */ + public Adapter createPropertyAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty Unresolved Proxy Property}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty + * @generated + */ + public Adapter createUnresolvedProxyPropertyAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //LazyLinkingAdapterFactory diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java new file mode 100644 index 000000000..2d2f425eb --- /dev/null +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java @@ -0,0 +1,174 @@ +/** + * generated by Xtext + */ +package org.eclipse.xtext.linking.lazy.lazyLinking.util; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +import org.eclipse.xtext.linking.lazy.lazyLinking.*; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage + * @generated + */ +public class LazyLinkingSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static LazyLinkingPackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public LazyLinkingSwitch() { + if (modelPackage == null) { + modelPackage = LazyLinkingPackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case LazyLinkingPackage.MODEL: { + Model model = (Model)theEObject; + T result = caseModel(model); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LazyLinkingPackage.TYPE: { + Type type = (Type)theEObject; + T result = caseType(type); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LazyLinkingPackage.PROPERTY: { + Property property = (Property)theEObject; + T result = caseProperty(property); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY: { + UnresolvedProxyProperty unresolvedProxyProperty = (UnresolvedProxyProperty)theEObject; + T result = caseUnresolvedProxyProperty(unresolvedProxyProperty); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Model'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Model'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseModel(Model object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Type'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Type'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseType(Type object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Property'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Property'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseProperty(Property object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Unresolved Proxy Property'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Unresolved Proxy Property'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseUnresolvedProxyProperty(UnresolvedProxyProperty object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T defaultCase(EObject object) { + return null; + } + +} //LazyLinkingSwitch diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xtextbin index 9999d247186e557060f48231be400b7b6276aed8..401724702adc67c802400524750668948b2499b6 100644 GIT binary patch delta 53 zcmccOc*SvpB?k{DXIfEWdTwf72_x5LSB`_sjGUXNv6Oi)ZcV`DuQ^Xv& E0HW3ng8%>k delta 53 zcmccOc*SvpB?k`&XIfEWdTwf72_xrbSB`_sj2xTUdDIz!ls>Nv6Oi)ZcV`DuQ^Xv& E0HQ?=eEi@KIocC5HtoPhwtPeo10UW`15VlS4J50JkGtfQdCPF*lXdzbv(=C^IFM5eytk I7@3$E0jZ4=WB>pF delta 19 Ycmew;a718(B?mVn2so55GBGm(05f(2k^lez 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 803b98cdb..ac9e2bfc4 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 @@ -63,7 +63,7 @@ public class SubTestLanguageGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1); private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0); - //AnotherSuperMain: + //@ Override AnotherSuperMain: // "ups" name=ID; @Override public ParserRule getRule() { return rule; } @@ -142,7 +142,7 @@ public class SubTestLanguageGrammarAccess extends AbstractGrammarElementFinder { return getSubMainAccess().getRule(); } - //AnotherSuperMain: + //@ Override AnotherSuperMain: // "ups" name=ID; public AnotherSuperMainElements getAnotherSuperMainAccess() { return pAnotherSuperMain; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtextbin index 1ecae9192bd0d63c0c545ac3e2a3493ab1cb0ba8..7e70f5e2c1dd38c86540d11f1d4ffcdd5c9c9e3e 100644 GIT binary patch delta 519 zcmZ9|%SyvQ6b9g)GfmTKTS3v4pn|$kFq^s(@f7S%QMwVKo6!tdNE1k-2wtkz`>krM z_v;(@Og@Q|F_zZZ&E%4wlpv?fMmcfbT(Cqbek^ zCv^FeCFZ$X7H)pk5{&jkxgfCvg&j&PE-X zoi-t73OQGaycOa0H>isi>QYh@fkZXG5Fe~u{Z*7fu9a~U7-HQMwkgc8l@BSz5iJp- z%Sr<=6oBELr0Gn>cA?-x1Qm3n(Anrp#8a_5MX3uB+>Fcth3OQgQxUvW>$Tph zPQ70rz=hA`3-}5qu}UYq5c2V#q~7_}@!4w_pcZa~^Ty!FCUAxe9Jd&c@uX#CXNnHF z5XWsW1jh;_M7p>}zQ5{FK_B5x_+j+hyO0)Gg?838`+ICJyEJF}CGzuSmpJY<padH?@JMmCE>m$;JPtEv&qS>SInl_eE(%u2@B63DBGkF0 z#*~B?Va*(vtpANDLoT&(r3_jR$aBbPPIV0_#)d?)iIx(4SZ0MPs}X*i-Ibe`lv~Z* zMdrDWL_9?2Y2YI;Ci1!LG{+|;EpmKjEXLX_D>qdv%g2*>FVcN03xS80PPuH^Xyh2nQFaS_ua(QZTi<6bA~n{wdv?2(@xRETrD-biq_jpl04u zyQcvpiDG&ZRDz%al5@@(Sy*yVB!ePIGN1JSdwZ4{SbV3h?*IQ%|NWZE8edx75EyO+ zom49AI&M6j$_mUu`;th@hOkmjQrUyYs!S#xQviXEs(wr&UK@844X-$fgo*)J0>?pn zQBVc+;dpOGpl9C+AO#MS_>Pcmq#X`N2Bl*v0Y01v0ZZZ}@LTQD20p2eaI$wl(4%S! zw6kz31VyP~ccKY3#K~k;rlu~TB)-eY)4(V2O(~N}kT`;1-_x+~dxP3`%1wumr49JS zzyN;0fKgKRl;aOu(f-l@@P2F@G217a%_9?SRYE0I$_4y1&zjS;GxD^6GYPd*t8OYJ z&MJVNtzkdY*|?)srh5zc=Xr3A{RLqU&|%LZ=x&i{*3CGzE?-P_z3Wxm9dmQ@`IFjt z8g@Rzs(M$YVk%}L{}Mt%ylmNqC+nBJD6s`BeIX&gNN804^bLHaZ=gB%ufei>_zia~ zq7M6wx@d;3sia)uVlG<(9lWb{SNPWZ*Y2KMO4Hyg35QKpIf+|F;(WNA#M#;A-g3Yd zMRr%3C~*~UQ&qW6VYS)jp##<;`$cSoYq!BtQ$1z#sbz#z)eN0oAaz& z3~PmE-Ada!d%$g6vAuw_QsNFny0e8;b5;`PF37Rf-NmGPib(h7N%s|5-A~*7_`>z8 zJJ8DH9(?|F9b!rJ6h}bLhllkn93c%)CilA{2}g|tO0^M$uxhF!uSq<{Aj2gd7ov@L zAsnuLHC;y!lWaBVC{JjGc#?ocAHY*aFe>m%T!PaAK|Bq8X+UbyX}9?ypD|ILHBseH z2=g3Gm4)Y7$px<}*x9~lYQOhJ2FqeU5T%8eh|6yV`A4!4Ogf|DwXfGDqbj4X>N58? zl8-B_sz2b>R>%Dsm%XLK#p}GjL0NY876iK3Hx2DA4?;b<-R7KX>5*ylpSW~9x8cvc zyyHbeWgUJo9e3GOmvGptvP<74NB4?)f8~Zby7xXW9}wen{}2xiF^Y%y zv5w(4?^>v<^Lx=9{=uO1&%;02d2hhK=-B6sQd;@nbjs62Kk$E^86~`cQ}G5qz=gO7 M*Wz}(LqI~pe|yo1&Hw-a delta 1347 zcmZ{k*-ukJ6vml5y)8wGB7sP(ibms$+5pBx)Z`fDO^iVw6yrmo6GGC3lw#niu88|` z-EddL9RYXTcTrGOa2IjI4R`$mJZG2^?t^`r%*^-w&iUr_HVtTY)|T3w%oZ<73cUq+ z1tD+gB)8WqJgn;nVWY)1Z1gW|;Ry{5-R|JCv z9^sQmu*et@J=nUK#pzIHv_<#NUP2z_%%Z_8&V4?{VGbHBl?KbupszCU2*2z=x&R(CX0357GN0han6MGJ>(mt ze52vECnRq&$u^^GJb|IYSZND6MOH@Y6Wd zN#yZD7 z!76lkig>G<+-KNTtk0cakTD zXA)FM?H5{h(qB2{tI~cWEq$bBlokq_&+oFoA4XQ(z-d2C@AZq+_(g%=)Y3=>fAHAi f&hPr({KeDApg=2>K|6H9PN;+$sD}>JX`KB7S5ZEu diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtextbin index ca169630338e6eebe957e18fa7673575cbf31bfd..0b28b9b0505250ea574a40a2e361947ff2d193f5 100644 GIT binary patch delta 560 zcmZ9J%QM4J7{&X2H#bSCs$s_3&S1pGlKCvyVQg%yYMRl|B(zbFs(941-uXwmXX8Kf z-83bY<+=BsbABhC(e_wp#t3Du=y`rn3>@F9A?-k6aOqb-=@nf&yI!}eRi|V_{81T( zP+Qqp6XbwELu5gtT`;7eJs6g>4O9UGaf$^ObcwS-UiUz~*O7e4A?+h%w8iM#oR8+f zj6RL=%>y>pSN)P*5maSs@&(mUWHi&VVwr;i4$|q6eRWse1gb+`#yxdhFz6^rqGJ`^ z06K{#&57_-$qn{5mn*hwdx4;{B%!Gi1}rN%;EeMaCS(KC?%oEv=u5f$;{m!-Nlk!% zQ(i*>d((~ZcGTc$n7*axZ=x@AE4)ns->Et+LHArorhp%~j6shn;C5e?rylTg0{jAb qHGVd!Uem=i@ABFm0O*ZhYfeeYN`F^+ncIEzD3GF5bM@0vXz&9AGIUu0 delta 478 zcmY+A$xZ@65QeEcW8Bft}|Ld;W82BXCi zU@*Ag??zw$Z^W9#iv)s~Ol<&O#rw`|>zd;_^*ftoKk&myVk05kFk!;;k_%!q`yRJc z;P`{rfUPmg-MFEVg*+gR^FPiwIiR-fo<`6H54{ChzePCN1oy)R}$gQe6Y>{DUYTxYt0_!YF?fA7N z+wI0}Oa8-6+RwqI>sJ+Skz%99DZp(qS|O%`8gqm@WSCD%;Vy-mPZN^r!0AIqN|TI? zX)HLmbLQw^%bdNDi)VNxZ`(wnBd$ml7Fdl1jaJK-C8H}DAr{3lOx;aFK?k%)40*=j z-Y^79F11g%KRD7jUM{X}oe{h)N3a+WoB%X~r9x;*ke6 z4h}mWWS5#6gOTvJweWYf@b?matWtmQ>W@zSX+-_GQkQ<_gfBJuSCP+nIqliNZ*@SS v`|jx1JpGUQAxi0A7OHOo{2bY!Uqg%qd8QM;-I#L8lJ5WP(f4FqSq1bDSKgtO delta 634 zcmY+CxlY4C5Qa0mUayHbQa}?LXhFiXAO#IlK%xK%3i<#B0a+P3E5|WUsz~nw<1x)JO}|VY zTjZhRHc9HX>IB?@ZXukEZRso}u^5`*u5zsc?s;ir(A`(%66qULIm@=3BFD0FsDMT( zfMZqp#7#3iCZ_`sLSRjS^$6&O(W=yR=#P9vUWOG210F{LohSkC&q%tb)T?0w5^{36 zn9Vyv6w3t*&-@&efVO%b5o$(+E|kzEFve%n9IuE9wtfw9#)bvnsDU$}yf+$0{qFxpMmI?Hu^O}zeVVGqEkNY2l!BVYA{Aw>NEh| ceMM^c*>>4qp>TmV`mM%v6pbbNjTqP9A2cF%_y7O^ diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtextbin index dbd8182039894afc6075164e0673392f3f8d5a75..9a3299866c6b8ec2cc66af9ede8f3154619875c9 100644 GIT binary patch delta 377 zcmZ9I!7{`^5QevVGLx`DT-{t9HeP`G9k`)fTve)eup|?*vDmeOH&A&IcMstq9Gty@ znQTz>@$c^c>;6BZ*X5TFRmm_hCNGn6keeann4<31kHFF-nV#Dp>7p3)H8q73T3~PI zU{Bzb1S=7chXMIg;Ea|e62dw8%xhLiNlESzvRT9JD~6$vku!C?&FA%%`b~!Qk>5MK zu)b*Q3VjqE&z;gnmpFn0L5+uTrXbgCI%wiT}4BWvNA?HBE+<='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -232,7 +232,7 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer { } } while (true); - // InternalIgnoreCaseLexerTestLanguageLexer.g:22:40: ( ( '\\r' )? '\\n' )? + // InternalIgnoreCaseLexerTestLanguageLexer.g:20:40: ( ( '\\r' )? '\\n' )? int alt4=2; int LA4_0 = input.LA(1); @@ -241,9 +241,9 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer { } switch (alt4) { case 1 : - // InternalIgnoreCaseLexerTestLanguageLexer.g:22:41: ( '\\r' )? '\\n' + // InternalIgnoreCaseLexerTestLanguageLexer.g:20:41: ( '\\r' )? '\\n' { - // InternalIgnoreCaseLexerTestLanguageLexer.g:22:41: ( '\\r' )? + // InternalIgnoreCaseLexerTestLanguageLexer.g:20:41: ( '\\r' )? int alt3=2; int LA3_0 = input.LA(1); @@ -252,7 +252,7 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer { } switch (alt3) { case 1 : - // InternalIgnoreCaseLexerTestLanguageLexer.g:22:41: '\\r' + // InternalIgnoreCaseLexerTestLanguageLexer.g:20:41: '\\r' { match('\r'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtextbin index e58daeee88ebcc23b60e4d0700f0a35900acfd51..385057411978e892e69fc305a04fedf737285588 100644 GIT binary patch delta 60 zcmZn`+#tB2hQoxFCowNCza+6FGe57G$)Sc(klPV1z{HxDn48M!UzS=_l$nys$mmeY I$i&PD08=v(A^-pY delta 15 WcmdlW*etlAhJ&5ap_Gw{nGpaZi33gm diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtextbin index 121e3d39c3db06adf1d97a22b3b6408466337077..ccdd32ef49047a885c11bc9d11887f68217c955e 100644 GIT binary patch delta 60 zcmbOtcu;UdFNX;$PhwtPeo10UW`15VlS2)oAh#o2fQdCPF*lXdzbv(=C^IFMkXRR910 delta 15 WcmX>oI7M(nF9$oLLn$K@Ga~>d4+DV! diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtextbin index 69966939a33ed5fa0348374ac8b604a9fff92528..922e45f780314d9650bf0d441d60f54375f0e1be 100644 GIT binary patch delta 502 zcmZXR-%0{O6vjETp4nY=6(ppq>cYB6>Y}@l@PGsbQ4mFRBMFWrt?Ra~rCE7lfAOlO z-oqZEhv;E~W?e0_xtf{t`_A{xnfGKj*(YQXCJVT#gN}3vG1mG9r2$w~U`n6ugdot_$iP#QNV(<#)&GfnNFX&pV|1WV4LF^L z@qjLrN~<_P&B;WqKyx|N94SqEr~$eHK98&obPX0`ix_pinkziNBI;brsMp^plsalG zpZeU6LNbVc%N1d<8#KNhYkW5fbFVV|j_@J8rpI6wSqK(AsXy2-(xz(PgBY9Mm)k~4 b_KfxHq|0;Q@-pTkM=q~_T;3oqqvpals~cbF delta 481 zcmZ9IT}uK%6oxswo!J$1H!S)h%nR{G>Y}@lU`QeYqX;6pC>q+q%yku8%a0<+J_&-F zq94&s{gQq`_x+5{nv!}qoH_6F%sZ{_`0QODMY_smP}7kuU0_0>Y-eB%{L_c?|=I@=63-)OjR!M2PSY i5YZ;KRNNd>yXJCw(DD>mo_j2+YkBFjywd-Co5^45{bY;) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java index 260c463bc..7eb8cd1ef 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java @@ -5,11 +5,9 @@ package org.eclipse.xtext.linking.lazy; import com.google.inject.Guice; import com.google.inject.Injector; -import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.ISetup; import org.eclipse.xtext.common.TerminalsStandaloneSetup; -import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; import org.eclipse.xtext.resource.IResourceFactory; import org.eclipse.xtext.resource.IResourceServiceProvider; @@ -35,8 +33,5 @@ public class LazyLinkingTestLanguageStandaloneSetupGenerated implements ISetup { Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("lazylinkingtestlanguage", resourceFactory); IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("lazylinkingtestlanguage", serviceProvider); - if (!EPackage.Registry.INSTANCE.containsKey("http://eclipse.org/xtext/lazyLinkingTestLanguage")) { - EPackage.Registry.INSTANCE.put("http://eclipse.org/xtext/lazyLinkingTestLanguage", LazyLinkingPackage.eINSTANCE); - } } } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java deleted file mode 100644 index b754dae41..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking; - -import org.eclipse.emf.ecore.EFactory; - -/** - * - * The Factory for the model. - * It provides a create method for each non-abstract class of the model. - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage - * @generated - */ -public interface LazyLinkingFactory extends EFactory -{ - /** - * The singleton instance of the factory. - * - * - * @generated - */ - LazyLinkingFactory eINSTANCE = org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingFactoryImpl.init(); - - /** - * Returns a new object of class 'Model'. - * - * - * @return a new object of class 'Model'. - * @generated - */ - Model createModel(); - - /** - * Returns a new object of class 'Type'. - * - * - * @return a new object of class 'Type'. - * @generated - */ - Type createType(); - - /** - * Returns a new object of class 'Property'. - * - * - * @return a new object of class 'Property'. - * @generated - */ - Property createProperty(); - - /** - * Returns a new object of class 'Unresolved Proxy Property'. - * - * - * @return a new object of class 'Unresolved Proxy Property'. - * @generated - */ - UnresolvedProxyProperty createUnresolvedProxyProperty(); - - /** - * Returns the package supported by this factory. - * - * - * @return the package supported by this factory. - * @generated - */ - LazyLinkingPackage getLazyLinkingPackage(); - -} //LazyLinkingFactory diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java deleted file mode 100644 index ad992cc4d..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java +++ /dev/null @@ -1,550 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -/** - * - * The Package for the model. - * It contains accessors for the meta objects to represent - *
    - *
  • each class,
    • - *
  • each feature of each class,
    • - *
  • each enum,
    • - *
  • and each data type
    • - *
- * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory - * @model kind="package" - * @generated - */ -public interface LazyLinkingPackage extends EPackage -{ - /** - * The package name. - * - * - * @generated - */ - String eNAME = "lazyLinking"; - - /** - * The package namespace URI. - * - * - * @generated - */ - String eNS_URI = "http://eclipse.org/xtext/lazyLinkingTestLanguage"; - - /** - * The package namespace name. - * - * - * @generated - */ - String eNS_PREFIX = "lazyLinking"; - - /** - * The singleton instance of the package. - * - * - * @generated - */ - LazyLinkingPackage eINSTANCE = org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl.init(); - - /** - * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl Model}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getModel() - * @generated - */ - int MODEL = 0; - - /** - * The feature id for the 'Types' containment reference list. - * - * - * @generated - * @ordered - */ - int MODEL__TYPES = 0; - - /** - * The number of structural features of the 'Model' class. - * - * - * @generated - * @ordered - */ - int MODEL_FEATURE_COUNT = 1; - - /** - * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl Type}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getType() - * @generated - */ - int TYPE = 1; - - /** - * The feature id for the 'Name' attribute. - * - * - * @generated - * @ordered - */ - int TYPE__NAME = 0; - - /** - * The feature id for the 'Extends' reference. - * - * - * @generated - * @ordered - */ - int TYPE__EXTENDS = 1; - - /** - * The feature id for the 'Parent Id' reference. - * - * - * @generated - * @ordered - */ - int TYPE__PARENT_ID = 2; - - /** - * The feature id for the 'Properties' containment reference list. - * - * - * @generated - * @ordered - */ - int TYPE__PROPERTIES = 3; - - /** - * The feature id for the 'Unresolved Proxy Property' containment reference list. - * - * - * @generated - * @ordered - */ - int TYPE__UNRESOLVED_PROXY_PROPERTY = 4; - - /** - * The feature id for the 'Subtypes' reference list. - * - * - * @generated - * @ordered - */ - int TYPE__SUBTYPES = 5; - - /** - * The number of structural features of the 'Type' class. - * - * - * @generated - * @ordered - */ - int TYPE_FEATURE_COUNT = 6; - - /** - * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl Property}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getProperty() - * @generated - */ - int PROPERTY = 2; - - /** - * The feature id for the 'Type' reference list. - * - * - * @generated - * @ordered - */ - int PROPERTY__TYPE = 0; - - /** - * The feature id for the 'Name' attribute. - * - * - * @generated - * @ordered - */ - int PROPERTY__NAME = 1; - - /** - * The number of structural features of the 'Property' class. - * - * - * @generated - * @ordered - */ - int PROPERTY_FEATURE_COUNT = 2; - - /** - * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl Unresolved Proxy Property}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getUnresolvedProxyProperty() - * @generated - */ - int UNRESOLVED_PROXY_PROPERTY = 3; - - /** - * The feature id for the 'Type' reference list. - * - * - * @generated - * @ordered - */ - int UNRESOLVED_PROXY_PROPERTY__TYPE = 0; - - /** - * The feature id for the 'Name' attribute. - * - * - * @generated - * @ordered - */ - int UNRESOLVED_PROXY_PROPERTY__NAME = 1; - - /** - * The number of structural features of the 'Unresolved Proxy Property' class. - * - * - * @generated - * @ordered - */ - int UNRESOLVED_PROXY_PROPERTY_FEATURE_COUNT = 2; - - - /** - * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model Model}'. - * - * - * @return the meta object for class 'Model'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model - * @generated - */ - EClass getModel(); - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes Types}'. - * - * - * @return the meta object for the containment reference list 'Types'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes() - * @see #getModel() - * @generated - */ - EReference getModel_Types(); - - /** - * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type Type}'. - * - * - * @return the meta object for class 'Type'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type - * @generated - */ - EClass getType(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName() - * @see #getType() - * @generated - */ - EAttribute getType_Name(); - - /** - * Returns the meta object for the reference '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}'. - * - * - * @return the meta object for the reference 'Extends'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends() - * @see #getType() - * @generated - */ - EReference getType_Extends(); - - /** - * Returns the meta object for the reference '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}'. - * - * - * @return the meta object for the reference 'Parent Id'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId() - * @see #getType() - * @generated - */ - EReference getType_ParentId(); - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties Properties}'. - * - * - * @return the meta object for the containment reference list 'Properties'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties() - * @see #getType() - * @generated - */ - EReference getType_Properties(); - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty Unresolved Proxy Property}'. - * - * - * @return the meta object for the containment reference list 'Unresolved Proxy Property'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty() - * @see #getType() - * @generated - */ - EReference getType_UnresolvedProxyProperty(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}'. - * - * - * @return the meta object for the reference list 'Subtypes'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes() - * @see #getType() - * @generated - */ - EReference getType_Subtypes(); - - /** - * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property Property}'. - * - * - * @return the meta object for class 'Property'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property - * @generated - */ - EClass getProperty(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType Type}'. - * - * - * @return the meta object for the reference list 'Type'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType() - * @see #getProperty() - * @generated - */ - EReference getProperty_Type(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName() - * @see #getProperty() - * @generated - */ - EAttribute getProperty_Name(); - - /** - * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty Unresolved Proxy Property}'. - * - * - * @return the meta object for class 'Unresolved Proxy Property'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty - * @generated - */ - EClass getUnresolvedProxyProperty(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType Type}'. - * - * - * @return the meta object for the reference list 'Type'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType() - * @see #getUnresolvedProxyProperty() - * @generated - */ - EReference getUnresolvedProxyProperty_Type(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName() - * @see #getUnresolvedProxyProperty() - * @generated - */ - EAttribute getUnresolvedProxyProperty_Name(); - - /** - * Returns the factory that creates the instances of the model. - * - * - * @return the factory that creates the instances of the model. - * @generated - */ - LazyLinkingFactory getLazyLinkingFactory(); - - /** - * - * Defines literals for the meta objects that represent - *
    - *
  • each class,
    • - *
  • each feature of each class,
    • - *
  • each enum,
    • - *
  • and each data type
    • - *
- * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl Model}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getModel() - * @generated - */ - EClass MODEL = eINSTANCE.getModel(); - - /** - * The meta object literal for the 'Types' containment reference list feature. - * - * - * @generated - */ - EReference MODEL__TYPES = eINSTANCE.getModel_Types(); - - /** - * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl Type}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getType() - * @generated - */ - EClass TYPE = eINSTANCE.getType(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * - * @generated - */ - EAttribute TYPE__NAME = eINSTANCE.getType_Name(); - - /** - * The meta object literal for the 'Extends' reference feature. - * - * - * @generated - */ - EReference TYPE__EXTENDS = eINSTANCE.getType_Extends(); - - /** - * The meta object literal for the 'Parent Id' reference feature. - * - * - * @generated - */ - EReference TYPE__PARENT_ID = eINSTANCE.getType_ParentId(); - - /** - * The meta object literal for the 'Properties' containment reference list feature. - * - * - * @generated - */ - EReference TYPE__PROPERTIES = eINSTANCE.getType_Properties(); - - /** - * The meta object literal for the 'Unresolved Proxy Property' containment reference list feature. - * - * - * @generated - */ - EReference TYPE__UNRESOLVED_PROXY_PROPERTY = eINSTANCE.getType_UnresolvedProxyProperty(); - - /** - * The meta object literal for the 'Subtypes' reference list feature. - * - * - * @generated - */ - EReference TYPE__SUBTYPES = eINSTANCE.getType_Subtypes(); - - /** - * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl Property}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getProperty() - * @generated - */ - EClass PROPERTY = eINSTANCE.getProperty(); - - /** - * The meta object literal for the 'Type' reference list feature. - * - * - * @generated - */ - EReference PROPERTY__TYPE = eINSTANCE.getProperty_Type(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * - * @generated - */ - EAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl Unresolved Proxy Property}' class. - * - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl - * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getUnresolvedProxyProperty() - * @generated - */ - EClass UNRESOLVED_PROXY_PROPERTY = eINSTANCE.getUnresolvedProxyProperty(); - - /** - * The meta object literal for the 'Type' reference list feature. - * - * - * @generated - */ - EReference UNRESOLVED_PROXY_PROPERTY__TYPE = eINSTANCE.getUnresolvedProxyProperty_Type(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * - * @generated - */ - EAttribute UNRESOLVED_PROXY_PROPERTY__NAME = eINSTANCE.getUnresolvedProxyProperty_Name(); - - } - -} //LazyLinkingPackage diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java deleted file mode 100644 index 74144eb79..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Model'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes Types}
    • - *
- * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getModel() - * @model - * @generated - */ -public interface Model extends EObject -{ - /** - * Returns the value of the 'Types' containment reference list. - * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. - * - *

- * If the meaning of the 'Types' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Types' containment reference list. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getModel_Types() - * @model containment="true" - * @generated - */ - EList getTypes(); - -} // Model diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java deleted file mode 100644 index e0482ade5..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Property'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType Type}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}
    • - *
- * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty() - * @model - * @generated - */ -public interface Property extends EObject -{ - /** - * Returns the value of the 'Type' reference list. - * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. - * - *

- * If the meaning of the 'Type' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Type' reference list. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty_Type() - * @model - * @generated - */ - EList getType(); - - /** - * Returns the value of the 'Name' attribute. - * - *

- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty_Name() - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - -} // Property diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java deleted file mode 100644 index 107aea6d0..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java +++ /dev/null @@ -1,163 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Type'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties Properties}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty Unresolved Proxy Property}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}
    • - *
- * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType() - * @model - * @generated - */ -public interface Type extends EObject -{ - /** - * Returns the value of the 'Name' attribute. - * - *

- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Name() - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the 'Extends' reference. - * It is bidirectional and its opposite is '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}'. - * - *

- * If the meaning of the 'Extends' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Extends' reference. - * @see #setExtends(Type) - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Extends() - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes - * @model opposite="subtypes" - * @generated - */ - Type getExtends(); - - /** - * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}' reference. - * - * - * @param value the new value of the 'Extends' reference. - * @see #getExtends() - * @generated - */ - void setExtends(Type value); - - /** - * Returns the value of the 'Parent Id' reference. - * - *

- * If the meaning of the 'Parent Id' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Parent Id' reference. - * @see #setParentId(Property) - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_ParentId() - * @model - * @generated - */ - Property getParentId(); - - /** - * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}' reference. - * - * - * @param value the new value of the 'Parent Id' reference. - * @see #getParentId() - * @generated - */ - void setParentId(Property value); - - /** - * Returns the value of the 'Properties' containment reference list. - * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Property}. - * - *

- * If the meaning of the 'Properties' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Properties' containment reference list. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Properties() - * @model containment="true" - * @generated - */ - EList getProperties(); - - /** - * Returns the value of the 'Unresolved Proxy Property' containment reference list. - * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty}. - * - *

- * If the meaning of the 'Unresolved Proxy Property' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Unresolved Proxy Property' containment reference list. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_UnresolvedProxyProperty() - * @model containment="true" - * @generated - */ - EList getUnresolvedProxyProperty(); - - /** - * Returns the value of the 'Subtypes' reference list. - * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. - * It is bidirectional and its opposite is '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}'. - * - *

- * If the meaning of the 'Subtypes' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Subtypes' reference list. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Subtypes() - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends - * @model opposite="extends" - * @generated - */ - EList getSubtypes(); - -} // Type diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java deleted file mode 100644 index 71edb368c..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Unresolved Proxy Property'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType Type}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}
    • - *
- * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty() - * @model - * @generated - */ -public interface UnresolvedProxyProperty extends EObject -{ - /** - * Returns the value of the 'Type' reference list. - * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}. - * - *

- * If the meaning of the 'Type' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Type' reference list. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty_Type() - * @model resolveProxies="false" - * @generated - */ - EList getType(); - - /** - * Returns the value of the 'Name' attribute. - * - *

- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty_Name() - * @model - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - -} // UnresolvedProxyProperty diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java deleted file mode 100644 index 800991012..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java +++ /dev/null @@ -1,143 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.impl; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.impl.EFactoryImpl; - -import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.eclipse.xtext.linking.lazy.lazyLinking.*; - -/** - * - * An implementation of the model Factory. - * - * @generated - */ -public class LazyLinkingFactoryImpl extends EFactoryImpl implements LazyLinkingFactory -{ - /** - * Creates the default factory implementation. - * - * - * @generated - */ - public static LazyLinkingFactory init() - { - try - { - LazyLinkingFactory theLazyLinkingFactory = (LazyLinkingFactory)EPackage.Registry.INSTANCE.getEFactory(LazyLinkingPackage.eNS_URI); - if (theLazyLinkingFactory != null) - { - return theLazyLinkingFactory; - } - } - catch (Exception exception) - { - EcorePlugin.INSTANCE.log(exception); - } - return new LazyLinkingFactoryImpl(); - } - - /** - * Creates an instance of the factory. - * - * - * @generated - */ - public LazyLinkingFactoryImpl() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - public EObject create(EClass eClass) - { - switch (eClass.getClassifierID()) - { - case LazyLinkingPackage.MODEL: return createModel(); - case LazyLinkingPackage.TYPE: return createType(); - case LazyLinkingPackage.PROPERTY: return createProperty(); - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY: return createUnresolvedProxyProperty(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - public Model createModel() - { - ModelImpl model = new ModelImpl(); - return model; - } - - /** - * - * - * @generated - */ - public Type createType() - { - TypeImpl type = new TypeImpl(); - return type; - } - - /** - * - * - * @generated - */ - public Property createProperty() - { - PropertyImpl property = new PropertyImpl(); - return property; - } - - /** - * - * - * @generated - */ - public UnresolvedProxyProperty createUnresolvedProxyProperty() - { - UnresolvedProxyPropertyImpl unresolvedProxyProperty = new UnresolvedProxyPropertyImpl(); - return unresolvedProxyProperty; - } - - /** - * - * - * @generated - */ - public LazyLinkingPackage getLazyLinkingPackage() - { - return (LazyLinkingPackage)getEPackage(); - } - - /** - * - * - * @deprecated - * @generated - */ - @Deprecated - public static LazyLinkingPackage getPackage() - { - return LazyLinkingPackage.eINSTANCE; - } - -} //LazyLinkingFactoryImpl diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java deleted file mode 100644 index 716651003..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java +++ /dev/null @@ -1,380 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.impl; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.EcorePackage; - -import org.eclipse.emf.ecore.impl.EPackageImpl; - -import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory; -import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; -import org.eclipse.xtext.linking.lazy.lazyLinking.Model; -import org.eclipse.xtext.linking.lazy.lazyLinking.Property; -import org.eclipse.xtext.linking.lazy.lazyLinking.Type; -import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty; - -/** - * - * An implementation of the model Package. - * - * @generated - */ -public class LazyLinkingPackageImpl extends EPackageImpl implements LazyLinkingPackage -{ - /** - * - * - * @generated - */ - private EClass modelEClass = null; - - /** - * - * - * @generated - */ - private EClass typeEClass = null; - - /** - * - * - * @generated - */ - private EClass propertyEClass = null; - - /** - * - * - * @generated - */ - private EClass unresolvedProxyPropertyEClass = null; - - /** - * Creates an instance of the model Package, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - *

Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#eNS_URI - * @see #init() - * @generated - */ - private LazyLinkingPackageImpl() - { - super(eNS_URI, LazyLinkingFactory.eINSTANCE); - } - - /** - * - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * - *

This method is used to initialize {@link LazyLinkingPackage#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static LazyLinkingPackage init() - { - if (isInited) return (LazyLinkingPackage)EPackage.Registry.INSTANCE.getEPackage(LazyLinkingPackage.eNS_URI); - - // Obtain or create and register package - LazyLinkingPackageImpl theLazyLinkingPackage = (LazyLinkingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LazyLinkingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LazyLinkingPackageImpl()); - - isInited = true; - - // Initialize simple dependencies - EcorePackage.eINSTANCE.eClass(); - - // Create package meta-data objects - theLazyLinkingPackage.createPackageContents(); - - // Initialize created meta-data - theLazyLinkingPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theLazyLinkingPackage.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(LazyLinkingPackage.eNS_URI, theLazyLinkingPackage); - return theLazyLinkingPackage; - } - - /** - * - * - * @generated - */ - public EClass getModel() - { - return modelEClass; - } - - /** - * - * - * @generated - */ - public EReference getModel_Types() - { - return (EReference)modelEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getType() - { - return typeEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getType_Name() - { - return (EAttribute)typeEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getType_Extends() - { - return (EReference)typeEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getType_ParentId() - { - return (EReference)typeEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EReference getType_Properties() - { - return (EReference)typeEClass.getEStructuralFeatures().get(3); - } - - /** - * - * - * @generated - */ - public EReference getType_UnresolvedProxyProperty() - { - return (EReference)typeEClass.getEStructuralFeatures().get(4); - } - - /** - * - * - * @generated - */ - public EReference getType_Subtypes() - { - return (EReference)typeEClass.getEStructuralFeatures().get(5); - } - - /** - * - * - * @generated - */ - public EClass getProperty() - { - return propertyEClass; - } - - /** - * - * - * @generated - */ - public EReference getProperty_Type() - { - return (EReference)propertyEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EAttribute getProperty_Name() - { - return (EAttribute)propertyEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EClass getUnresolvedProxyProperty() - { - return unresolvedProxyPropertyEClass; - } - - /** - * - * - * @generated - */ - public EReference getUnresolvedProxyProperty_Type() - { - return (EReference)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EAttribute getUnresolvedProxyProperty_Name() - { - return (EAttribute)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public LazyLinkingFactory getLazyLinkingFactory() - { - return (LazyLinkingFactory)getEFactoryInstance(); - } - - /** - * - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void createPackageContents() - { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - modelEClass = createEClass(MODEL); - createEReference(modelEClass, MODEL__TYPES); - - typeEClass = createEClass(TYPE); - createEAttribute(typeEClass, TYPE__NAME); - createEReference(typeEClass, TYPE__EXTENDS); - createEReference(typeEClass, TYPE__PARENT_ID); - createEReference(typeEClass, TYPE__PROPERTIES); - createEReference(typeEClass, TYPE__UNRESOLVED_PROXY_PROPERTY); - createEReference(typeEClass, TYPE__SUBTYPES); - - propertyEClass = createEClass(PROPERTY); - createEReference(propertyEClass, PROPERTY__TYPE); - createEAttribute(propertyEClass, PROPERTY__NAME); - - unresolvedProxyPropertyEClass = createEClass(UNRESOLVED_PROXY_PROPERTY); - createEReference(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__TYPE); - createEAttribute(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__NAME); - } - - /** - * - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void initializePackageContents() - { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Obtain other dependent packages - EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); - - // Create type parameters - - // Set bounds for type parameters - - // Add supertypes to classes - - // Initialize classes and features; add operations and parameters - initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getModel_Types(), this.getType(), null, "types", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(typeEClass, Type.class, "Type", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getType_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getType_Extends(), this.getType(), this.getType_Subtypes(), "extends", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getType_ParentId(), this.getProperty(), null, "parentId", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getType_Properties(), this.getProperty(), null, "properties", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getType_UnresolvedProxyProperty(), this.getUnresolvedProxyProperty(), null, "unresolvedProxyProperty", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getType_Subtypes(), this.getType(), this.getType_Extends(), "subtypes", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(propertyEClass, Property.class, "Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getProperty_Type(), this.getType(), null, "type", null, 0, -1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(unresolvedProxyPropertyEClass, UnresolvedProxyProperty.class, "UnresolvedProxyProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getUnresolvedProxyProperty_Type(), this.getType(), null, "type", null, 0, -1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getUnresolvedProxyProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - // Create resource - createResource(eNS_URI); - } - -} //LazyLinkingPackageImpl diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java deleted file mode 100644 index 362fa47e9..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java +++ /dev/null @@ -1,168 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; -import org.eclipse.xtext.linking.lazy.lazyLinking.Model; -import org.eclipse.xtext.linking.lazy.lazyLinking.Type; - -/** - * - * An implementation of the model object 'Model'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl#getTypes Types}
    • - *
- * - * @generated - */ -public class ModelImpl extends MinimalEObjectImpl.Container implements Model -{ - /** - * The cached value of the '{@link #getTypes() Types}' containment reference list. - * - * - * @see #getTypes() - * @generated - * @ordered - */ - protected EList types; - - /** - * - * - * @generated - */ - protected ModelImpl() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return LazyLinkingPackage.Literals.MODEL; - } - - /** - * - * - * @generated - */ - public EList getTypes() - { - if (types == null) - { - types = new EObjectContainmentEList(Type.class, this, LazyLinkingPackage.MODEL__TYPES); - } - return types; - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { - case LazyLinkingPackage.MODEL__TYPES: - return ((InternalEList)getTypes()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case LazyLinkingPackage.MODEL__TYPES: - return getTypes(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case LazyLinkingPackage.MODEL__TYPES: - getTypes().clear(); - getTypes().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.MODEL__TYPES: - getTypes().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.MODEL__TYPES: - return types != null && !types.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ModelImpl diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java deleted file mode 100644 index 262171961..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectResolvingEList; - -import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; -import org.eclipse.xtext.linking.lazy.lazyLinking.Property; -import org.eclipse.xtext.linking.lazy.lazyLinking.Type; - -/** - * - * An implementation of the model object 'Property'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getType Type}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getName Name}
    • - *
- * - * @generated - */ -public class PropertyImpl extends MinimalEObjectImpl.Container implements Property -{ - /** - * The cached value of the '{@link #getType() Type}' reference list. - * - * - * @see #getType() - * @generated - * @ordered - */ - protected EList type; - - /** - * The default value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * - * - * @generated - */ - protected PropertyImpl() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return LazyLinkingPackage.Literals.PROPERTY; - } - - /** - * - * - * @generated - */ - public EList getType() - { - if (type == null) - { - type = new EObjectResolvingEList(Type.class, this, LazyLinkingPackage.PROPERTY__TYPE); - } - return type; - } - - /** - * - * - * @generated - */ - public String getName() - { - return name; - } - - /** - * - * - * @generated - */ - public void setName(String newName) - { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.PROPERTY__NAME, oldName, name)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case LazyLinkingPackage.PROPERTY__TYPE: - return getType(); - case LazyLinkingPackage.PROPERTY__NAME: - return getName(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case LazyLinkingPackage.PROPERTY__TYPE: - getType().clear(); - getType().addAll((Collection)newValue); - return; - case LazyLinkingPackage.PROPERTY__NAME: - setName((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.PROPERTY__TYPE: - getType().clear(); - return; - case LazyLinkingPackage.PROPERTY__NAME: - setName(NAME_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.PROPERTY__TYPE: - return type != null && !type.isEmpty(); - case LazyLinkingPackage.PROPERTY__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() - { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); - result.append(name); - result.append(')'); - return result.toString(); - } - -} //PropertyImpl diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java deleted file mode 100644 index 65446e4c5..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java +++ /dev/null @@ -1,497 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; -import org.eclipse.xtext.linking.lazy.lazyLinking.Property; -import org.eclipse.xtext.linking.lazy.lazyLinking.Type; -import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty; - -/** - * - * An implementation of the model object 'Type'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getName Name}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getExtends Extends}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getParentId Parent Id}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getProperties Properties}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getUnresolvedProxyProperty Unresolved Proxy Property}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getSubtypes Subtypes}
    • - *
- * - * @generated - */ -public class TypeImpl extends MinimalEObjectImpl.Container implements Type -{ - /** - * The default value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The cached value of the '{@link #getExtends() Extends}' reference. - * - * - * @see #getExtends() - * @generated - * @ordered - */ - protected Type extends_; - - /** - * The cached value of the '{@link #getParentId() Parent Id}' reference. - * - * - * @see #getParentId() - * @generated - * @ordered - */ - protected Property parentId; - - /** - * The cached value of the '{@link #getProperties() Properties}' containment reference list. - * - * - * @see #getProperties() - * @generated - * @ordered - */ - protected EList properties; - - /** - * The cached value of the '{@link #getUnresolvedProxyProperty() Unresolved Proxy Property}' containment reference list. - * - * - * @see #getUnresolvedProxyProperty() - * @generated - * @ordered - */ - protected EList unresolvedProxyProperty; - - /** - * The cached value of the '{@link #getSubtypes() Subtypes}' reference list. - * - * - * @see #getSubtypes() - * @generated - * @ordered - */ - protected EList subtypes; - - /** - * - * - * @generated - */ - protected TypeImpl() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return LazyLinkingPackage.Literals.TYPE; - } - - /** - * - * - * @generated - */ - public String getName() - { - return name; - } - - /** - * - * - * @generated - */ - public void setName(String newName) - { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__NAME, oldName, name)); - } - - /** - * - * - * @generated - */ - public Type getExtends() - { - if (extends_ != null && extends_.eIsProxy()) - { - InternalEObject oldExtends = (InternalEObject)extends_; - extends_ = (Type)eResolveProxy(oldExtends); - if (extends_ != oldExtends) - { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, extends_)); - } - } - return extends_; - } - - /** - * - * - * @generated - */ - public Type basicGetExtends() - { - return extends_; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetExtends(Type newExtends, NotificationChain msgs) - { - Type oldExtends = extends_; - extends_ = newExtends; - if (eNotificationRequired()) - { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, newExtends); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setExtends(Type newExtends) - { - if (newExtends != extends_) - { - NotificationChain msgs = null; - if (extends_ != null) - msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs); - if (newExtends != null) - msgs = ((InternalEObject)newExtends).eInverseAdd(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs); - msgs = basicSetExtends(newExtends, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, newExtends, newExtends)); - } - - /** - * - * - * @generated - */ - public Property getParentId() - { - if (parentId != null && parentId.eIsProxy()) - { - InternalEObject oldParentId = (InternalEObject)parentId; - parentId = (Property)eResolveProxy(oldParentId); - if (parentId != oldParentId) - { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId)); - } - } - return parentId; - } - - /** - * - * - * @generated - */ - public Property basicGetParentId() - { - return parentId; - } - - /** - * - * - * @generated - */ - public void setParentId(Property newParentId) - { - Property oldParentId = parentId; - parentId = newParentId; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId)); - } - - /** - * - * - * @generated - */ - public EList getProperties() - { - if (properties == null) - { - properties = new EObjectContainmentEList(Property.class, this, LazyLinkingPackage.TYPE__PROPERTIES); - } - return properties; - } - - /** - * - * - * @generated - */ - public EList getUnresolvedProxyProperty() - { - if (unresolvedProxyProperty == null) - { - unresolvedProxyProperty = new EObjectContainmentEList(UnresolvedProxyProperty.class, this, LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY); - } - return unresolvedProxyProperty; - } - - /** - * - * - * @generated - */ - public EList getSubtypes() - { - if (subtypes == null) - { - subtypes = new EObjectWithInverseResolvingEList(Type.class, this, LazyLinkingPackage.TYPE__SUBTYPES, LazyLinkingPackage.TYPE__EXTENDS); - } - return subtypes; - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { - case LazyLinkingPackage.TYPE__EXTENDS: - if (extends_ != null) - msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs); - return basicSetExtends((Type)otherEnd, msgs); - case LazyLinkingPackage.TYPE__SUBTYPES: - return ((InternalEList)(InternalEList)getSubtypes()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { - case LazyLinkingPackage.TYPE__EXTENDS: - return basicSetExtends(null, msgs); - case LazyLinkingPackage.TYPE__PROPERTIES: - return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs); - case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: - return ((InternalEList)getUnresolvedProxyProperty()).basicRemove(otherEnd, msgs); - case LazyLinkingPackage.TYPE__SUBTYPES: - return ((InternalEList)getSubtypes()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case LazyLinkingPackage.TYPE__NAME: - return getName(); - case LazyLinkingPackage.TYPE__EXTENDS: - if (resolve) return getExtends(); - return basicGetExtends(); - case LazyLinkingPackage.TYPE__PARENT_ID: - if (resolve) return getParentId(); - return basicGetParentId(); - case LazyLinkingPackage.TYPE__PROPERTIES: - return getProperties(); - case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: - return getUnresolvedProxyProperty(); - case LazyLinkingPackage.TYPE__SUBTYPES: - return getSubtypes(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case LazyLinkingPackage.TYPE__NAME: - setName((String)newValue); - return; - case LazyLinkingPackage.TYPE__EXTENDS: - setExtends((Type)newValue); - return; - case LazyLinkingPackage.TYPE__PARENT_ID: - setParentId((Property)newValue); - return; - case LazyLinkingPackage.TYPE__PROPERTIES: - getProperties().clear(); - getProperties().addAll((Collection)newValue); - return; - case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: - getUnresolvedProxyProperty().clear(); - getUnresolvedProxyProperty().addAll((Collection)newValue); - return; - case LazyLinkingPackage.TYPE__SUBTYPES: - getSubtypes().clear(); - getSubtypes().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.TYPE__NAME: - setName(NAME_EDEFAULT); - return; - case LazyLinkingPackage.TYPE__EXTENDS: - setExtends((Type)null); - return; - case LazyLinkingPackage.TYPE__PARENT_ID: - setParentId((Property)null); - return; - case LazyLinkingPackage.TYPE__PROPERTIES: - getProperties().clear(); - return; - case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: - getUnresolvedProxyProperty().clear(); - return; - case LazyLinkingPackage.TYPE__SUBTYPES: - getSubtypes().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.TYPE__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case LazyLinkingPackage.TYPE__EXTENDS: - return extends_ != null; - case LazyLinkingPackage.TYPE__PARENT_ID: - return parentId != null; - case LazyLinkingPackage.TYPE__PROPERTIES: - return properties != null && !properties.isEmpty(); - case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY: - return unresolvedProxyProperty != null && !unresolvedProxyProperty.isEmpty(); - case LazyLinkingPackage.TYPE__SUBTYPES: - return subtypes != null && !subtypes.isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() - { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); - result.append(name); - result.append(')'); - return result.toString(); - } - -} //TypeImpl diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java deleted file mode 100644 index 0bdb251fd..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectEList; - -import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; -import org.eclipse.xtext.linking.lazy.lazyLinking.Type; -import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty; - -/** - * - * An implementation of the model object 'Unresolved Proxy Property'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getType Type}
    • - *
  • {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getName Name}
    • - *
- * - * @generated - */ -public class UnresolvedProxyPropertyImpl extends MinimalEObjectImpl.Container implements UnresolvedProxyProperty -{ - /** - * The cached value of the '{@link #getType() Type}' reference list. - * - * - * @see #getType() - * @generated - * @ordered - */ - protected EList type; - - /** - * The default value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * - * - * @generated - */ - protected UnresolvedProxyPropertyImpl() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return LazyLinkingPackage.Literals.UNRESOLVED_PROXY_PROPERTY; - } - - /** - * - * - * @generated - */ - public EList getType() - { - if (type == null) - { - type = new EObjectEList(Type.class, this, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE); - } - return type; - } - - /** - * - * - * @generated - */ - public String getName() - { - return name; - } - - /** - * - * - * @generated - */ - public void setName(String newName) - { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME, oldName, name)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: - return getType(); - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: - return getName(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: - getType().clear(); - getType().addAll((Collection)newValue); - return; - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: - setName((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: - getType().clear(); - return; - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: - setName(NAME_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE: - return type != null && !type.isEmpty(); - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() - { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); - result.append(name); - result.append(')'); - return result.toString(); - } - -} //UnresolvedProxyPropertyImpl diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java deleted file mode 100644 index 7344d2c49..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java +++ /dev/null @@ -1,193 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.util; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; - -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - -import org.eclipse.emf.ecore.EObject; - -import org.eclipse.xtext.linking.lazy.lazyLinking.*; - -/** - * - * The Adapter Factory for the model. - * It provides an adapter createXXX method for each class of the model. - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage - * @generated - */ -public class LazyLinkingAdapterFactory extends AdapterFactoryImpl -{ - /** - * The cached model package. - * - * - * @generated - */ - protected static LazyLinkingPackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * - * - * @generated - */ - public LazyLinkingAdapterFactory() - { - if (modelPackage == null) - { - modelPackage = LazyLinkingPackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * - * This implementation returns true if the object is either the model's package or is an instance object of the model. - * - * @return whether this factory is applicable for the type of the object. - * @generated - */ - @Override - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { - return true; - } - if (object instanceof EObject) - { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch that delegates to the createXXX methods. - * - * - * @generated - */ - protected LazyLinkingSwitch modelSwitch = - new LazyLinkingSwitch() - { - @Override - public Adapter caseModel(Model object) - { - return createModelAdapter(); - } - @Override - public Adapter caseType(Type object) - { - return createTypeAdapter(); - } - @Override - public Adapter caseProperty(Property object) - { - return createPropertyAdapter(); - } - @Override - public Adapter caseUnresolvedProxyProperty(UnresolvedProxyProperty object) - { - return createUnresolvedProxyPropertyAdapter(); - } - @Override - public Adapter defaultCase(EObject object) - { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the target. - * - * - * @param target the object to adapt. - * @return the adapter for the target. - * @generated - */ - @Override - public Adapter createAdapter(Notifier target) - { - return modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model Model}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model - * @generated - */ - public Adapter createModelAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type Type}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type - * @generated - */ - public Adapter createTypeAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property Property}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property - * @generated - */ - public Adapter createPropertyAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty Unresolved Proxy Property}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty - * @generated - */ - public Adapter createUnresolvedProxyPropertyAdapter() - { - return null; - } - - /** - * Creates a new adapter for the default case. - * - * This default implementation returns null. - * - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() - { - return null; - } - -} //LazyLinkingAdapterFactory diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java deleted file mode 100644 index 3a62e0dfc..000000000 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java +++ /dev/null @@ -1,189 +0,0 @@ -/** - * generated by Xtext - */ -package org.eclipse.xtext.linking.lazy.lazyLinking.util; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.util.Switch; - -import org.eclipse.xtext.linking.lazy.lazyLinking.*; - -/** - * - * The Switch for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the caseXXX method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * - * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage - * @generated - */ -public class LazyLinkingSwitch extends Switch -{ - /** - * The cached model package - * - * - * @generated - */ - protected static LazyLinkingPackage modelPackage; - - /** - * Creates an instance of the switch. - * - * - * @generated - */ - public LazyLinkingSwitch() - { - if (modelPackage == null) - { - modelPackage = LazyLinkingPackage.eINSTANCE; - } - } - - /** - * Checks whether this is a switch for the given package. - * - * - * @param ePackage the package in question. - * @return whether this is a switch for the given package. - * @generated - */ - @Override - protected boolean isSwitchFor(EPackage ePackage) - { - return ePackage == modelPackage; - } - - /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. - * - * - * @return the first non-null result returned by a caseXXX call. - * @generated - */ - @Override - protected T doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { - case LazyLinkingPackage.MODEL: - { - Model model = (Model)theEObject; - T result = caseModel(model); - if (result == null) result = defaultCase(theEObject); - return result; - } - case LazyLinkingPackage.TYPE: - { - Type type = (Type)theEObject; - T result = caseType(type); - if (result == null) result = defaultCase(theEObject); - return result; - } - case LazyLinkingPackage.PROPERTY: - { - Property property = (Property)theEObject; - T result = caseProperty(property); - if (result == null) result = defaultCase(theEObject); - return result; - } - case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY: - { - UnresolvedProxyProperty unresolvedProxyProperty = (UnresolvedProxyProperty)theEObject; - T result = caseUnresolvedProxyProperty(unresolvedProxyProperty); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpreting the object as an instance of 'Model'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Model'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseModel(Model object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Type'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Type'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseType(Type object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Property'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Property'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseProperty(Property object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Unresolved Proxy Property'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Unresolved Proxy Property'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseUnresolvedProxyProperty(UnresolvedProxyProperty object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'EObject'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'EObject'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - @Override - public T defaultCase(EObject object) - { - return null; - } - -} //LazyLinkingSwitch 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 8974a2ca7..55508a9d9 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 @@ -28,7 +28,7 @@ public class IgnoreCaseImportsTestLanguageGrammarAccess extends AbstractGrammarE private final Assignment cElementsAssignment_1 = (Assignment)cGroup.eContents().get(1); private final RuleCall cElementsElementParserRuleCall_1_0 = (RuleCall)cElementsAssignment_1.eContents().get(0); - //Model: + //@ Override Model: // imports+=Import* // elements+=Element+; @Override public ParserRule getRule() { return rule; } @@ -116,7 +116,7 @@ public class IgnoreCaseImportsTestLanguageGrammarAccess extends AbstractGrammarE } - //Model: + //@ Override Model: // imports+=Import* // elements+=Element+; public ModelElements getModelAccess() { 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 64d62cdb1..d3bb921de 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 @@ -28,7 +28,7 @@ public class IgnoreCaseNamespacesTestLanguageGrammarAccess extends AbstractGramm private final Assignment cElementsAssignment_1 = (Assignment)cGroup.eContents().get(1); private final RuleCall cElementsElementParserRuleCall_1_0 = (RuleCall)cElementsAssignment_1.eContents().get(0); - //Model: + //@ Override Model: // imports+=Import* // elements+=Element+; @Override public ParserRule getRule() { return rule; } @@ -116,7 +116,7 @@ public class IgnoreCaseNamespacesTestLanguageGrammarAccess extends AbstractGramm } - //Model: + //@ Override Model: // imports+=Import* // elements+=Element+; public ModelElements getModelAccess() { diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore index 0a3df5edf..7c8bf0ac1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore @@ -3,8 +3,8 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bug301935Test" nsURI="http://eclipse.org/xtext/Bug301935TestLanguage" nsPrefix="bug301935Test"> - - - + + + diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel index d9b265cd6..16f8c8127 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen" modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug301935TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9"> + complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore index e10d7bc00..26c73d74a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore @@ -3,6 +3,6 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bug406914Test" nsURI="http://eclipse.org/xtext/Bug406914TestLanguage" nsPrefix="bug406914Test"> - + diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel index d29f6c765..a7b05d973 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen" modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug406914TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9"> + complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java index b4f962069..fa8149ffe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java @@ -6,6 +6,7 @@ package org.eclipse.xtext.parser.antlr.bug301935Test.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -76,6 +77,9 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T isInited = true; + // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); + // Create package meta-data objects theBug301935TestPackage.createPackageContents(); @@ -191,6 +195,9 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T setNsPrefix(eNS_PREFIX); setNsURI(eNS_URI); + // Obtain other dependent packages + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); + // Create type parameters // Set bounds for type parameters @@ -199,9 +206,9 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T // Initialize classes and features; add operations and parameters initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getModel_Value(), ecorePackage.getEString(), "value", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getModel_Value2(), ecorePackage.getEString(), "value2", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getModel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getModel_Value(), theEcorePackage.getEString(), "value", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getModel_Value2(), theEcorePackage.getEString(), "value2", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java index de87b4a4d..4f2ed1dfe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java @@ -6,6 +6,7 @@ package org.eclipse.xtext.parser.antlr.bug406914Test.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -76,6 +77,9 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T isInited = true; + // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); + // Create package meta-data objects theBug406914TestPackage.createPackageContents(); @@ -169,6 +173,9 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T setNsPrefix(eNS_PREFIX); setNsURI(eNS_URI); + // Obtain other dependent packages + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); + // Create type parameters // Set bounds for type parameters @@ -177,7 +184,7 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T // Initialize classes and features; add operations and parameters initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getModel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g index 681ce9840..1706cb046 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g @@ -15,8 +15,6 @@ Model : ('M'|'m')('O'|'o')('D'|'d')('E'|'e')('L'|'l'); Semicolon : ';'; -// Rules duplicated to allow inter-rule references - RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java index d746bc81f..e706c9288 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java @@ -125,10 +125,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug299237TestLanguageLexer.g:20:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalBug299237TestLanguageLexer.g:20:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalBug299237TestLanguageLexer.g:18:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalBug299237TestLanguageLexer.g:18:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalBug299237TestLanguageLexer.g:20:11: ( '^' )? + // InternalBug299237TestLanguageLexer.g:18:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -137,7 +137,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // InternalBug299237TestLanguageLexer.g:20:11: '^' + // InternalBug299237TestLanguageLexer.g:18:11: '^' { match('^'); @@ -155,7 +155,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { recover(mse); throw mse;} - // InternalBug299237TestLanguageLexer.g:20:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalBug299237TestLanguageLexer.g:18:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -204,10 +204,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug299237TestLanguageLexer.g:22:10: ( ( '0' .. '9' )+ ) - // InternalBug299237TestLanguageLexer.g:22:12: ( '0' .. '9' )+ + // InternalBug299237TestLanguageLexer.g:20:10: ( ( '0' .. '9' )+ ) + // InternalBug299237TestLanguageLexer.g:20:12: ( '0' .. '9' )+ { - // InternalBug299237TestLanguageLexer.g:22:12: ( '0' .. '9' )+ + // InternalBug299237TestLanguageLexer.g:20:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -221,7 +221,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // InternalBug299237TestLanguageLexer.g:22:13: '0' .. '9' + // InternalBug299237TestLanguageLexer.g:20:13: '0' .. '9' { matchRange('0','9'); @@ -253,10 +253,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug299237TestLanguageLexer.g:24:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalBug299237TestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalBug299237TestLanguageLexer.g:22:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalBug299237TestLanguageLexer.g:22:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalBug299237TestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalBug299237TestLanguageLexer.g:22:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -274,10 +274,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } switch (alt6) { case 1 : - // InternalBug299237TestLanguageLexer.g:24:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalBug299237TestLanguageLexer.g:22:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalBug299237TestLanguageLexer.g:24:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalBug299237TestLanguageLexer.g:22:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop4: do { int alt4=3; @@ -293,7 +293,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // InternalBug299237TestLanguageLexer.g:24:21: '\\\\' . + // InternalBug299237TestLanguageLexer.g:22:21: '\\\\' . { match('\\'); matchAny(); @@ -301,7 +301,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } break; case 2 : - // InternalBug299237TestLanguageLexer.g:24:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalBug299237TestLanguageLexer.g:22:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -326,10 +326,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } break; case 2 : - // InternalBug299237TestLanguageLexer.g:24:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalBug299237TestLanguageLexer.g:22:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalBug299237TestLanguageLexer.g:24:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalBug299237TestLanguageLexer.g:22:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -345,7 +345,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // InternalBug299237TestLanguageLexer.g:24:54: '\\\\' . + // InternalBug299237TestLanguageLexer.g:22:54: '\\\\' . { match('\\'); matchAny(); @@ -353,7 +353,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } break; case 2 : - // InternalBug299237TestLanguageLexer.g:24:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalBug299237TestLanguageLexer.g:22:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -396,12 +396,12 @@ public class InternalBug299237TestLanguageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug299237TestLanguageLexer.g:26:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalBug299237TestLanguageLexer.g:26:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalBug299237TestLanguageLexer.g:24:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalBug299237TestLanguageLexer.g:24:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalBug299237TestLanguageLexer.g:26:24: ( options {greedy=false; } : . )* + // InternalBug299237TestLanguageLexer.g:24:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -426,7 +426,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // InternalBug299237TestLanguageLexer.g:26:52: . + // InternalBug299237TestLanguageLexer.g:24:52: . { matchAny(); @@ -456,12 +456,12 @@ public class InternalBug299237TestLanguageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug299237TestLanguageLexer.g:28:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalBug299237TestLanguageLexer.g:28:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalBug299237TestLanguageLexer.g:26:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalBug299237TestLanguageLexer.g:26:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalBug299237TestLanguageLexer.g:28:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalBug299237TestLanguageLexer.g:26:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -474,7 +474,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // InternalBug299237TestLanguageLexer.g:28:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalBug299237TestLanguageLexer.g:26:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -494,7 +494,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } } while (true); - // InternalBug299237TestLanguageLexer.g:28:40: ( ( '\\r' )? '\\n' )? + // InternalBug299237TestLanguageLexer.g:26:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -503,9 +503,9 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // InternalBug299237TestLanguageLexer.g:28:41: ( '\\r' )? '\\n' + // InternalBug299237TestLanguageLexer.g:26:41: ( '\\r' )? '\\n' { - // InternalBug299237TestLanguageLexer.g:28:41: ( '\\r' )? + // InternalBug299237TestLanguageLexer.g:26:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -514,7 +514,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // InternalBug299237TestLanguageLexer.g:28:41: '\\r' + // InternalBug299237TestLanguageLexer.g:26:41: '\\r' { match('\r'); @@ -546,10 +546,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug299237TestLanguageLexer.g:30:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalBug299237TestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalBug299237TestLanguageLexer.g:28:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalBug299237TestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalBug299237TestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalBug299237TestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -603,8 +603,8 @@ public class InternalBug299237TestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug299237TestLanguageLexer.g:32:16: ( . ) - // InternalBug299237TestLanguageLexer.g:32:18: . + // InternalBug299237TestLanguageLexer.g:30:16: ( . ) + // InternalBug299237TestLanguageLexer.g:30:18: . { matchAny(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g index 77779aa45..53918e4d2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g @@ -15,8 +15,6 @@ LineFeed : '\n'; CarriageReturn : '\r'; -// Rules duplicated to allow inter-rule references - RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_WS : (' '|'\t')+; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java index 6ddd72454..23786670a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java @@ -77,10 +77,10 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug301935ExTestLanguageLexer.g:20:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalBug301935ExTestLanguageLexer.g:20:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalBug301935ExTestLanguageLexer.g:18:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalBug301935ExTestLanguageLexer.g:18:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalBug301935ExTestLanguageLexer.g:20:11: ( '^' )? + // InternalBug301935ExTestLanguageLexer.g:18:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -89,7 +89,7 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // InternalBug301935ExTestLanguageLexer.g:20:11: '^' + // InternalBug301935ExTestLanguageLexer.g:18:11: '^' { match('^'); @@ -107,7 +107,7 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer { recover(mse); throw mse;} - // InternalBug301935ExTestLanguageLexer.g:20:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalBug301935ExTestLanguageLexer.g:18:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -156,10 +156,10 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug301935ExTestLanguageLexer.g:22:9: ( ( ' ' | '\\t' )+ ) - // InternalBug301935ExTestLanguageLexer.g:22:11: ( ' ' | '\\t' )+ + // InternalBug301935ExTestLanguageLexer.g:20:9: ( ( ' ' | '\\t' )+ ) + // InternalBug301935ExTestLanguageLexer.g:20:11: ( ' ' | '\\t' )+ { - // InternalBug301935ExTestLanguageLexer.g:22:11: ( ' ' | '\\t' )+ + // InternalBug301935ExTestLanguageLexer.g:20:11: ( ' ' | '\\t' )+ int cnt3=0; loop3: do { @@ -213,8 +213,8 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalBug301935ExTestLanguageLexer.g:24:16: ( . ) - // InternalBug301935ExTestLanguageLexer.g:24:18: . + // InternalBug301935ExTestLanguageLexer.g:22:16: ( . ) + // InternalBug301935ExTestLanguageLexer.g:22:18: . { matchAny(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSemanticSequencer.java similarity index 96% rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java rename to org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSemanticSequencer.java index 63f8feb28..3d887bf8e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSemanticSequencer.java @@ -19,7 +19,7 @@ import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequence import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient; @SuppressWarnings("all") -public class Bug301935TestLanguageSemanticSequencer extends AbstractDelegatingSemanticSequencer { +public abstract class AbstractBug301935TestLanguageSemanticSequencer extends AbstractDelegatingSemanticSequencer { @Inject private Bug301935TestLanguageGrammarAccess grammarAccess; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSyntacticSequencer.java similarity index 95% rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java rename to org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSyntacticSequencer.java index 0a8b5ff90..05a644813 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSyntacticSequencer.java @@ -15,7 +15,7 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer; @SuppressWarnings("all") -public class Bug301935TestLanguageSyntacticSequencer extends AbstractSyntacticSequencer { +public abstract class AbstractBug301935TestLanguageSyntacticSequencer extends AbstractSyntacticSequencer { protected Bug301935TestLanguageGrammarAccess grammarAccess; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtextbin index a1d146b493a9cdcc479e1cad6dbd2719ca46eb06..32066217e3772e8aaa40f80351c78c14762271a7 100644 GIT binary patch delta 46 xcmX>ib3|qXFFPaWWIpx-jGUX#v!7uCa^`SN267CzcQOL0S3H_PYO)BQ0RTi;46FbE delta 46 xcmX>ib3|qXFFPa0WIpx-j2xTKv!7uCa^`SN267CzcQOL0S3H_PYO)BQ0RThQ45k18 diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtextbin index 6a3a42c466398b1e8ecd85b00edc28312bb87411..14b3887cac882ae837351cb92da46a34e72fd56b 100644 GIT binary patch delta 46 xcmX>idqj4FA3G!GWPkPpjGUVVILidqj4FA3Gz*WPkPpj2xQS^wMi5 zm%fDW;4}ChK7zaH&kViUJ-hpTyZd$XXYk+P@2E_wxaGP{-}0TNdm=7FG-meSLb=wF zZ4}RJ&vR;aV94o(aS%f0vvLBYP*R7;70^{=5;PI7T3*d@t%l>bL`I1{xC%-|u0br= zm!s_|(3G%1(>&*(?oadU9N;>{)D8Ac&}P`~0L-$j0Ney6#GF#MsAi61gif+0+--{8 zVV`h!*%B_rwgPEN-D5Wm+C1AupkEvA)8vtSp)41|(H{sgAoNr!mv?=LJcQWA1(NDf zm*a7dW045-&2lMUSd~k?^`Fp=@+oVu%ym=ntTVODP)s6na2L>QL)_SM8Z{OP0H1@Q zaD}m$?Uv*^c$yVobX{C!VqD|rEMUG%jW0v)S6$#b#0j&(jD?V~*iF3d;F$4EyYDBk zM2o~W*DEW(-eo?jzE%bqo zfe#=7xZ6QcX#tzl^41>B^o64j(9E_2!$#?} zVXs(?hEg7RcnFt-QTA-R(5%@KzjRRzAqQkEmFi_6f=6K=7lu^$U1(xi$0iJ`acXc( zLeS0;{7M1z_)_wPY$)zYe@(wkatxoeT)%GnPIakM!8)G85bJDI>vSTX?P@YfZu0z`Dlb#2^^hx7z1U;^R|FM;v$N&HU delta 963 zcmYjP(Nfb;5M}SpO(re1I1J-BsAyFXP>ZN2D6+M!r3wX06+yJdHqdBDAq2I)^c$S~ zh!6gOFMf`n;BL}(%tLmw_nfo4C--mqclu{Sh6^%tZXAS=<$}BbQYdMFb`cDvT?*TB ztUCcpX_q09&bKVzY6P}lwY&pcDc9Z)u7IwD1-kA#2dyB(U*7?)LPA~RJO}!9j=KPp z9P0p6poExF>IPw^xkl_6j>Ma#+D*=hcZ(zOy0ZpH z8vULSL&C^ri)AkW?LH*LaKrMOj%T?}&=Iq0p(pX6FY%BBjICO=Tq()L{`yO_vwXxJ zJnk|u1IzK)@(C5?3fJ}k5t8P%<2Jbk0Or6{_>`%b?;#2?n+C;VFU4o9izWV?0$lA0 zW0{rld5`!4lEhg9v#W4DlC1PjHew=6ZVu8EzN9^pTWj_F#`=1Z{J?5|8Qh8*)(9-K zS-@9d@*lw0k?b~WBmm!VOtIF}4H>$YITWXZhcx=Q(! zp#v#lvUa82v?YG(u|5kqB$L@}{{%F2qdtd_R?$GZST@ju5j9Q?+GG$}q2Un~@R%=9 zxl)Ks_Xq2ru-|7-I$qGS1E;YRBiP>n((J$4XwlX2ZBLi8B!0?T4jq5t}Ec{sD|Lm}CF| diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g index aad7245d4..b5345a63c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g @@ -11,8 +11,6 @@ package org.eclipse.xtext.parser.indentation.parser.antlr.lexer; import org.eclipse.xtext.parser.antlr.Lexer; } -// Rules duplicated to allow inter-rule references - RULE_SL_COMMENT : '//' ~(('\n'|'\r'))*; fragment RULE_INDENT : ; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java index 1d0d85821..cb793940b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java @@ -41,12 +41,12 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalIndentationAwareTestLanguageLexer.g:16:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ) - // InternalIndentationAwareTestLanguageLexer.g:16:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* + // InternalIndentationAwareTestLanguageLexer.g:14:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ) + // InternalIndentationAwareTestLanguageLexer.g:14:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* { match("//"); - // InternalIndentationAwareTestLanguageLexer.g:16:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalIndentationAwareTestLanguageLexer.g:14:24: (~ ( ( '\\n' | '\\r' ) ) )* loop1: do { int alt1=2; @@ -59,7 +59,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { switch (alt1) { case 1 : - // InternalIndentationAwareTestLanguageLexer.g:16:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalIndentationAwareTestLanguageLexer.g:14:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -93,8 +93,8 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { // $ANTLR start "RULE_INDENT" public final void mRULE_INDENT() throws RecognitionException { try { - // InternalIndentationAwareTestLanguageLexer.g:18:22: () - // InternalIndentationAwareTestLanguageLexer.g:18:24: + // InternalIndentationAwareTestLanguageLexer.g:16:22: () + // InternalIndentationAwareTestLanguageLexer.g:16:24: { } @@ -107,8 +107,8 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { // $ANTLR start "RULE_DEDENT" public final void mRULE_DEDENT() throws RecognitionException { try { - // InternalIndentationAwareTestLanguageLexer.g:20:22: () - // InternalIndentationAwareTestLanguageLexer.g:20:24: + // InternalIndentationAwareTestLanguageLexer.g:18:22: () + // InternalIndentationAwareTestLanguageLexer.g:18:24: { } @@ -123,10 +123,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalIndentationAwareTestLanguageLexer.g:22:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalIndentationAwareTestLanguageLexer.g:22:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalIndentationAwareTestLanguageLexer.g:20:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalIndentationAwareTestLanguageLexer.g:20:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalIndentationAwareTestLanguageLexer.g:22:11: ( '^' )? + // InternalIndentationAwareTestLanguageLexer.g:20:11: ( '^' )? int alt2=2; int LA2_0 = input.LA(1); @@ -135,7 +135,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { } switch (alt2) { case 1 : - // InternalIndentationAwareTestLanguageLexer.g:22:11: '^' + // InternalIndentationAwareTestLanguageLexer.g:20:11: '^' { match('^'); @@ -153,7 +153,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { recover(mse); throw mse;} - // InternalIndentationAwareTestLanguageLexer.g:22:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalIndentationAwareTestLanguageLexer.g:20:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop3: do { int alt3=2; @@ -202,10 +202,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalIndentationAwareTestLanguageLexer.g:24:10: ( ( '0' .. '9' )+ ) - // InternalIndentationAwareTestLanguageLexer.g:24:12: ( '0' .. '9' )+ + // InternalIndentationAwareTestLanguageLexer.g:22:10: ( ( '0' .. '9' )+ ) + // InternalIndentationAwareTestLanguageLexer.g:22:12: ( '0' .. '9' )+ { - // InternalIndentationAwareTestLanguageLexer.g:24:12: ( '0' .. '9' )+ + // InternalIndentationAwareTestLanguageLexer.g:22:12: ( '0' .. '9' )+ int cnt4=0; loop4: do { @@ -219,7 +219,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // InternalIndentationAwareTestLanguageLexer.g:24:13: '0' .. '9' + // InternalIndentationAwareTestLanguageLexer.g:22:13: '0' .. '9' { matchRange('0','9'); @@ -251,10 +251,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalIndentationAwareTestLanguageLexer.g:26:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalIndentationAwareTestLanguageLexer.g:26:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalIndentationAwareTestLanguageLexer.g:24:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalIndentationAwareTestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalIndentationAwareTestLanguageLexer.g:26:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalIndentationAwareTestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt7=2; int LA7_0 = input.LA(1); @@ -272,10 +272,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { } switch (alt7) { case 1 : - // InternalIndentationAwareTestLanguageLexer.g:26:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalIndentationAwareTestLanguageLexer.g:24:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalIndentationAwareTestLanguageLexer.g:26:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalIndentationAwareTestLanguageLexer.g:24:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop5: do { int alt5=3; @@ -291,7 +291,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // InternalIndentationAwareTestLanguageLexer.g:26:21: '\\\\' . + // InternalIndentationAwareTestLanguageLexer.g:24:21: '\\\\' . { match('\\'); matchAny(); @@ -299,7 +299,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { } break; case 2 : - // InternalIndentationAwareTestLanguageLexer.g:26:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalIndentationAwareTestLanguageLexer.g:24:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -324,10 +324,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { } break; case 2 : - // InternalIndentationAwareTestLanguageLexer.g:26:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalIndentationAwareTestLanguageLexer.g:24:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalIndentationAwareTestLanguageLexer.g:26:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalIndentationAwareTestLanguageLexer.g:24:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop6: do { int alt6=3; @@ -343,7 +343,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { switch (alt6) { case 1 : - // InternalIndentationAwareTestLanguageLexer.g:26:54: '\\\\' . + // InternalIndentationAwareTestLanguageLexer.g:24:54: '\\\\' . { match('\\'); matchAny(); @@ -351,7 +351,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { } break; case 2 : - // InternalIndentationAwareTestLanguageLexer.g:26:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalIndentationAwareTestLanguageLexer.g:24:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -394,12 +394,12 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalIndentationAwareTestLanguageLexer.g:28:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalIndentationAwareTestLanguageLexer.g:28:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalIndentationAwareTestLanguageLexer.g:26:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalIndentationAwareTestLanguageLexer.g:26:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalIndentationAwareTestLanguageLexer.g:28:24: ( options {greedy=false; } : . )* + // InternalIndentationAwareTestLanguageLexer.g:26:24: ( options {greedy=false; } : . )* loop8: do { int alt8=2; @@ -424,7 +424,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // InternalIndentationAwareTestLanguageLexer.g:28:52: . + // InternalIndentationAwareTestLanguageLexer.g:26:52: . { matchAny(); @@ -454,10 +454,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalIndentationAwareTestLanguageLexer.g:30:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalIndentationAwareTestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalIndentationAwareTestLanguageLexer.g:28:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalIndentationAwareTestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalIndentationAwareTestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalIndentationAwareTestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt9=0; loop9: do { @@ -511,8 +511,8 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalIndentationAwareTestLanguageLexer.g:32:16: ( . ) - // InternalIndentationAwareTestLanguageLexer.g:32:18: . + // InternalIndentationAwareTestLanguageLexer.g:30:16: ( . ) + // InternalIndentationAwareTestLanguageLexer.g:30:18: . { matchAny(); 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 12581b432..b521331d8 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 @@ -158,7 +158,7 @@ public class IndentationAwareTestLanguageGrammarAccess extends AbstractGrammarEl return getTreeNodeAccess().getRule(); } - //terminal SL_COMMENT: + //@ Override terminal SL_COMMENT: // '//' !('\n' | '\r')*; public TerminalRule getSL_COMMENTRule() { return tSL_COMMENT; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g index 912e2e76d..b27d34bce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g @@ -125,7 +125,7 @@ ruleModel returns [EObject current=null] ( lv_forth_3_0='\\' { - newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthReverseSolidusKeyword_3_0()); + newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthBackslashKeyword_3_0()); } { if ($current==null) { diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java index de816535d..d38b353f7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java @@ -282,7 +282,7 @@ public class InternalKeywordsTestLanguageParser extends AbstractInternalAntlrPar { lv_forth_3_0=(Token)match(input,14,FollowSets000.FOLLOW_2); - newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthReverseSolidusKeyword_3_0()); + newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthBackslashKeyword_3_0()); if (current==null) { 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 72eefcd22..5bd4224b7 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 @@ -30,7 +30,7 @@ public class KeywordsTestLanguageGrammarAccess extends AbstractGrammarElementFin private final Assignment cThirdAssignment_2 = (Assignment)cAlternatives.eContents().get(2); private final Keyword cThirdBarKeyword_2_0 = (Keyword)cThirdAssignment_2.eContents().get(0); private final Assignment cForthAssignment_3 = (Assignment)cAlternatives.eContents().get(3); - private final Keyword cForthReverseSolidusKeyword_3_0 = (Keyword)cForthAssignment_3.eContents().get(0); + private final Keyword cForthBackslashKeyword_3_0 = (Keyword)cForthAssignment_3.eContents().get(0); private final Assignment cFifthAssignment_4 = (Assignment)cAlternatives.eContents().get(4); private final Keyword cFifthAKeyword_4_0 = (Keyword)cFifthAssignment_4.eContents().get(0); private final Assignment cSixthAssignment_5 = (Assignment)cAlternatives.eContents().get(5); @@ -71,7 +71,7 @@ public class KeywordsTestLanguageGrammarAccess extends AbstractGrammarElementFin public Assignment getForthAssignment_3() { return cForthAssignment_3; } //"\\" - public Keyword getForthReverseSolidusKeyword_3_0() { return cForthReverseSolidusKeyword_3_0; } + public Keyword getForthBackslashKeyword_3_0() { return cForthBackslashKeyword_3_0; } //fifth?="\"a\"" public Assignment getFifthAssignment_4() { return cFifthAssignment_4; } diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtextbin index 45f027ae775efe8024628f74fd698b00684c1585..49e0b5b77a84bc9f1fc29a06a9f59d8fd41bb88e 100644 GIT binary patch delta 111 zcmaE(K2u}Eadt+I%_rEy7#TSx%X4Z0IbNKzK%A#sAAp=|+<)2KSa}lj^72a(OEUBG zikTeC7{$09;Q~yod5O8Hoc?90MMaq@sf>({OpaWRLXPr|CXV)w-j2zRVvfp;Ow5b` DqdOn} delta 43 vcmbQK@kV{aadt-b%_rEy7#Z0o%X4Z0IbNKzK%A#sAAp=|+<)08iAVwfF3Sz0 diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtextbin index 53527338e542f9e7b5dc424d1e98d064161d24f5..8e8e945e1edac86894346b9f3cd717625d37076f 100644 GIT binary patch delta 40 rcmbO(JzaW3Gdm;4<`(uaMn;aww>h+c95&8bAkIRr4?xZ&ZdN7$>njT5 delta 40 rcmbO(JzaW3Gdm;u<`(uaMn?9@w>h+c95&8bAkIRr4?xZ&ZdN7$>dgw? diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtextbin index e803423bb23c3d0aee916b07d9e6ad173dc3f02a..80736e3c299bdd203f03efd9f9bb59cba4db5bc0 100644 GIT binary patch delta 1535 zcmZvcM^IBy6ox(Tl0p-80LQVgVDCr~b)lZPbDWWd8^>{zNuC(Q#7P((Y_X$a!-&22 zE@Hvn6)X0Jy?3x+ujiiJ7lY5NGI{s^?)RVja_d`Fv@Wl;fjv}b>yMTMr`PK%bQXGi z-hhTfAtl}s`9ZUIodfmQ+`+ov?{Vv3*RTkz8V-YG`X+EVq=xeCZGt1fW)V0NtQL`; z2^fSVOKiZUd!2rd&#HB{;V5WgL7kGLRdNiZLQJB|Sx}(6yA}1MT|j!mix6hWK_Lc`ty`$G&)qKvhl#~&!X@nPyixsW_8>X&`4&DrXUbJs|lE;d> z2yP4LE}z%UXSAyA$9swmohloREa7=$hFAPe#=|#h}xWL^F?WamJ{8R#iSHD_4grpKnl+UaV@_ z@Pb@fE%2hz5HB(OvdQX-gcnofs*KRPcr6mSP9&{s^Z)^GFy4uKo2V}gk(Wy3m7>08 z!W&bd*3hU^8gC=!@BS4D(%*Oo z^d@j5B$k$YJJ_SZbPF5}9=AyD3^)ej-A(iSR*o-}mFqEjnrK5SH(I0|tCZs)5nOS8 zUodC|dKdQd4YNQ#IG#xpn3M`QQ6o)~q#}qjnhj73Itv>ogD`NQz)W!A6w-KxWQFqb zdG%B&C?-LRK7szBzE)vDZYUsd8Yw)&OY_sgP3C9NVgqN=VsCbM20SB|JpgG7V#0+w^&`5ZV6 zaDf(hAqOV$A|+l-)yW5!fGL^}4_N^_%kRs#0zd(lGHw~;x&SWMa4Q_#N`+e$@dCJ- zh?25~DQlV16>yzKS?^FbNQzC7HY!(un^?S=#oYk6XyUC>ToHZ3RDqRI7u?1dse<@$ zJSSb$QMXG(F_p4|_fz{jW&71J+s9pG!OXM#xj6y;BzBXx$d&mz)$%%fB&%BB-bf?3 zkF)IOEZqSQXju+QBX$L;4=MFw=R8MPdz7_30FQB~;~L?FB-BK=ktXnDR2!$5bDG+K zMk&rX9h|l0YU<#e?4UMw2j?4QrjNH)M!q1GwE{0Xk?|65yR6x~BDWQhy`n1xyuqBCwAGcI(h2Yu$G@#{?{IwL-c?raMY#7F@j#P2bgVp5R_w>&&hbeM zBTt#~ENmnN@HrcKp;2EtMqVi+uNCwS1Kw(acaDuZ?w=~Dk63>n!^j8bd<+|*zvL%2 z(x7oaJ4U`JBVUz~Zw&aZ34WwIPJXIFeksLo-G=;e48z#951Qtuh2z(1wgE!!pG XU-{K#2pkNq^d^!y$duz27y|wQZgNv~ diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtextbin index e5aa5bd723d60329c586b357b29b9cebb09455ff..4c65fcf962741e563d64325770e443f8d47eec20 100644 GIT binary patch delta 135 zcmeySvsib-33f(~%_rHz7#TSxD{yK7Io_PJK%8e>AAp?e-2Ti!N}b;sB$h1@1>_tP z_yFW=-Y#SZqP__iGTE^5BC=I0eNIbLCu;C6%yFtO$(=B9G`m!%dJWu~Mu UGCDFjsyZe+wmNDuGBGm(0KJDNNdN!< delta 90 zcmZ3i`%P!V33f*I%_rHz7#Z0oD{yK7Io_PJK%8e>AAp?e-2Ti!N}b;sB$h1@1>_tP i_yFW=-Y#SZqP__iGVwDyGC8U`COft|YBDl0GXemtQy2>X 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 9bebc5d32..8901fc6be 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 @@ -99,7 +99,7 @@ public class NoParametersTestLanguageGrammarAccess extends AbstractGrammarElemen private final RuleCall cScenarioScenario2_FalseParserRuleCall_1_11_1_1_0_0 = (RuleCall)cScenarioAssignment_1_11_1_1_0.eContents().get(0); private final Keyword cKeywordKeyword_1_11_1_1_1 = (Keyword)cGroup_1_11_1_1.eContents().get(1); - //ParserRuleParameters: + //@ Override ParserRuleParameters: // {ParserRuleParameters} ('#1' scenario=Scenario1_True // | '#2' scenario=Scenario1_False // | '#3' scenario=Scenario2_True @@ -602,7 +602,7 @@ public class NoParametersTestLanguageGrammarAccess extends AbstractGrammarElemen } - //ParserRuleParameters: + //@ Override ParserRuleParameters: // {ParserRuleParameters} ('#1' scenario=Scenario1_True // | '#2' scenario=Scenario1_False // | '#3' scenario=Scenario2_True 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 c0f68bd92..e3aa455ad 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 @@ -22,7 +22,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.ParametersTestLanguageEx.ParserRuleParameters"); private final RuleCall cParserRuleParametersParserRuleCall = (RuleCall)rule.eContents().get(1); - //ParserRuleParameters: + //@ Override ParserRuleParameters: // super::ParserRuleParameters; @Override public ParserRule getRule() { return rule; } @@ -33,7 +33,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.ParametersTestLanguageEx.Scenario1"); private final RuleCall cScenario1ParserRuleCall = (RuleCall)rule.eContents().get(1); - //Scenario1 ; @Override public ParserRule getRule() { return rule; } @@ -93,7 +93,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen } - //ParserRuleParameters: + //@ Override ParserRuleParameters: // super::ParserRuleParameters; public ParserRuleParametersElements getParserRuleParametersAccess() { return pParserRuleParameters; @@ -103,7 +103,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen return getParserRuleParametersAccess().getRule(); } - //Scenario1 ; public Scenario1Elements getScenario1Access() { return pScenario1; 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 106c6355e..ec8f4906c 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 @@ -99,7 +99,7 @@ public class TwoParametersTestLanguageGrammarAccess extends AbstractGrammarEleme private final RuleCall cScenarioScenario6ParserRuleCall_1_11_1_1_0_0 = (RuleCall)cScenarioAssignment_1_11_1_1_0.eContents().get(0); private final Keyword cKeywordKeyword_1_11_1_1_1 = (Keyword)cGroup_1_11_1_1.eContents().get(1); - //ParserRuleParameters: + //@ Override ParserRuleParameters: // {ParserRuleParameters} ('#1' scenario=Scenario5 | '#2' scenario=Scenario5 | '#3' // scenario=Scenario6 | '#4' scenario=Scenario6 | => ('#5' scenario=Scenario6) | => // ('#6' scenario=Scenario6) | '#7' scenario=Scenario7 | '#8' scenario=Scenario7 | @@ -523,7 +523,7 @@ public class TwoParametersTestLanguageGrammarAccess extends AbstractGrammarEleme } - //ParserRuleParameters: + //@ Override ParserRuleParameters: // {ParserRuleParameters} ('#1' scenario=Scenario5 | '#2' scenario=Scenario5 | '#3' // scenario=Scenario6 | '#4' scenario=Scenario6 | => ('#5' scenario=Scenario6) | => // ('#6' scenario=Scenario6) | '#7' scenario=Scenario7 | '#8' scenario=Scenario7 | diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtextbin index 620c4c6986d010e843736c1668dcb2fe8db70299..31d2c178216e12471b1d22d09f28ebecae8e9b49 100644 GIT binary patch delta 71 zcmdnWwUujwKMNz<vcwTS=CkG?jWG;@Q03QAW^8f$< delta 13 UcmX>vcwTS=CkG?zWG;@Q03P`R@&Et; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtextbin index c0cece036af9c74282ca5637cb1e383269b71f34..02141e5179fd683b5d9d307b76d40d6ce47c8dd7 100644 GIT binary patch delta 13 UcmdnYznOo7Av+`6WFz)Q03DqJ!2kdN delta 13 UcmdnYznOo7Av+`MWFz)Q03DbEzyJUM diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtextbin index e2d2794c9b83eda827231bf5309cf3a6ef5cca56..cc34b656ebc9b983ee33e94b9ce42a19f6d10712 100644 GIT binary patch delta 73 zcmbOsG(%{EIg2=(NJ?s2W?pKsM`lV&YFPx# diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtextbin index 516cb4205908eacdfbb53bcc8e183630a9e03da8..004a19a68651295f6dbd4860053eb9ddfb1ab211 100644 GIT binary patch delta 21 bcmcaAa8+Q#2^L1S%_muU7=ct6+kZv?S-S^u delta 21 bcmcaAa8+Q#2^L1y%_muU7=ct6+kZv?S*QnZ diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java index 5ec959dac..314f9f85a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java @@ -62,14 +62,14 @@ public class ExUnorderedGroupsTestLanguageSyntacticSequencer extends AbstractSyn /** * Ambiguous syntax: * ( - * '10' | - * '11' | - * '3' | - * '7' | - * 'bug302585' | + * '5' | * '6' | + * '3' | + * '11' | + * '7' | * '4' | - * '5' + * '10' | + * 'bug302585' * ) * * This ambiguous syntax occurs at: diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java index bcc6faf95..54a266491 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java @@ -63,13 +63,13 @@ public class SimpleUnorderedGroupsTestLanguageSyntacticSequencer extends Abstrac * Ambiguous syntax: * ( * '3' | - * '7' | - * 'bug302585' | - * '4' | * '5' | - * '10' | * '11' | - * '6' + * '4' | + * '10' | + * 'bug302585' | + * '6' | + * '7' * ) * * This ambiguous syntax occurs at: diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtextbin index d19f94f96d348c44bf37a9dc2bf3e3aed73512e8..8fa867f3bcfbb5c32075ee6e72f6b68b95b0d414 100644 GIT binary patch delta 42 ycmeyb^j~QMC$Bi0NJ?s2W?pKsM`lV&YFAF_aY>mqye*lD#rCE6uq);*f+BJwMZ4h)JW|Y{3Ay7)Y4)IiB*Km!7XS!9x*)f%} z&28@n=t>x%>#nu4>)qtjIlwT))h)((&~LL{2N+>n2graDVnnGslru^`pXp;9Bx07F zcNr7$9$O-gv#rAfg(ewN{65=h;BSh$*GlD@d=Rw%P>3E8$!3cs#{+E|;v&&7+@|Fi zw&k6PjCvGGJnl&NPe>uMT&tGKb28W2!BZMq&hR1-Idc#&-)>yuGjdBTuzLe=7821_ z%WiTR04zdO;d5r=T$nN67NBOa6heFvNWY|`FNOgZI@*hYb~$8LAVH*8EV&d&R>QzD z+hLv`Yh9Sc*EC9ed7)mYEG`ylC%Dp?2UmlFZzx%2vw&+5Le0i;2sm&Lw5{+)9EpD1f*nni~mrCnR0X=f6wFH-2 zf7PTkp|6$J)6s2WU_;_gtEdmjT}ZX|^;zG7{%G~YHVcMrE9DZxJ?Im?McX_u9Z%wZ zNVA3PkukdIb^tUy2zKW{N(HZ67r6)?LchWz5{RxCu4Qc5ro<23R^5PcOgRI99#8C# z(8wpju1|T|F~E;(M`(yAQ!0t0#rlMSWxg1^%wHu zXZRa_f$JzQweW?a_CB|RJ|Rk0?-r^hVmk&XU&Z1h5`3VGfhebai-_;8T5l@ zTi$b#_k2@XL>G$|#PUUCx!61?3HHnQwA7|aD)S^=OLLXn!u))mS3)maOr+J@kaXt*KxisYL0> zb90X88RIjfDw3)*@3{wVt*+^9Q}#~j4sG*AHx3XZFWTJ!dW@+#2d<^EajGF@=#UK( z%Z^`lwmetU`*y1zB8AU6Y0yWRI2hoO>(Q={WZGfSvEUG|Me_v!j=>4F delta 27 jcmbOeIwy3)Y86I~&1+Q7Ffy`lu2i#PW@MkdMe_v!j-3gz diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin index 0181d44619fddde7b56b45d4531242b5d192baec..febc228c47d89f4d06799636f3088ac45bc73378 100644 GIT binary patch delta 13 VcmbQOJ6m_dGEqj($;(B*001NS1xWw^ delta 13 VcmbQOJ6m_dGEqj3$;(B*001NN1xNq@ diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 index bdf8d24bb..d58baa1d5 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 @@ -34,10 +34,12 @@ Workflow { registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel" registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/enumrules/enums.genmodel" registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel" + registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel" registerGenModelFile = "platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel" registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel" registerGeneratedEPackage = "org.eclipse.xtext.grammarinheritance.ametamodel.AmetamodelPackage" + registerGeneratedEPackage = "org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage" registerGeneratedEPackage = "org.eclipse.xtext.XtextPackage" registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage" } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 index b83617d8f..139b7b892 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 @@ -103,6 +103,7 @@ Workflow { } language = { grammarUri = "classpath:/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext" + referencedResource = "platform:/resource/${projectName}/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel" fragment = junit.Junit4Fragment2 { generateStub = false } diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java index 7fc1341c9..5948ac671 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java @@ -46,7 +46,7 @@ public class Bug443705Test { } } - public static class Bug443705StandaloneSetup extends LazyLinkingTestLanguageStandaloneSetupGenerated { + public static class Bug443705StandaloneSetup extends LazyLinkingTestLanguageStandaloneSetup { @Override public Injector createInjector() { return Guice.createInjector(new Bug443705RuntimeModule()); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore similarity index 100% rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel similarity index 99% rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel index 469481333..9382cb610 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel @@ -1,6 +1,6 @@ diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext index 4983620a8..315e8e281 100755 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext @@ -7,7 +7,7 @@ *******************************************************************************/ grammar org.eclipse.xtext.linking.lazy.LazyLinkingTestLanguage with org.eclipse.xtext.common.Terminals -generate lazyLinking "http://eclipse.org/xtext/lazyLinkingTestLanguage" +import "http://eclipse.org/xtext/lazyLinkingTestLanguage" Model : types+=Type*; diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext deleted file mode 100644 index 20c68c437..000000000 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext +++ /dev/null @@ -1,27 +0,0 @@ -process(xtext::GeneratedMetamodel this) : - process(ePackage) -; - -process(ecore::EPackage this) : - eClassifiers.process() -; - -process(ecore::EClassifier this) : - null -; - -process(ecore::EClass this) : - if (this.name == 'UnresolvedProxyProperty') then ( - ((ecore::EReference) this.getEStructuralFeature('type')).setResolveProxies(false) - ) else if (this.name == 'Type') then ( - ((ecore::EReference) this.getEStructuralFeature('extends')).defineOpposite('subtypes', -1) - ) -; - -defineOpposite(ecore::EReference this, String name, Integer upperBound) : - let opp = new ecore::EReference : - opp.setName(name) -> opp.setEType(eContainingClass) -> - setEOpposite(opp) -> opp.setEOpposite(this) -> - eReferenceType.eStructuralFeatures.add(opp) -> - opp.setUpperBound(upperBound) -; diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java index 572c0ab7d..44cb4c473 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java @@ -1,14 +1,26 @@ - package org.eclipse.xtext.linking.lazy; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage; + +import com.google.inject.Injector; + /** * Initialization support for running Xtext languages * without equinox extension registry */ -public class LazyLinkingTestLanguageStandaloneSetup extends LazyLinkingTestLanguageStandaloneSetupGenerated{ +public class LazyLinkingTestLanguageStandaloneSetup extends LazyLinkingTestLanguageStandaloneSetupGenerated { public static void doSetup() { new LazyLinkingTestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration(); } + + @Override + public void register(Injector injector) { + super.register(injector); + if (!EPackage.Registry.INSTANCE.containsKey("http://eclipse.org/xtext/lazyLinkingTestLanguage")) { + EPackage.Registry.INSTANCE.put("http://eclipse.org/xtext/lazyLinkingTestLanguage", LazyLinkingPackage.eINSTANCE); + } + } + } - diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java new file mode 100644 index 000000000..ae137e1ea --- /dev/null +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java @@ -0,0 +1,8 @@ +/* + * generated by Xtext + */ +package org.eclipse.xtext.parser.antlr.serializer; + + +public class Bug301935TestLanguageSemanticSequencer extends AbstractBug301935TestLanguageSemanticSequencer { +} diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java new file mode 100644 index 000000000..415ec7e9b --- /dev/null +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java @@ -0,0 +1,8 @@ +/* + * generated by Xtext + */ +package org.eclipse.xtext.parser.antlr.serializer; + + +public class Bug301935TestLanguageSyntacticSequencer extends AbstractBug301935TestLanguageSyntacticSequencer { +} diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java index 1236658e6..06005b43b 100755 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java @@ -32,7 +32,7 @@ public class GrammarAccessTest extends AbstractXtextTests { assertEquals("foo\\bar", modelElements.getFirstFooBarKeyword_0_0().getValue()); assertEquals("foo\\", modelElements.getSecondFooKeyword_1_0().getValue()); assertEquals("\\bar", modelElements.getThirdBarKeyword_2_0().getValue()); - assertEquals("\\", modelElements.getForthReverseSolidusKeyword_3_0().getValue()); + assertEquals("\\", modelElements.getForthBackslashKeyword_3_0().getValue()); assertEquals("\"a\"", modelElements.getFifthAKeyword_4_0().getValue()); assertEquals("'b'", modelElements.getSixthBKeyword_5_0().getValue()); assertEquals("'c'", modelElements.getSeventhCKeyword_6_0().getValue());